CodeMirror/czkawka
1
0
Fork 0
mirror of synced 2024-04-28 09:33:30 +12:00
Code Issues Projects Releases Wiki Activity

Fix excluded items on Windows (#324)

Browse source
This commit is contained in:
Rafał Mikrut 2021-05-08 21:54:01 +02:00 committed by GitHub
parent b54748920f
commit cc0dcc2714
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
czkawka_core/src/common.rs
View file

@ -157,6 +157,12 @@ mod test {
assert!(!Common::regex_check("*home/*koc", "/koc/home/"));
assert!(!Common::regex_check("*home/", "/home"));
assert!(!Common::regex_check("*TTT", "/GGG"));
#[cfg(target_family = "windows")]
{
assert!(Common::regex_check("*\\home", "C:\\home"));
assert!(Common::regex_check("*/home", "C:\\home"));
}
}
#[test]
fn test_windows_path() {

5
czkawka_core/src/common_items.rs
View file

@ -27,6 +27,9 @@ impl ExcludedItems {
for expression in expressions {
let expression: String = expression.trim().to_string();
#[cfg(target_family = "windows")]
let expression = expression.replace("/", "\\");
if expression.is_empty() {
continue;
}
@ -35,7 +38,7 @@ impl ExcludedItems {
checked_expressions.push("*/.git/*,*/node_modules/*,*/lost+found/*,*/Trash/*,*/.Trash-*/*,*/snap/*,/home/*/.cache/*".to_string());
}
if cfg!(target_family = "windows") {
checked_expressions.push("*/.git/*,*/node_modules/*,*/lost+found/*,*:/windows/*".to_string());
checked_expressions.push("*\\.git\\*,*\\node_modules\\*,*\\lost+found\\*,*:\\windows\\*".to_string());
}
continue;
}

10
czkawka_gui/src/connect_popovers.rs
View file

@ -360,6 +360,11 @@ fn popover_select_custom(popover: &gtk::Popover, gui_data: &GuiData, tree_view:
if !wildcard.is_empty() {
let wildcard = wildcard.trim();
#[cfg(target_family = "windows")]
let wildcard = wildcard.replace("/", "\\");
#[cfg(target_family = "windows")]
let wildcard = wildcard.as_str();
let selection = tree_view.get_selection();
let tree_model = tree_view.get_model().unwrap();
@ -474,6 +479,11 @@ fn popover_unselect_custom(popover: &gtk::Popover, gui_data: &GuiData, tree_view
if !wildcard.is_empty() {
let wildcard = wildcard.trim();
#[cfg(target_family = "windows")]
let wildcard = wildcard.replace("/", "\\");
#[cfg(target_family = "windows")]
let wildcard = wildcard.as_str();
let selection = tree_view.get_selection();
let tree_model = tree_view.get_model().unwrap();

2
czkawka_gui/src/saving_loading.rs
View file

@ -540,7 +540,7 @@ pub fn reset_configuration(gui_data: &GuiData, manual_clearing: bool) {
entry_excluded_items.set_text("*/.git/*,*/node_modules/*,*/lost+found/*,*/Trash/*,*/.Trash-*/*,*/snap/*,/home/*/.cache/*");
}
if cfg!(target_family = "windows") {
entry_excluded_items.set_text("*/.git/*,*/node_modules/*,*/lost+found/*,*:/windows/*");
entry_excluded_items.set_text("*\\.git\\*,*\\node_modules\\*,*\\lost+found\\*,*:\\windows\\*");
}
}
// Resetting allowed extensions