From 19f272d8d9c83127a28a24c689f8b793e13882e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= <mikrutrafal@protonmail.com>
Date: Fri, 1 Dec 2023 20:49:51 +0100
Subject: [PATCH] Broken

---
 czkawka_core/src/broken_files.rs |  4 +---
 czkawka_core/src/common.rs       |  5 +----
 czkawka_core/src/temporary.rs    |  4 +---
 krokiet/src/settings.rs          |  8 ++------
 krokiet/ui/left_side_panel.slint |  1 -
 krokiet/ui/settings_list.slint   | 20 ++++++++++----------
 6 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/czkawka_core/src/broken_files.rs b/czkawka_core/src/broken_files.rs
index 6bd24b8..915a75d 100644
--- a/czkawka_core/src/broken_files.rs
+++ b/czkawka_core/src/broken_files.rs
@@ -190,9 +190,7 @@ impl BrokenFiles {
     ) -> Option<FileEntry> {
         atomic_counter.fetch_add(1, Ordering::Relaxed);
 
-        let Some(file_name_lowercase) = get_lowercase_name(entry_data, warnings) else {
-            return None;
-        };
+        let file_name_lowercase = get_lowercase_name(entry_data, warnings)?;
 
         if !self.common_data.allowed_extensions.matches_filename(&file_name_lowercase) {
             return None;
diff --git a/czkawka_core/src/common.rs b/czkawka_core/src/common.rs
index 05e78d2..f6d059d 100644
--- a/czkawka_core/src/common.rs
+++ b/czkawka_core/src/common.rs
@@ -176,10 +176,7 @@ pub fn open_cache_folder(cache_file_name: &str, save_to_cache: bool, use_json: b
                 file_handler_default = Some(t);
             } else {
                 if use_json {
-                    file_handler_json = Some(match OpenOptions::new().read(true).open(&cache_file_json) {
-                        Ok(t) => t,
-                        Err(_) => return None,
-                    });
+                    file_handler_json = Some(OpenOptions::new().read(true).open(&cache_file_json).ok()?);
                 } else {
                     // messages.push(format!("Cannot find or open cache file {}", cache_file.display())); // No error or warning
                     return None;
diff --git a/czkawka_core/src/temporary.rs b/czkawka_core/src/temporary.rs
index 64dc78b..51d82d6 100644
--- a/czkawka_core/src/temporary.rs
+++ b/czkawka_core/src/temporary.rs
@@ -152,9 +152,7 @@ impl Temporary {
     ) -> Option<FileEntry> {
         atomic_counter.fetch_add(1, Ordering::Relaxed);
 
-        let Some(file_name_lowercase) = get_lowercase_name(entry_data, warnings) else {
-            return None;
-        };
+        let file_name_lowercase = get_lowercase_name(entry_data, warnings)?;
 
         if !TEMP_EXTENSIONS.iter().any(|f| file_name_lowercase.ends_with(f)) {
             return None;
diff --git a/krokiet/src/settings.rs b/krokiet/src/settings.rs
index 6008cbc..1444ca7 100644
--- a/krokiet/src/settings.rs
+++ b/krokiet/src/settings.rs
@@ -287,17 +287,13 @@ where
 }
 
 pub fn get_base_config_file() -> Option<PathBuf> {
-    let Some(configs) = ProjectDirs::from("pl", "Qarmin", "Krokiet") else {
-        return None;
-    };
+    let configs = ProjectDirs::from("pl", "Qarmin", "Krokiet")?;
     let config_folder = configs.config_dir();
     let base_config_file = config_folder.join("config_general.json");
     Some(base_config_file)
 }
 pub fn get_config_file(number: i32) -> Option<PathBuf> {
-    let Some(configs) = ProjectDirs::from("pl", "Qarmin", "Krokiet") else {
-        return None;
-    };
+    let configs = ProjectDirs::from("pl", "Qarmin", "Krokiet")?;
     let config_folder = configs.config_dir();
     let config_file = config_folder.join(format!("config_preset_{number}.json"));
     Some(config_file)
diff --git a/krokiet/ui/left_side_panel.slint b/krokiet/ui/left_side_panel.slint
index fc5f89b..4211eb5 100644
--- a/krokiet/ui/left_side_panel.slint
+++ b/krokiet/ui/left_side_panel.slint
@@ -120,7 +120,6 @@ export component LeftSidePanel {
                     preferred-height: self.width;
                     icon: @image-url("../icons/settings.svg");
                     clicked => {
-                        debug("Changed showing settings");
                         GuiState.visible_tool_settings = !GuiState.visible-tool-settings;
                     }
                 }
diff --git a/krokiet/ui/settings_list.slint b/krokiet/ui/settings_list.slint
index f32e11f..2ab09b0 100644
--- a/krokiet/ui/settings_list.slint
+++ b/krokiet/ui/settings_list.slint
@@ -135,16 +135,16 @@ component Presets inherits Rectangle {
     }
 }
 
-component Language inherits HorizontalLayout {
-    spacing: 5px;
-    Text {     
-        text: Callabler.translate("settings_language", []);
-        vertical-alignment: TextVerticalAlignment.center;
-    }
-    ComboBox {
-        model: ["English"];
-    }
-}
+// component Language inherits HorizontalLayout {
+//     spacing: 5px;
+//     Text {     
+//         text: Callabler.translate("settings_language", []);
+//         vertical-alignment: TextVerticalAlignment.center;
+//     }
+//     ComboBox {
+//         model: ["English"];
+//     }
+// }
 component HeaderText inherits Text {
     font-size: 15px;
     height: SettingsSize.item_height;