LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Drop a removed folder from the filter Enable Filters put aside
Marco Arnulfob6d94b447bf9
diff --git a/crates/engine/src/cmd/library.rs b/crates/engine/src/cmd/library.rsindex 0f59a027f..334d9c92d 100644--- a/crates/engine/src/cmd/library.rs+++ b/crates/engine/src/cmd/library.rs@@ -470,6 +470,15 @@ pub fn specs() -> Vec<CommandSpec> {if s.filter.library_folder.as_deref().is_some_and(|c| lightcraft_catalog::query::folder_within(c, path)) {s.filter.library_folder = None;}+ // a filter put aside by Enable Filters must not bring the removed folder back+ if let Some(f) = s.shelved_filter.as_mut()+ && f.library_folder.as_deref().is_some_and(|c| lightcraft_catalog::query::folder_within(c, path))+ {+ f.library_folder = None;+ }+ if s.shelved_filter.as_ref() == Some(&Filter::default()) {+ s.shelved_filter = None;+ }// the folder being shown is gone: back to everything, as for a deleted albumif s.library_folder.as_deref().is_some_and(|c| lightcraft_catalog::query::folder_within(c, path)) {s.library_folder = None;diff --git a/crates/engine/src/cmd/library/tests_enable_filters.rs b/crates/engine/src/cmd/library/tests_enable_filters.rsindex 0833dcd94..7ec0f2a39 100644--- a/crates/engine/src/cmd/library/tests_enable_filters.rs+++ b/crates/engine/src/cmd/library/tests_enable_filters.rs@@ -116,3 +116,23 @@ fn a_folder_filter_does_not_come_back_over_the_folder_now_shown() {assert_eq!(s.filter.rating, 4);assert_eq!(s.filter.library_folder, None);}++#[test]+fn removing_a_folder_while_off_drops_it_from_the_filter_put_aside() {+ let mut s = session().unwrap();+ s.execute("library.filter", &json!({"rating": 4, "libraryFolder": "/lightcraft-enable-filters"})).unwrap();+ s.execute("library.toggleFilters", &json!({})).unwrap();+ s.execute("library.removeFolder", &json!({"path": "/lightcraft-enable-filters"})).unwrap();+ s.execute("library.toggleFilters", &json!({})).unwrap();+ assert_eq!(s.filter.library_folder, None, "the removed folder is not brought back");+ assert_eq!(s.filter.rating, 4, "the rest of the filter is");+}++#[test]+fn removing_the_only_criterion_put_aside_leaves_filtering_on() {+ let mut s = session().unwrap();+ s.execute("library.filter", &json!({"libraryFolder": "/lightcraft-enable-filters"})).unwrap();+ s.execute("library.toggleFilters", &json!({})).unwrap();+ s.execute("library.removeFolder", &json!({"path": "/lightcraft-enable-filters"})).unwrap();+ assert!(s.shelved_filter.is_none(), "an empty filter is not left put aside");+}