CodeMirror/czkawka
1
0
Fork 0
mirror of synced 2024-05-20 20:32:59 +12:00
Code Issues Projects Releases Wiki Activity

Broken

Browse source
This commit is contained in:
Rafał Mikrut 2023-12-01 20:49:51 +01:00
parent d984193942
commit 19f272d8d9
6 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
czkawka_core/src/broken_files.rs
View file

@ -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;

5
czkawka_core/src/common.rs
View file

@ -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;

4
czkawka_core/src/temporary.rs
View file

@ -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;

8
krokiet/src/settings.rs
View file

@ -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)

1
krokiet/ui/left_side_panel.slint
View file

@ -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;
}
}

20
krokiet/ui/settings_list.slint
View file

@ -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;