thumbfix

src/handlers/proxy.rs

@@ -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_file_path};
+use crate::thumbnail::{find_closest_width, parse_file_path, thumbdata_save};
 
 /// Обработчик для скачивания файла и генерации миниатюры, если она недоступна.
 pub async fn proxy_handler(
@@ -82,7 +82,7 @@ pub async fn proxy_handler(
                                     {
                                         warn!("generate new thumb files: {}", stored_path);
                                         warn!("{} bytes", filedata.len());
-                                        thumbdata_save(
+                                        let _ = thumbdata_save(
                                             filedata.clone(),
                                             &state,
                                             &filekey,
@@ -126,7 +126,7 @@ pub async fn proxy_handler(
                     } else {
                         warn!("file {} uploaded to storj", filekey);
                     }
-                    thumbdata_save(filedata.clone(), &state, &filekey, content_type.to_string())
+                    let _ = thumbdata_save(filedata.clone(), &state, &filekey, content_type.to_string())
                         .await;
 
                     Ok(HttpResponse::Ok().content_type(content_type).body(filedata))
@@ -162,7 +162,7 @@ pub async fn proxy_handler(
 
             match load_file_from_s3(&state.aws_client, &state.bucket, &filepath).await {
                 Ok(filedata) => {
-                    thumbdata_save(filedata.clone(), &state, &filekey, content_type.to_string())
+                    let _ = thumbdata_save(filedata.clone(), &state, &filekey, content_type.to_string())
                         .await;
                     if let Err(e) = upload_to_s3(
                         &state.storj_client,
@@ -190,55 +190,3 @@ pub async fn proxy_handler(
         }
     }
 }
-
-async fn thumbdata_save(
-    original_data: Vec<u8>,
-    state: &AppState,
-    original_filename: &str,
-    content_type: String,
-) {
-    let state = state.clone();
-    if content_type.starts_with("image") {
-        warn!("original file name: {}", 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);
-
-        let img = match image::load_from_memory(&original_data) {
-            Ok(img) => img,
-            Err(e) => {
-                warn!("cannot load image from memory: {}", e);
-                return;
-            }
-        };
-
-        warn!("generate thumbnails for {}", filename);
-        //actix::spawn(async move {
-            match generate_thumbnails(&img).await {
-                Ok(thumbnails_bytes) => {
-                    for (thumb_width, thumbnail) in thumbnails_bytes {
-                        let thumb_filename = format!("{}_{}.{}", base_filename, thumb_width, ext);
-                        // Загружаем миниатюру в S3
-                        if let Err(e) = upload_to_s3(
-                            &state.storj_client,
-                            &state.bucket,
-                            &thumb_filename,
-                            thumbnail,
-                            &content_type,
-                        )
-                        .await
-                        {
-                            warn!("cannot load thumb {}: {}", thumb_filename, e);
-                        } else {
-                            warn!("thumb {} uploaded to storj", thumb_filename);
-                        }
-                    }
-                }
-                Err(e) => {
-                    warn!("cannot generate thumbnails for {}: {}", filename, e);
-                }
-            }
-        //});
-    }
-}