diff --git a/dzgui/controllers/mc.py b/dzgui/controllers/mc.py index d1f6a57..e8befc8 100644 --- a/dzgui/controllers/mc.py +++ b/dzgui/controllers/mc.py @@ -260,7 +260,7 @@ class Controller(GObject.GObject): def select_colorized(self) -> None: self.mod_man.select_colorized() - def get_all_tree_filters(self) -> list[str]: + def get_all_tree_filters(self) -> dict[str, dict[str, bool]]: servers = self.get_servers() all_filters: dict[str, dict[str, bool]] = {} trees = ( @@ -333,9 +333,6 @@ class Controller(GObject.GObject): filter_man.set_filter(filt, state) self.mediator.filters.set_filters(filters) - def get_filters(self) -> list[str]: - return self.mediator.filters.get_filters() - def get_dist_cache(self) -> dict[str, "Haversine"]: return self.dist_cache diff --git a/dzgui/managers/config.py b/dzgui/managers/config.py index 71afdea..e550e19 100644 --- a/dzgui/managers/config.py +++ b/dzgui/managers/config.py @@ -221,7 +221,7 @@ class ConfigManager: logger.info(f"Using default window size {w},{h}") window.set_default_size(w, h) - def get_filters(self, tv: "ServerTreeView") -> list[str] | None: + def get_filters(self, tv: "ServerTreeView") -> Any | None: filters = self.prefs.paths.filters try: enum = tv.get_enum() diff --git a/dzgui/model/proxy_model.py b/dzgui/model/proxy_model.py index 9639789..6038e90 100644 --- a/dzgui/model/proxy_model.py +++ b/dzgui/model/proxy_model.py @@ -122,6 +122,7 @@ class ProxyModelManager: # TODO: filter cache: return a dataclass object with clearly enumerated map, keyword, and filter values # instead of just a serial list of strings filters = self.filter_man.get_all_filters() + print(filters) if skip_cache is False: if filters in self.filter_cache: diff --git a/dzgui/views/components/filter_panel.py b/dzgui/views/components/filter_panel.py index 4584433..26f4974 100644 --- a/dzgui/views/components/filter_panel.py +++ b/dzgui/views/components/filter_panel.py @@ -332,7 +332,7 @@ class FilterPanel(Gtk.Box): return self.emitter.emit("map_selection_changed", name) - def set_filters(self, filters: dict[str, str]) -> None: + def set_filters(self, filters: dict[str, bool]) -> None: for check in self.button_grid.checks: label = check.get_label() check.set_active(filters[label]) diff --git a/dzgui/views/mixins/mods_mixin.py b/dzgui/views/mixins/mods_mixin.py index d3fce76..6cc7da8 100644 --- a/dzgui/views/mixins/mods_mixin.py +++ b/dzgui/views/mixins/mods_mixin.py @@ -11,5 +11,5 @@ class ModsMixin: self, tree: TreeView, path: Gtk.TreePath, column: Gtk.TreeViewColumn ) -> None: - mod = self.get_value_at_index(2) + mod = self.get_value_at_index(2) # type: ignore self.controller.open_workshop_page(mod) # type: ignore