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

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

Browse Source
This commit is contained in:
Untone 2024-10-23 15:31:33 +03:00
parent e8a9908e82
commit f3a3804e5a
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/handlers/proxy.rs
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);

50
src/thumbnail.rs
View File

@ -4,13 +4,17 @@ use std::{collections::HashMap, io::Cursor};
pub const THUMB_WIDTHS: [u32; 7] = [10, 40, 110, 300, 600, 800, 1400];
/// Парсит запрос на миниатюру, извлекая оригинальное имя файла, требуемую ширину и формат.
/// Парсит путь к файлу, извлекая оригинальное имя, требуемую ширину и формат.
/// Примеры:
/// - "filename_150.ext" -> ("filename", 150, "ext")
/// - "unsafe/1440x/production/image/439efaa0-816f-11ef-b201-439da98539bc.jpg" -> ("439efaa0-816f-11ef-b201-439da98539bc", 1440, "jpg")
/// - "unsafe/production/image/5627e002-0c53-11ee-9565-0242ac110006.png" -> ("5627e002-0c53-11ee-9565-0242ac110006", 0, "png")
/// - "unsafe/development/image/439efaa0-816f-11ef-b201-439da98539bc.jpg/webp" -> ("439efaa0-816f-11ef-b201-439da98539bc", 0, "webp")
pub fn parse_image_request(path: &str) -> (String, u32, String) {
pub fn parse_file_path(requested_path: &str) -> (String, u32, String) {
let mut path = requested_path.to_string();
if requested_path.ends_with("/webp") {
path = path.replace("/webp", "");
}
let mut path_parts: Vec<&str> = path.split('/').collect();
let mut extension = String::new();
let mut width = 0;
@ -20,33 +24,33 @@ pub fn parse_image_request(path: &str) -> (String, u32, String) {
return (path.to_string(), width, extension);
}
// Проверка, содержит ли последний сегмент известный формат
let known_formats = vec!["jpg", "jpeg", "png", "webp", "gif", "mp3", "wav", "ogg", "aac", "m4a", "flac"];
let last_part = path_parts.last().unwrap().to_lowercase();
if known_formats.contains(&last_part.as_str()) {
extension = last_part.clone();
path_parts.pop(); // Удаляем формат из пути
} else {
// Если формат не указан отдельно, пытаемся извлечь из имени файла
// пытаемся извлечь формат из имени файла
if let Some(filename_part) = path_parts.pop() {
if let Some((base, ext_part)) = filename_part.rsplit_once('.') {
extension = ext_part.to_lowercase();
base_filename = base.to_string(); // Устанавливаем base_filename без расширения
} else {
base_filename = filename_part.to_string();
}
}
// Если base_filename ещё не установлено, извлекаем его
if base_filename.is_empty() {
if let Some(filename_part) = path_parts.pop() {
if let Some((_, ext_part)) = filename_part.rsplit_once('.') {
if let Some((base, ext_part)) = filename_part.rsplit_once('.') {
extension = ext_part.to_lowercase();
path_parts.push(filename_part); // Возвращаем имя файла обратно
base_filename = base.to_string();
} else {
base_filename = filename_part.to_string();
}
}
}
// Извлечение имени файла и ширины
if let Some(filename_part) = path_parts.pop() {
if let Some((name_part, width_str)) = filename_part.rsplit_once('_') {
if let Ok(w) = width_str.parse::<u32>() {
width = w;
base_filename = name_part.to_string();
} else {
base_filename = filename_part.to_string();
}
} else {
base_filename = filename_part.to_string();
// Извлечение ширины из base_filename, если она есть
if let Some((name_part, width_str)) = base_filename.rsplit_once('_') {
if let Ok(w) = width_str.parse::<u32>() {
width = w;
base_filename = name_part.to_string();
}
}