vappman 2.2.1__tar.gz → 2.2.2__tar.gz

{vappman-2.2.1 → vappman-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: vappman
-Version: 2.2.1
+Version: 2.2.2
 Summary: A visual wrapper for appman
 Keywords: app,installer,manager,appimages
 Author-email: Joe Defen <joedef@google.com>
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: POSIX :: Linux
 License-File: LICENSE
-Requires-Dist: console-window == 2.1.3
+Requires-Dist: console-window == 2.2.2
 Requires-Dist: pytest>=7 ; extra == "dev"
 Requires-Dist: pytest-cov>=5 ; extra == "dev"
 Requires-Dist: ruff>=0.6 ; extra == "dev"

{vappman-2.2.1 → vappman-2.2.2}/pyproject.toml

@@ -32,7 +32,7 @@ classifiers = [
     "Operating System :: POSIX :: Linux"
 ]
 dependencies = [
-    'console-window == 2.1.3',
+    'console-window == 2.2.2',
 ]
 
 [project.urls]
@@ -61,6 +61,20 @@ dev = [
 testpaths = ["tests"]
 addopts = "-ra"
 
+[tool.coverage.run]
+source = ["vappman"]
+
+[tool.coverage.report]
+# Set just below the measured number when the shared gate was adopted.  Raise
+# it as the suite grows; never lower it to make a commit pass.
+fail_under = 35
+
+[tool.bless]
+# The default is the pair, written out here so the branch model is visible
+# where the rest of this project's identity lives.  `publish` aligns `dev`
+# with `main` before tagging, and pushes both.
+branches = ["main", "dev"]
+
 [tool.ruff]
 # Keep the lint gate identical on every machine: no global/user config can
 # change which rules the gate enforces.  The selection below is deliberately

{vappman-2.2.1 → vappman-2.2.2}/vappman/Appearance.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-"""Semantic colour roles and the appearance preferences for vappman.
+"""The appearance preferences for vappman.
 
 Colour is decoration, never information.  Every role degrades to an attribute
 (or to plain text) when the terminal has no colour, so the installed markers
@@ -12,69 +12,35 @@ colour numbers.  console-window installs those pairs at startup and re-installs
 them whenever a theme is applied, so changing the active theme recolours the
 whole UI without an edit to any draw code.
 
+The role-to-attribute mapping, the process-wide switch and the forgiving lookup
+live in :mod:`console_window.appearance`, and are re-exported here.  Keeping one
+switch matters: the library's theme picker paints its swatches through that
+layer, so a vappman-local copy would leave the picker in colour while the rest
+of the UI went mono.
+
 ``mono`` is vappman's own no-colour pseudo-theme: console-window's
 ``dark-mono``/``light-mono`` are still colour themes, so the true monochrome
-appearance lives here as the :data:`MONO_ROLES` mapping.  It is part of the
+appearance is "colour off" rather than a library theme.  It is part of the
 picker's rotation but is not a library theme.
 """
 
 import os
-import curses
 
 from console_window import Theme
+from console_window.appearance import (
+    MONO_ROLES, colors_enabled, semantic_attr, set_colors_enabled,
+)
+
+# Explicit re-exports: the appearance API is read from this module by vappman.
+__all__ = [
+    'MONO_ROLES', 'MONO_THEME', 'appearance_choices', 'appearance_label',
+    'colors_enabled', 'resolve_ui_prefs', 'semantic_attr',
+    'set_colors_enabled',
+]
 
 # vappman's pseudo-theme: no colour at all, only attributes.
 MONO_THEME = 'mono'
 
-# Role -> attribute used when colour is off.  The hierarchy is preserved with
-# emphasis instead of hue: destructive prompts are bold+reverse, informational
-# rows carry nothing (their ✔/🔒 and S/U markers already distinguish them).
-MONO_ROLES = {
-    Theme.DANGER: curses.A_BOLD | curses.A_REVERSE,
-    Theme.ERROR: curses.A_BOLD | curses.A_REVERSE,
-    Theme.WARNING: curses.A_BOLD,
-    Theme.SUCCESS: curses.A_BOLD,
-    Theme.EMPHASIS: curses.A_BOLD,
-    Theme.INFO: curses.A_NORMAL,
-    Theme.PROGRESS: curses.A_NORMAL,
-    Theme.OLD_SUCCESS: curses.A_NORMAL,
-    Theme.HOTSWAP: curses.A_NORMAL,
-}
-
-# Process-wide switch, seeded at startup by --no-color / NO_COLOR / mono.  One
-# terminal, so one decision.
-_COLORS_ENABLED = True
-
-
-def set_colors_enabled(enabled):
-    """Turn semantic colour on or off for the whole process."""
-    global _COLORS_ENABLED  # pylint: disable=global-statement
-    _COLORS_ENABLED = bool(enabled)
-
-
-def colors_enabled():
-    """True while semantic roles resolve to colour pairs rather than attributes."""
-    return _COLORS_ENABLED
-
-
-def semantic_attr(pair_id):
-    """Attribute for a console-window ``Theme`` role, or plain when no colour.
-
-    With colour off the role becomes an attribute from :data:`MONO_ROLES`, so
-    the UI keeps its emphasis hierarchy on a monochrome terminal.  Otherwise
-    both ``curses.has_colors()`` and ``curses.color_pair()`` can raise
-    ``curses.error`` before ``initscr()`` (and a failed lookup must never abort
-    a redraw), so any failure degrades to plain text.
-    """
-    if not _COLORS_ENABLED:
-        return MONO_ROLES.get(pair_id, curses.A_NORMAL)
-    try:
-        if not curses.has_colors():
-            return 0
-        return curses.color_pair(pair_id)
-    except curses.error:
-        return 0
-
 
 def appearance_choices():
     """Every appearance the picker cycles, in order.

{vappman-2.2.1 → vappman-2.2.2}/vappman/__init__.py

@@ -1,3 +1,3 @@
 """vappman -- a visual wrapper for appman."""
 
-__version__ = "2.2.1"
+__version__ = "2.2.2"

{vappman-2.2.1 → vappman-2.2.2}/vappman/main.py

@@ -36,8 +36,8 @@ from .Prerequisites import Prerequisites
 from .VappmanListCache import AppCacheManager
 from . import AppimageDoctor
 from .Appearance import (
-    MONO_THEME, appearance_choices, appearance_label, resolve_ui_prefs,
-    semantic_attr, set_colors_enabled,
+    MONO_THEME, appearance_choices, appearance_label, colors_enabled,
+    resolve_ui_prefs, semantic_attr, set_colors_enabled,
 )
 
 # Screen constants
@@ -501,21 +501,39 @@ class VappmanHelpScreen(BasicHelpScreen):
         self.app.ss.push(THEMES_ST, self.app.win.pick_pos)
 
 
-# console-window's generic picker draws the swatches and the hint line; only
-# the cycle is overridden so vappman's 'mono' pseudo-theme is part of the
-# rotation and the process-wide colour switch follows it.  Keeping the generic
-# draw means the preview is console-window's role set, not a vappman copy.
+# Key that cycles the appearance; the picker's hint line advertises it.
+THEME_CYCLE_KEY = 't'
+
+# One dim line under the swatches.  It must not explain mono: a picker entry
+# named 'mono' with a monochrome preview explains itself, and the sentence
+# showed under every colour theme as well.
+THEME_PICKER_NOTE = 'The choice is remembered for the next run.'
+
+# console-window paints the swatches through its appearance layer, so they
+# follow the same process-wide colour switch vappman flips for 'mono': with
+# colour off the picker shows the monochrome role hierarchy instead of the
+# previous palette.  Only the cycle and the header label are vappman's.
 _ThemePickerScreen = Theme.create_picker_screen(
     VappmanScreen,
-    cycle_key='t',
-    note='The last entry, mono, uses no colour at all. '
-         'The choice is remembered for the next run.',
+    cycle_key=THEME_CYCLE_KEY,
+    note=THEME_PICKER_NOTE,
 )
 
 
 class VappmanThemeScreen(_ThemePickerScreen):
     """Theme picker over console-window's themes plus vappman's 'mono'."""
 
+    def theme_label(self, theme_name):
+        """Name 'mono' while colour is off, so header and swatches agree.
+
+        With colour on the generic label names the installed palette.  With
+        colour off the swatches are drawn from the monochrome role attributes,
+        so naming the palette left underneath would tell a different story.
+        """
+        if not colors_enabled():
+            return MONO_THEME
+        return super().theme_label(theme_name)
+
     def spin_theme_ACTION(self):
         """'t' advances to the next appearance (mono included) and persists it."""
         self.app.cycle_appearance()
@@ -596,8 +614,8 @@ class Vappman(Prerequisites):
 
         self.win = ConsoleWindow(win_opts)
         if not self.appearance_colors:
-            # 'mono' is not a library theme; record it on the window for the
-            # picker's header while the installed palette stays at the default.
+            # 'mono' is not a library theme: the installed palette stays at the
+            # default, but the window names the appearance actually in effect.
             self.win.theme = MONO_THEME
 
         # Initialize screens and screen stack
@@ -1038,8 +1056,9 @@ class Vappman(Prerequisites):
         """Make *name* live ('mono' turns colour off) and remember it.
 
         The preference is written immediately so an early exit cannot lose it,
-        and the window is told so its own ``theme`` (which the generic picker
-        reads for the header) matches the colour table that was installed.
+        and the window is told which palette was installed; ``mono`` keeps its
+        own name there so a reader of ``win.theme`` sees the no-colour
+        appearance rather than the default palette left underneath.
         """
         mono = name == MONO_THEME
         self.appearance_colors = not mono
@@ -1048,8 +1067,8 @@ class Vappman(Prerequisites):
         set_colors_enabled(not mono)
         self.win.set_theme('default' if mono else name)
         if mono:
-            # 'mono' is not a library theme: record it for the picker's header
-            # while the installed palette stays at the library default.
+            # 'mono' is not a library theme: the installed palette stays at the
+            # library default, but the window names the appearance in effect.
             self.win.theme = MONO_THEME
         self.disk_state.theme = self.appearance_theme
         self.disk_state.colors = self.appearance_colors