discours.io/quoter
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proxy-fix
All checks were successful
deploy / deploy (push) Successful in 1m0s
Details

Browse Source
This commit is contained in:
Untone 2024-10-23 14:45:23 +03:00
parent d48141fee2
commit b15a6bc073
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/handlers/proxy.rs
View File

@ -21,9 +21,9 @@ pub async fn proxy_handler(
// парсим GET запрос // парсим GET запрос
let (base_filename, requested_width, extension) = parse_image_request(&normalized_path); let (base_filename, requested_width, extension) = parse_image_request(&normalized_path);
let ext = extension.to_lowercase();
let filekey = format!("{}.{}", base_filename, extension); let filekey = format!("{}.{}", base_filename, &ext);
let content_type = match extension.as_str() { let content_type = match ext.as_str() {
"jpg" | "jpeg" => "image/jpeg", "jpg" | "jpeg" => "image/jpeg",
"png" => "image/png", "png" => "image/png",
"webp" => "image/webp", "webp" => "image/webp",
@ -54,7 +54,7 @@ pub async fn proxy_handler(
// find closest thumb width // find closest thumb width
let closest: u32 = find_closest_width(requested_width as u32); let closest: u32 = find_closest_width(requested_width as u32);
let thumb_filename = let thumb_filename =
&format!("{}_{}.{}", base_filename, closest, extension); &format!("{}_{}.{}", base_filename, closest, ext);
return match check_file_exists( return match check_file_exists(
&state.storj_client, &state.storj_client,
@ -164,9 +164,9 @@ async fn thumbdata_save(
if content_type.starts_with("image") { if content_type.starts_with("image") {
warn!("original file name: {}", original_filename); warn!("original file name: {}", original_filename);
let (base_filename, _, extension) = parse_image_request(&original_filename); let (base_filename, _, extension) = parse_image_request(&original_filename);
let filename = format!("{}.{}", base_filename, extension); warn!("detected file extension: {}", extension);
let ext = extension.to_lowercase();
warn!("file extension: {}", extension); let filename = format!("{}.{}", base_filename, ext);
let img = match image::load_from_memory(&original_data) { let img = match image::load_from_memory(&original_data) {
Ok(img) => img, Ok(img) => img,
@ -180,7 +180,7 @@ async fn thumbdata_save(
match generate_thumbnails(&img).await { match generate_thumbnails(&img).await {
Ok(thumbnails_bytes) => { Ok(thumbnails_bytes) => {
for (thumb_width, thumbnail) in thumbnails_bytes { for (thumb_width, thumbnail) in thumbnails_bytes {
let thumb_filename = format!("{}_{}.{}", base_filename, thumb_width, extension); let thumb_filename = format!("{}_{}.{}", base_filename, thumb_width, ext);
// Загружаем миниатюру в S3 // Загружаем миниатюру в S3
if let Err(e) = upload_to_s3( if let Err(e) = upload_to_s3(
&state.storj_client, &state.storj_client,