Merge pull request #319 from riccio8/main

Optimization for generating thumbnails

Author: CyberTimon

package-lock.json

@@ -42,6 +42,9 @@ tauri-plugin-process = "2"
 tauri-plugin-os = "2.3.1"
 raw-window-handle = "0.6.2"
 os_info = "3"
+log = "0.4"
+log-panics = {version ="2.1.0", features = ["backtrace"] }
+fern = "0.7"
 little_exif = "0.6"
 chrono = "0.4"
 tokenizers = "0.22.0"
@@ -52,6 +55,8 @@ nalgebra = "0.34.0"
 rand = "0.9"
 tauri-plugin-shell = "2.3.1"
 tempfile = "3.22.0"
+num_cpus = "1.17.0"
+mimalloc = "0.1.48"
 image_hasher = "3.0.0"
 regex = "1.11.2"
 

src-tauri/Cargo.lock

@@ -16,6 +16,8 @@ use image::codecs::jpeg::JpegEncoder;
 use image::{DynamicImage, GenericImageView, ImageBuffer, Luma};
 use little_exif::exif_tag::ExifTag;
 use little_exif::metadata::Metadata;
+use num_cpus;
+use rayon::ThreadPoolBuilder;
 use rayon::prelude::*;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -613,6 +615,10 @@ pub fn generate_thumbnails_progressive(
         .store(false, Ordering::SeqCst);
     let cancellation_token = state.thumbnail_cancellation_token.clone();
 
+    let pool = ThreadPoolBuilder::new()
+        .num_threads(num_cpus::get_physical() - 1)
+        .build()
+        .unwrap();
     let cache_dir = app_handle
         .path()
         .app_cache_dir()
@@ -626,7 +632,7 @@ pub fn generate_thumbnails_progressive(
     let total_count = paths.len();
     let completed_count = Arc::new(AtomicUsize::new(0));
 
-    thread::spawn(move || {
+    pool.spawn(move || {
         let state = app_handle_clone.state::<AppState>();
         let gpu_context = gpu_processing::get_or_init_gpu_context(&state).ok();
 

src-tauri/Cargo.toml

@@ -4,9 +4,9 @@ use bytemuck;
 use image::{DynamicImage, GenericImageView, ImageBuffer, Luma, Rgba};
 use wgpu::util::{DeviceExt, TextureDataOrder};
 
-use crate::{AppState, GpuImageCache};
 use crate::image_processing::{AllAdjustments, GpuContext};
 use crate::lut_processing::Lut;
+use crate::{AppState, GpuImageCache};
 
 pub fn get_or_init_gpu_context(state: &tauri::State<AppState>) -> Result<GpuContext, String> {
     let mut context_lock = state.gpu_context.lock().unwrap();
@@ -450,7 +450,8 @@ pub fn process_and_get_dynamic_image(
     let mut cache_lock = state.gpu_image_cache.lock().unwrap();
 
     if let Some(cache) = &*cache_lock {
-        if cache.transform_hash != transform_hash || cache.width != width || cache.height != height {
+        if cache.transform_hash != transform_hash || cache.width != width || cache.height != height
+        {
             *cache_lock = None;
         }
     }
@@ -503,4 +504,4 @@ pub fn process_and_get_dynamic_image(
     let img_buf = ImageBuffer::<Rgba<u8>, Vec<u8>>::from_raw(width, height, processed_pixels)
         .ok_or("Failed to create image buffer from GPU data")?;
     Ok(DynamicImage::ImageRgba8(img_buf))
-}
+}

src-tauri/src/file_management.rs

@@ -553,7 +553,11 @@ fn get_global_adjustments_from_json(js_adjustments: &serde_json::Value) -> Globa
             SCALES.chromatic_aberration,
             None,
         ),
-        show_clipping: if js_adjustments["showClipping"].as_bool().unwrap_or(false) { 1 } else { 0 },
+        show_clipping: if js_adjustments["showClipping"].as_bool().unwrap_or(false) {
+            1
+        } else {
+            0
+        },
         _pad_ca1: 0.0,
 
         enable_negative_conversion: if neg_conv_enabled { 1 } else { 0 },
@@ -1252,4 +1256,4 @@ pub fn calculate_auto_adjustments(
     let results = perform_auto_analysis(&original_image);
 
     Ok(auto_results_to_json(&results))
-}
+}