chore: format code
This commit is contained in:
parent
b26094835f
commit
0319c927c6
@ -17,6 +17,17 @@ const ALLOWED_MIME_TYPES: &[&str] = &["image/jpeg", "image/png", "image/gif", "i
|
|||||||
#[cfg(feature = "server")]
|
#[cfg(feature = "server")]
|
||||||
const MAX_FILE_SIZE: usize = 5 * 1024 * 1024; // 5MB
|
const MAX_FILE_SIZE: usize = 5 * 1024 * 1024; // 5MB
|
||||||
|
|
||||||
|
#[cfg(feature = "server")]
|
||||||
|
fn mime_to_ext(mime: &str) -> &'static str {
|
||||||
|
match mime {
|
||||||
|
"image/jpeg" => "jpg",
|
||||||
|
"image/png" => "png",
|
||||||
|
"image/webp" => "webp",
|
||||||
|
"image/gif" => "gif",
|
||||||
|
_ => "bin",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(feature = "server")]
|
#[cfg(feature = "server")]
|
||||||
pub async fn upload_image(
|
pub async fn upload_image(
|
||||||
headers: HeaderMap,
|
headers: HeaderMap,
|
||||||
@ -139,44 +150,47 @@ pub async fn upload_image(
|
|||||||
}
|
}
|
||||||
|
|
||||||
let is_gif = mime_type.as_str() == "image/gif";
|
let is_gif = mime_type.as_str() == "image/gif";
|
||||||
|
let is_webp = mime_type.as_str() == "image/webp";
|
||||||
|
|
||||||
let (final_data, final_ext) = if is_gif {
|
let (final_data, final_ext) = if is_gif {
|
||||||
(data.to_vec(), "gif")
|
(data.to_vec(), "gif".to_string())
|
||||||
|
} else if is_webp {
|
||||||
|
(data.to_vec(), "webp".to_string())
|
||||||
} else {
|
} else {
|
||||||
match image::load_from_memory(&data) {
|
let original_data = data.to_vec();
|
||||||
Ok(img) => {
|
let mime = mime_type.clone();
|
||||||
let mut buf = std::io::Cursor::new(Vec::new());
|
let original_len = data.len();
|
||||||
match img.write_to(&mut buf, image::ImageFormat::WebP) {
|
let result = tokio::task::spawn_blocking(move || -> (Vec<u8>, String, bool) {
|
||||||
Ok(_) => {
|
match image::load_from_memory(&original_data) {
|
||||||
tracing::info!(
|
Ok(img) => {
|
||||||
"Converted upload to WebP: {} bytes -> {} bytes",
|
let mut buf = std::io::Cursor::new(Vec::new());
|
||||||
data.len(),
|
match img.write_to(&mut buf, image::ImageFormat::WebP) {
|
||||||
buf.get_ref().len()
|
Ok(_) => {
|
||||||
);
|
let webp_data = buf.into_inner();
|
||||||
(buf.into_inner(), "webp")
|
if webp_data.len() < original_data.len() {
|
||||||
}
|
(webp_data, "webp".to_string(), true)
|
||||||
Err(e) => {
|
} else {
|
||||||
tracing::warn!("WebP encoding failed, storing original: {:?}", e);
|
(original_data, mime_to_ext(&mime).to_string(), false)
|
||||||
let ext = match mime_type.as_str() {
|
}
|
||||||
"image/jpeg" => "jpg",
|
}
|
||||||
"image/png" => "png",
|
Err(_) => (original_data, mime_to_ext(&mime).to_string(), false),
|
||||||
"image/webp" => "webp",
|
|
||||||
_ => "bin",
|
|
||||||
};
|
|
||||||
(data.to_vec(), ext)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Err(_) => (original_data, mime_to_ext(&mime).to_string(), false),
|
||||||
}
|
}
|
||||||
Err(e) => {
|
})
|
||||||
tracing::warn!("Image decode failed, storing raw bytes: {:?}", e);
|
.await;
|
||||||
let ext = match mime_type.as_str() {
|
|
||||||
"image/jpeg" => "jpg",
|
match result {
|
||||||
"image/png" => "png",
|
Ok((converted_data, ext, was_converted)) => {
|
||||||
"image/webp" => "webp",
|
if was_converted {
|
||||||
_ => "bin",
|
tracing::info!("Converted upload to WebP: {} bytes -> {} bytes", original_len, converted_data.len());
|
||||||
};
|
} else {
|
||||||
(data.to_vec(), ext)
|
tracing::info!("Keeping original format (ext: {})", ext);
|
||||||
|
}
|
||||||
|
(converted_data, ext)
|
||||||
}
|
}
|
||||||
|
Err(_) => (data.to_vec(), mime_to_ext(&mime_type).to_string()),
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@ use crate::router::Route;
|
|||||||
#[component]
|
#[component]
|
||||||
pub fn PostFooter(post: Post) -> Element {
|
pub fn PostFooter(post: Post) -> Element {
|
||||||
let tags = post.tags.clone();
|
let tags = post.tags.clone();
|
||||||
|
|
||||||
rsx! {
|
rsx! {
|
||||||
footer { class: "post-footer",
|
footer { class: "post-footer",
|
||||||
if !tags.is_empty() {
|
if !tags.is_empty() {
|
||||||
@ -25,7 +25,7 @@ pub fn PostFooter(post: Post) -> Element {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if post.prev_post.is_some() || post.next_post.is_some() {
|
if post.prev_post.is_some() || post.next_post.is_some() {
|
||||||
PostNavLinks {
|
PostNavLinks {
|
||||||
prev: post.prev_post,
|
prev: post.prev_post,
|
||||||
next: post.next_post
|
next: post.next_post
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,7 +19,7 @@ pub fn PostNavLinks(prev: Option<PostNav>, next: Option<PostNav>) -> Element {
|
|||||||
} else {
|
} else {
|
||||||
span { class: "prev" }
|
span { class: "prev" }
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(next_post) = next {
|
if let Some(next_post) = next {
|
||||||
Link {
|
Link {
|
||||||
class: "next",
|
class: "next",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user