Return to settings when the manage view closes and add a labeled exit row

The manage button closes the settings dialog (<close>true</close>), so
exiting the view dropped the user back into Kodi; the router now reopens
the settings dialog after the view returns. The select dialog's built-in
Cancel button is skin-owned wording the Python API cannot change, so the
view appends its own "Back to settings" row (32134) as the properly
worded exit.

Co-authored-by: Claude <noreply@anthropic.com>

Author: matthane

resources/language/resource.language.en_gb/strings.po

@@ -231,4 +231,8 @@ msgstr ""
 
 msgctxt "#32133"
 msgid "Reset to 0 ms — nothing stored for this stream"
+msgstr ""
+
+msgctxt "#32134"
+msgid "Back to settings"
 msgstr ""

resources/lib/aom/script_router.py

@@ -13,6 +13,11 @@
   delete/clear, P6), reached from the settings dialog's action button.
 - anything else / no argument — open the addon settings (D13: launching
   the addon opens the full settings dialog, the natural hub).
+
+Every route ends in the settings dialog: the manage button closes it on
+press (``<close>true</close>``, the write-ordering doctrine), so reopening
+after the view exits returns the user to where they came from instead of
+dropping them back into Kodi.
 """
 
 import sys
@@ -39,7 +44,8 @@ def handle_script_call(argv=None):
     route = args[1] if len(args) > 1 else ''
     if route == 'manage_offsets':
         _manage_offsets()
-        return
+        # ...then fall through: the manage button closed the settings
+        # dialog, so every exit from the view lands back in it.
     xbmcaddon.Addon(ADDON_ID).openSettings()
 
 

resources/lib/aom/view/manage.py

@@ -43,6 +43,7 @@
 _MSG_UNREADABLE = 32127    # StoreUnreadable (corrupt: will be quarantined)
 _MSG_MUTATION_FAILED = 32128
 _MSG_FUTURE = 32131        # StoreUnreadable(future=True): preserved, not shown
+_LABEL_BACK = 32134        # labeled exit row ("Back to settings")
 
 # English fallbacks for the dialogs whose ENTIRE content is one localized
 # string: localized() degrades to '' on a transient failure, and a blank
@@ -112,9 +113,15 @@ def run(self):
 
             options = [row.label for row in rows]
             options.append(self._gui.localized(_LABEL_CLEAR_ALL))
+            # The select dialog's built-in button says "Cancel" (skin-owned
+            # wording the Python API cannot change), which misreads for a
+            # view where leaving is the normal outcome — so the labeled exit
+            # is a row. Both paths return; the router then reopens the
+            # settings dialog the manage button closed.
+            options.append(self._gui.localized(_LABEL_BACK))
 
             choice = self._gui.select(heading, options)
-            if choice < 0:
+            if choice < 0 or choice == len(rows) + 1:
                 return
 
             if choice == len(rows):

tests/unit/test_manage_view.py

@@ -120,7 +120,7 @@ def test_rows_render_verbatim_signed_milliseconds():
     assert any("-2500 ms" in opt for opt in options)
 
 
-def test_rows_sorted_by_label_with_clear_all_last():
+def test_rows_sorted_by_label_with_clear_all_then_back_last():
     entries = {HLG: _entry(1), DV: _entry(2), HDR10: _entry(3)}
     view, gui, _ = _build(entries)
     view.run()
@@ -130,6 +130,9 @@ def test_rows_sorted_by_label_with_clear_all_last():
     assert options[1].startswith("HDR10")
     assert options[2].startswith("HLG")
     assert options[3] == "#32126"
+    # The labeled exit row: the select dialog's built-in Cancel wording is
+    # skin-owned, so the view provides its own properly-worded way out.
+    assert options[4] == "#32134"
 
 
 def test_malformed_updated_omits_date_without_crashing():
@@ -151,6 +154,19 @@ def test_cancel_exits_without_channel_traffic():
     assert len(gui.selects) == 1
 
 
+def test_back_row_exits_without_channel_traffic():
+    # The labeled exit (last row, after clear-all) behaves exactly like
+    # Cancel: no confirmation, no channel traffic, single render.
+    entries = {DV: _entry(-115)}
+    gui = FakeGui()
+    gui.select_answers = [2]         # rows=1, clear=1 -> back row is index 2
+    view, gui, service = _build(entries, gui=gui)
+    view.run()
+    assert service.calls == []
+    assert gui.yesnos == []
+    assert len(gui.selects) == 1
+
+
 def test_delete_flow_sends_exact_key_and_re_reads():
     entries = {DV: _entry(-115), HDR10: _entry(200)}
     gui = FakeGui()
@@ -161,10 +177,10 @@ def test_delete_flow_sends_exact_key_and_re_reads():
 
     assert service.calls == [("delete", DV)]
     # The store was re-read after the mutation: two renders, the second with
-    # one fewer entry row (plus the clear-all row).
+    # one fewer entry row (plus the clear-all and back rows).
     assert len(gui.selects) == 2
-    assert len(gui.selects[0][1]) == 3     # 2 entries + clear
-    assert len(gui.selects[1][1]) == 2     # 1 entry + clear
+    assert len(gui.selects[0][1]) == 4     # 2 entries + clear + back
+    assert len(gui.selects[1][1]) == 3     # 1 entry + clear + back
     assert not any(opt.startswith("Dolby Vision") for opt in gui.selects[1][1])
 
 

tests/unit/test_script_router.py

@@ -69,16 +69,20 @@ def test_unknown_route_falls_back_to_settings():
     assert RecordingAddon.instances[0].opened == 1
 
 
-def test_manage_offsets_routes_to_the_view(monkeypatch):
+def test_manage_offsets_runs_the_view_then_returns_to_settings(monkeypatch):
+    # Record how many openSettings() calls had happened when the view ran:
+    # the settings dialog must reopen AFTER the view exits (the manage
+    # button closed it via <close>true</close>), never before — the view
+    # must not render on top of a pending save-on-close.
     calls = []
-    monkeypatch.setattr(script_router, '_manage_offsets',
-                        lambda: calls.append(True))
+    monkeypatch.setattr(
+        script_router, '_manage_offsets',
+        lambda: calls.append(sum(a.opened for a in RecordingAddon.instances)))
 
     script_router.handle_script_call(['script.py', 'manage_offsets'])
 
-    assert calls == [True]
-    # D13: the view route must NOT bounce through the settings dialog.
-    assert all(a.opened == 0 for a in RecordingAddon.instances)
+    assert calls == [0]                    # view ran, settings still closed
+    assert sum(a.opened for a in RecordingAddon.instances) == 1
 
 
 def test_manage_offsets_composition(monkeypatch, tmp_path):