Clarify imported APO preset state

Author: bhack

src/mini_eq/app.py

@@ -28,6 +28,7 @@
 from .instance import MiniEqAlreadyRunningError, MiniEqInstanceGuard
 from .routing import SystemWideEqController
 from .window import MiniEqWindow
+from .window_presets import imported_apo_curve_label
 
 
 class MiniEqApplication(Adw.Application):
@@ -91,20 +92,22 @@ def ensure_window(self, *, present: bool) -> None:
             return
 
         controller: SystemWideEqController | None = None
+        initial_curve_label: str | None = None
 
         try:
             controller = SystemWideEqController(self.args.output_sink)
             controller.start()
 
             if self.args.import_apo:
                 controller.import_apo_preset(self.args.import_apo)
+                initial_curve_label = imported_apo_curve_label(self.args.import_apo)
         except Exception as exc:
             if controller is not None:
                 controller.shutdown()
             raise SystemExit(str(exc)) from exc
 
         self.controller = controller
-        self.window = MiniEqWindow(self, self.controller, self.args.auto_route)
+        self.window = MiniEqWindow(self, self.controller, self.args.auto_route, initial_curve_label=initial_curve_label)
         self.window.set_icon_name(APP_ICON_NAME)
         self.window.present_after_setup = present
         self.window.set_visible(present)

src/mini_eq/window.py

@@ -44,7 +44,7 @@
 from .window_headroom import MiniEqWindowHeadroomMixin, format_headroom_peak_db
 from .window_layout import MiniEqWindowLayoutMixin
 from .window_preferences import MiniEqWindowPreferencesMixin
-from .window_presets import MiniEqWindowPresetMixin
+from .window_presets import MiniEqWindowPresetMixin, imported_apo_curve_label
 from .window_utility import MiniEqWindowUtilityPaneMixin
 from .window_utils import requested_switch_state, set_switch_confirmed_state
 
@@ -81,7 +81,13 @@ class MiniEqWindow(
     MiniEqWindowLayoutMixin,
     Adw.ApplicationWindow,
 ):
-    def __init__(self, app: Adw.Application, controller: SystemWideEqController, auto_route: bool) -> None:
+    def __init__(
+        self,
+        app: Adw.Application,
+        controller: SystemWideEqController,
+        auto_route: bool,
+        initial_curve_label: str | None = None,
+    ) -> None:
         super().__init__(application=app, title=APP_NAME)
         self.add_css_class("mini-eq-window")
         self.controller = controller
@@ -117,7 +123,7 @@ def __init__(self, app: Adw.Application, controller: SystemWideEqController, aut
         self.curve_revert_baseline_label: str | None = None
         self.curve_revert_baseline_signature: str | None = None
         self.curve_revert_baseline_payload: dict[str, object] | None = None
-        self.set_curve_revert_baseline("Neutral")
+        self.set_curve_revert_baseline(initial_curve_label or "Neutral")
         self.output_preset_auto_applied = False
         self.output_preset_curve_auto_loaded = False
         self.updating_output_preset_switch = False
@@ -822,23 +828,13 @@ def on_import_apo_done(self, dialog: Gtk.FileDialog, result: Gio.AsyncResult) ->
             self.set_visible_band_count(imported_count)
             self.current_preset_name = None
             self.saved_preset_signature = self.controller.state_signature()
-            self.set_curve_revert_baseline("Imported APO Preset")
+            self.set_curve_revert_baseline(imported_apo_curve_label(path))
             self.output_preset_curve_auto_loaded = False
+            self.refresh_preset_list()
             self.sync_ui_from_state()
         except Exception as exc:
             self.set_status(str(exc))
 
-    def on_clear_clicked(self, button: Gtk.Button) -> None:
-        self.controller.reset_state()
-        self.selected_band_index = None
-        self.set_visible_band_count(DEFAULT_ACTIVE_BANDS)
-        self.current_preset_name = None
-        self.saved_preset_signature = self.controller.state_signature()
-        self.set_curve_revert_baseline("Neutral")
-        self.output_preset_curve_auto_loaded = False
-        self.sync_ui_from_state()
-        self.set_status("Equalizer Reset")
-
     def on_output_changed(self, combo: Gtk.DropDown, _param: object) -> None:
         if self.updating_output_combo:
             return

src/mini_eq/window_layout.py

@@ -126,7 +126,6 @@ def add_window_action(action_name: str, callback) -> None:
             self.add_action(action)
 
         add_window_action("import-apo", lambda: self.on_import_apo_clicked(tools_button))
-        add_window_action("reset-eq", lambda: self.on_clear_clicked(tools_button))
         add_window_action("preferences", self.show_preferences_dialog)
         add_window_action("about", self.show_about_dialog)
         self.appearance_action = Gio.SimpleAction.new_stateful(
@@ -139,7 +138,6 @@ def add_window_action(action_name: str, callback) -> None:
 
         tools_menu = Gio.Menu()
         tools_menu.append("Import Equalizer APO…", "win.import-apo")
-        tools_menu.append("Reset EQ", "win.reset-eq")
 
         appearance_menu = Gio.Menu()
         appearance_menu.append("Follow System", "win.appearance::system")

src/mini_eq/window_presets.py

@@ -32,6 +32,15 @@
 )
 from .window_utils import requested_switch_state, set_switch_confirmed_state
 
+APO_IMPORT_LABEL_PREFIX = "Imported APO: "
+
+
+def imported_apo_curve_label(path: str) -> str:
+    preset_name = sanitize_preset_name(Path(path).stem)
+    if preset_name:
+        return f"{APO_IMPORT_LABEL_PREFIX}{preset_name}"
+    return "Imported APO"
+
 
 @dataclass(frozen=True)
 class PresetPanelUiState:
@@ -175,6 +184,25 @@ def has_curve_revert_changes(self) -> bool:
     def curve_revert_target_is_neutral(self) -> bool:
         return self.current_preset_name is None and self.curve_revert_signature() == self.default_preset_signature
 
+    def current_curve_selector_label(self) -> str | None:
+        if self.current_preset_name is not None:
+            return None
+
+        label = self.curve_revert_label()
+        signature = self.curve_revert_signature()
+        if not label or signature is None or signature == self.default_preset_signature:
+            return None
+        return label
+
+    def suggested_save_as_name(self) -> str:
+        if self.current_preset_name is not None:
+            return self.current_preset_name
+
+        label = self.current_curve_selector_label()
+        if label and label.startswith(APO_IMPORT_LABEL_PREFIX):
+            return sanitize_preset_name(label[len(APO_IMPORT_LABEL_PREFIX) :])
+        return ""
+
     def output_preset_is_active(self) -> bool:
         linked_preset = self.output_preset_link_name()
         return bool(
@@ -443,11 +471,19 @@ def update_default_preset_state(self) -> None:
 
     def refresh_preset_list(self) -> None:
         self.preset_names = list_preset_names()
-        self.preset_model.splice(0, self.preset_model.get_n_items(), self.preset_names)
+        display_names = list(self.preset_names)
+        combo_preset_names: list[str | None] = list(self.preset_names)
 
         selected_index = Gtk.INVALID_LIST_POSITION
         if self.current_preset_name in self.preset_names:
             selected_index = self.preset_names.index(self.current_preset_name)
+        elif current_curve_label := self.current_curve_selector_label():
+            display_names.insert(0, current_curve_label)
+            combo_preset_names.insert(0, None)
+            selected_index = 0
+
+        self.preset_combo_preset_names = combo_preset_names
+        self.preset_model.splice(0, self.preset_model.get_n_items(), display_names)
 
         self.updating_preset_combo = True
         try:
@@ -685,11 +721,16 @@ def on_preset_selected(self, combo: Gtk.DropDown, _param: object) -> None:
             return
 
         selected = combo.get_selected()
-        if selected == Gtk.INVALID_LIST_POSITION or selected >= len(self.preset_names):
+        combo_preset_names = getattr(self, "preset_combo_preset_names", self.preset_names)
+        if selected == Gtk.INVALID_LIST_POSITION or selected >= len(combo_preset_names):
+            return
+
+        preset_name = combo_preset_names[selected]
+        if preset_name is None:
             return
 
         try:
-            self.load_library_preset(self.preset_names[selected])
+            self.load_library_preset(preset_name)
         except Exception as exc:
             self.set_status(str(exc))
 
@@ -704,7 +745,7 @@ def on_preset_save_clicked(self, button: Gtk.Button) -> None:
         self.on_preset_save_as_clicked(button)
 
     def on_preset_save_as_clicked(self, button: Gtk.Button) -> None:
-        initial_name = self.current_preset_name or ""
+        initial_name = self.suggested_save_as_name()
         self.prompt_for_preset_name("Save Preset As", "Save", initial_name, self.save_current_state_to_preset)
 
     def on_preset_revert_clicked(self, button: Gtk.Button) -> None:

tests/test_mini_eq_output_presets.py

@@ -385,6 +385,43 @@ def test_revert_action_tracks_unsaved_import_baseline() -> None:
     assert test_window.statuses[-1] == "Reverted to Imported APO Preset"
 
 
+def test_unsaved_apo_import_is_shown_in_preset_selector(monkeypatch, tmp_path) -> None:
+    monkeypatch.setattr(core, "PRESET_STORAGE_DIR", tmp_path / "presets")
+    controller = make_controller()
+    controller.bands[0].gain_db = 2.0
+    test_window = OutputPresetWindow(controller)
+    test_window.set_curve_revert_baseline("Imported APO: HD 650")
+
+    test_window.refresh_preset_list()
+
+    assert test_window.preset_model.items == ["Imported APO: HD 650"]
+    assert test_window.preset_combo.selected == 0
+    assert test_window.suggested_save_as_name() == "HD 650"
+
+    test_window.on_preset_selected(test_window.preset_combo, None)
+
+    assert test_window.current_preset_name is None
+
+
+def test_saved_preset_selection_maps_past_unsaved_apo_selector_item(monkeypatch, tmp_path) -> None:
+    monkeypatch.setattr(core, "PRESET_STORAGE_DIR", tmp_path / "presets")
+    write_test_preset("Headphones", 4.0)
+    controller = make_controller()
+    controller.bands[0].gain_db = 2.0
+    test_window = OutputPresetWindow(controller)
+    test_window.set_curve_revert_baseline("Imported APO: HD 650")
+
+    test_window.refresh_preset_list()
+
+    assert test_window.preset_model.items == ["Imported APO: HD 650", "Headphones"]
+
+    test_window.preset_combo.selected = 1
+    test_window.on_preset_selected(test_window.preset_combo, None)
+
+    assert test_window.current_preset_name == "Headphones"
+    assert controller.bands[0].gain_db == 4.0
+
+
 def test_initial_output_preset_auto_loads_linked_preset(monkeypatch, tmp_path) -> None:
     monkeypatch.setattr(core, "PRESET_STORAGE_DIR", tmp_path / "presets")
     monkeypatch.setattr(core, "OUTPUT_PRESET_LINKS_PATH", tmp_path / "output-presets.json")