parse-filepath-fix
All checks were successful
deploy / deploy (push) Successful in 58s

This commit is contained in:
2024-10-23 15:31:33 +03:00
parent e8a9908e82
commit f3a3804e5a
2 changed files with 30 additions and 26 deletions

View File

@@ -4,7 +4,7 @@ use log::{error, warn};
use crate::app_state::AppState;
use crate::handlers::serve_file::serve_file;
use crate::s3_utils::{check_file_exists, load_file_from_s3, upload_to_s3};
use crate::thumbnail::{find_closest_width, generate_thumbnails, parse_image_request};
use crate::thumbnail::{find_closest_width, generate_thumbnails, parse_file_path};
/// Обработчик для скачивания файла и генерации миниатюры, если она недоступна.
pub async fn proxy_handler(
@@ -20,7 +20,7 @@ pub async fn proxy_handler(
};
// парсим GET запрос
let (base_filename, requested_width, extension) = parse_image_request(&normalized_path);
let (base_filename, requested_width, extension) = parse_file_path(&normalized_path);
warn!("detected file extension: {}", extension);
let ext = extension.as_str().to_lowercase();
warn!("normalized to lowercase: {}", ext);
@@ -166,7 +166,7 @@ async fn thumbdata_save(
let state = state.clone();
if content_type.starts_with("image") {
warn!("original file name: {}", original_filename);
let (base_filename, _, extension) = parse_image_request(&original_filename);
let (base_filename, _, extension) = parse_file_path(&original_filename);
warn!("detected file extension: {}", extension);
let ext = extension.to_lowercase();
let filename = format!("{}.{}", base_filename, ext);