fmt
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
use actix_web::error::ErrorNotFound;
|
||||
use actix_web::{error::ErrorInternalServerError, web, HttpRequest, HttpResponse, Result};
|
||||
use log::{info, error, warn};
|
||||
use actix_web::{HttpRequest, HttpResponse, Result, error::ErrorInternalServerError, web};
|
||||
use log::{error, info, warn};
|
||||
|
||||
use crate::app_state::AppState;
|
||||
use crate::handlers::serve_file::serve_file;
|
||||
@@ -26,7 +26,7 @@ pub async fn proxy_handler(
|
||||
) -> Result<HttpResponse, actix_web::Error> {
|
||||
let start_time = std::time::Instant::now();
|
||||
info!("GET {} [START]", requested_res);
|
||||
|
||||
|
||||
let normalized_path = if requested_res.ends_with("/webp") {
|
||||
info!("Converting to WebP format: {}", requested_res);
|
||||
requested_res.replace("/webp", "")
|
||||
@@ -35,16 +35,21 @@ pub async fn proxy_handler(
|
||||
};
|
||||
|
||||
// Проверяем If-None-Match заголовок для кэширования
|
||||
let client_etag = req.headers().get("if-none-match")
|
||||
let client_etag = req
|
||||
.headers()
|
||||
.get("if-none-match")
|
||||
.and_then(|h| h.to_str().ok());
|
||||
|
||||
// парсим GET запрос
|
||||
let (base_filename, requested_width, extension) = parse_file_path(&normalized_path);
|
||||
let ext = extension.as_str().to_lowercase();
|
||||
let filekey = format!("{}.{}", base_filename, &ext);
|
||||
|
||||
info!("Parsed request - base: {}, width: {}, ext: {}", base_filename, requested_width, ext);
|
||||
|
||||
|
||||
info!(
|
||||
"Parsed request - base: {}, width: {}, ext: {}",
|
||||
base_filename, requested_width, ext
|
||||
);
|
||||
|
||||
// Генерируем ETag для кэширования
|
||||
let file_etag = format!("\"{}\"", &filekey);
|
||||
if let Some(etag) = client_etag {
|
||||
@@ -77,7 +82,6 @@ pub async fn proxy_handler(
|
||||
|
||||
info!("Content-Type: {}", content_type);
|
||||
|
||||
|
||||
return match state.get_path(&filekey).await {
|
||||
Ok(Some(stored_path)) => {
|
||||
warn!("Found stored path in DB: {}", stored_path);
|
||||
@@ -111,8 +115,7 @@ pub async fn proxy_handler(
|
||||
}
|
||||
Ok(false) => {
|
||||
// Миниатюра не существует, возвращаем оригинал и запускаем генерацию миниатюры
|
||||
let original_file =
|
||||
serve_file(&stored_path, &state).await?;
|
||||
let original_file = serve_file(&stored_path, &state).await?;
|
||||
|
||||
// Запускаем асинхронную задачу для генерации миниатюры
|
||||
let state_clone = state.clone();
|
||||
|
||||
Reference in New Issue
Block a user