Merge branch 'CyberTimon:main' into feat-brush-resizing-shortcuts

Author: mmadesignerunknown

README.md

@@ -60,6 +60,7 @@ RapidRAW is still in active development and isn't yet as polished as mature tool
 <details>
 <summary><strong>Recent Changes</strong></summary>
 
+- **2026-03-30:** LaMa inpainting for lightweight local content-aware fill and object removal.
 - **2026-03-26:** Performance improvements & new flat list mode for library
 - **2026-03-25:** Optimize folder loading & tree fetching
 - **2026-03-23:** Generate thumbnails only for visible viewport items
@@ -69,11 +70,11 @@ RapidRAW is still in active development and isn't yet as polished as mature tool
 - **2026-03-16:** LRU cache for instant image loading
 - **2026-03-15:** Improved high quality subject mask models, various UI improvements and shader improvements
 - **2026-03-14:** New image analytics panel which can display vectorscopes, waveforms, parades & histograms
-- **2026-03-13:** JPEG XL, WebP, and additional format support, including the ability to export LUTs.
 
 <details>
 <summary><strong>Expand further</strong></summary>
 
+- **2026-03-13:** JPEG XL, WebP, and additional format support, including the ability to export LUTs.
 - **2026-03-12:** Added parametric color & luminance masks
 - **2026-03-10:** Implement region of interest rendering to improve performance when zooming in
 - **2026-03-07:** Batch negative conversion & various shader improvements

src-tauri/src/ai_processing.rs

@@ -211,18 +211,24 @@ pub async fn get_or_init_ai_models(
     ai_state_mutex: &Mutex<Option<AiState>>,
     ai_init_lock: &TokioMutex<()>,
 ) -> Result<Arc<AiModels>> {
-    if let Some(ai_state) = ai_state_mutex.lock().unwrap().as_ref() {
-        if let Some(models) = &ai_state.models {
-            return Ok(models.clone());
-        }
+    if let Some(models) = ai_state_mutex
+        .lock()
+        .unwrap()
+        .as_ref()
+        .and_then(|state| state.models.clone())
+    {
+        return Ok(models);
     }
 
     let _guard = ai_init_lock.lock().await;
 
-    if let Some(ai_state) = ai_state_mutex.lock().unwrap().as_ref() {
-        if let Some(models) = &ai_state.models {
-            return Ok(models.clone());
-        }
+    if let Some(models) = ai_state_mutex
+        .lock()
+        .unwrap()
+        .as_ref()
+        .and_then(|state| state.models.clone())
+    {
+        return Ok(models);
     }
 
     let models_dir = get_models_dir(app_handle)?;
@@ -306,18 +312,24 @@ pub async fn get_or_init_denoise_model(
     ai_state_mutex: &Mutex<Option<AiState>>,
     ai_init_lock: &TokioMutex<()>,
 ) -> Result<Arc<Mutex<Session>>> {
-    if let Some(ai_state) = ai_state_mutex.lock().unwrap().as_ref() {
-        if let Some(denoise_model) = &ai_state.denoise_model {
-            return Ok(denoise_model.clone());
-        }
+    if let Some(denoise_model) = ai_state_mutex
+        .lock()
+        .unwrap()
+        .as_ref()
+        .and_then(|state| state.denoise_model.clone())
+    {
+        return Ok(denoise_model);
     }
 
     let _guard = ai_init_lock.lock().await;
 
-    if let Some(ai_state) = ai_state_mutex.lock().unwrap().as_ref() {
-        if let Some(denoise_model) = &ai_state.denoise_model {
-            return Ok(denoise_model.clone());
-        }
+    if let Some(denoise_model) = ai_state_mutex
+        .lock()
+        .unwrap()
+        .as_ref()
+        .and_then(|state| state.denoise_model.clone())
+    {
+        return Ok(denoise_model);
     }
 
     let models_dir = get_models_dir(app_handle)?;
@@ -359,18 +371,24 @@ pub async fn get_or_init_clip_models(
     ai_state_mutex: &Mutex<Option<AiState>>,
     ai_init_lock: &TokioMutex<()>,
 ) -> Result<Arc<ClipModels>> {
-    if let Some(ai_state) = ai_state_mutex.lock().unwrap().as_ref() {
-        if let Some(clip_models) = &ai_state.clip_models {
-            return Ok(clip_models.clone());
-        }
+    if let Some(clip_models) = ai_state_mutex
+        .lock()
+        .unwrap()
+        .as_ref()
+        .and_then(|state| state.clip_models.clone())
+    {
+        return Ok(clip_models);
     }
 
     let _guard = ai_init_lock.lock().await;
 
-    if let Some(ai_state) = ai_state_mutex.lock().unwrap().as_ref() {
-        if let Some(clip_models) = &ai_state.clip_models {
-            return Ok(clip_models.clone());
-        }
+    if let Some(clip_models) = ai_state_mutex
+        .lock()
+        .unwrap()
+        .as_ref()
+        .and_then(|state| state.clip_models.clone())
+    {
+        return Ok(clip_models);
     }
 
     let models_dir = get_models_dir(app_handle)?;
@@ -423,18 +441,24 @@ pub async fn get_or_init_lama_model(
     ai_state_mutex: &Mutex<Option<AiState>>,
     ai_init_lock: &TokioMutex<()>,
 ) -> Result<Arc<Mutex<Session>>> {
-    if let Some(ai_state) = ai_state_mutex.lock().unwrap().as_ref() {
-        if let Some(lama_model) = &ai_state.lama_model {
-            return Ok(lama_model.clone());
-        }
+    if let Some(lama_model) = ai_state_mutex
+        .lock()
+        .unwrap()
+        .as_ref()
+        .and_then(|state| state.lama_model.clone())
+    {
+        return Ok(lama_model);
     }
 
     let _guard = ai_init_lock.lock().await;
 
-    if let Some(ai_state) = ai_state_mutex.lock().unwrap().as_ref() {
-        if let Some(lama_model) = &ai_state.lama_model {
-            return Ok(lama_model.clone());
-        }
+    if let Some(lama_model) = ai_state_mutex
+        .lock()
+        .unwrap()
+        .as_ref()
+        .and_then(|state| state.lama_model.clone())
+    {
+        return Ok(lama_model);
     }
 
     let models_dir = get_models_dir(app_handle)?;