Fix excluded items on Windows (#324)
This commit is contained in:
parent
b54748920f
commit
cc0dcc2714
|
@ -157,6 +157,12 @@ mod test {
|
||||||
assert!(!Common::regex_check("*home/*koc", "/koc/home/"));
|
assert!(!Common::regex_check("*home/*koc", "/koc/home/"));
|
||||||
assert!(!Common::regex_check("*home/", "/home"));
|
assert!(!Common::regex_check("*home/", "/home"));
|
||||||
assert!(!Common::regex_check("*TTT", "/GGG"));
|
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]
|
#[test]
|
||||||
fn test_windows_path() {
|
fn test_windows_path() {
|
||||||
|
|
|
@ -27,6 +27,9 @@ impl ExcludedItems {
|
||||||
for expression in expressions {
|
for expression in expressions {
|
||||||
let expression: String = expression.trim().to_string();
|
let expression: String = expression.trim().to_string();
|
||||||
|
|
||||||
|
#[cfg(target_family = "windows")]
|
||||||
|
let expression = expression.replace("/", "\\");
|
||||||
|
|
||||||
if expression.is_empty() {
|
if expression.is_empty() {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -35,7 +38,7 @@ impl ExcludedItems {
|
||||||
checked_expressions.push("*/.git/*,*/node_modules/*,*/lost+found/*,*/Trash/*,*/.Trash-*/*,*/snap/*,/home/*/.cache/*".to_string());
|
checked_expressions.push("*/.git/*,*/node_modules/*,*/lost+found/*,*/Trash/*,*/.Trash-*/*,*/snap/*,/home/*/.cache/*".to_string());
|
||||||
}
|
}
|
||||||
if cfg!(target_family = "windows") {
|
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;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -360,6 +360,11 @@ fn popover_select_custom(popover: >k::Popover, gui_data: &GuiData, tree_view:
|
||||||
if !wildcard.is_empty() {
|
if !wildcard.is_empty() {
|
||||||
let wildcard = wildcard.trim();
|
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 selection = tree_view.get_selection();
|
||||||
let tree_model = tree_view.get_model().unwrap();
|
let tree_model = tree_view.get_model().unwrap();
|
||||||
|
|
||||||
|
@ -474,6 +479,11 @@ fn popover_unselect_custom(popover: >k::Popover, gui_data: &GuiData, tree_view
|
||||||
if !wildcard.is_empty() {
|
if !wildcard.is_empty() {
|
||||||
let wildcard = wildcard.trim();
|
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 selection = tree_view.get_selection();
|
||||||
let tree_model = tree_view.get_model().unwrap();
|
let tree_model = tree_view.get_model().unwrap();
|
||||||
|
|
||||||
|
|
|
@ -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/*");
|
entry_excluded_items.set_text("*/.git/*,*/node_modules/*,*/lost+found/*,*/Trash/*,*/.Trash-*/*,*/snap/*,/home/*/.cache/*");
|
||||||
}
|
}
|
||||||
if cfg!(target_family = "windows") {
|
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
|
// Resetting allowed extensions
|
||||||
|
|
Loading…
Reference in a new issue