vappman 0.8__py3-none-any.whl → 0.9.1__py3-none-any.whl

vappman/main.py

@@ -72,16 +72,28 @@ class Vappman:
         if not ok:
             sys.exit(1)
 
-    def cmd_dict(self, cmd, start='◆ '):
-        """ Get lines with the given start."""
+    def cmd_dict(self, cmd, start=r'\s*◆\s'):
+        """ Get lines with the given start put into a dict keyed by the
+            1st word.
+        """
         # Define the command to run
         command = cmd.split()
         # Run the command and capture the output
-        result = subprocess.run(command, stdout=subprocess.PIPE, text=True, check=True)
+        try:
+            result = subprocess.run(command, stdout=subprocess.PIPE, text=True, check=False)
+        except Exception as exc:
+            Window.stop_curses()
+            print(f'FAILED: {command}: {exc}')
+            sys.exit(1)
+
+        if result.returncode != 0:
+            print(f'WARNING: {command}: {result.returncode=}')
         lines = result.stdout.splitlines()
+        ansi_escape_pattern = re.compile(r'\x1B\[[0-?]*[ -/]*[@-~]')
         rv = {}
         for line in lines:
-            if line.startswith(start):
+            line = ansi_escape_pattern.sub('', line).strip() # get clean text
+            if re.match(start, line):
                 wd1 = self.get_word1(line)
                 if wd1:
                     rv[wd1] = line
@@ -147,21 +159,21 @@ class Vappman:
                 # EXPAND
                 lines = [
                     'ALWAYS AVAILABLE:',
-                    '   q or x - quit program (CTL-C disabled)',
                     '   a - about (more info about app)',
                     '   s - sync (update appman itself)',
                     '   c - clean (remove unneeded files/folters)',
                     '   U - update ALL installed apps',
-                    '   / - filter apps',
-                    '   ENTER = install, remove, or return from help',
+                    '   q or x - quit program (CTL-C disabled)',
+                    '   / - filter apps by keywords or regex',
                     '   ESC = clear filter and jump to top',
+                    '   ENTER = install, remove, or return from help',
                     'CONTEXT SENSITIVE:',
                     '   i - install uninstalled app',
                     '   r - remove installed app',
-                    '   b - backup installed app',
                     '   u - update installed app',
-                    '   t - test by opening a terminal emulator and launching the app'
+                    '   b - backup installed app',
                     '   o - overwrite app from its backup',
+                    '   t - test by opening a terminal emulator and launching the app',
 
                 ]
                 for line in lines:
@@ -203,7 +215,7 @@ class Vappman:
             else:
                 line += f' {key}:{verb}'
         # or EXPAND
-        line += f' ?:help quit about sync clean Upd /{self.prev_filter}  '
+        line += f' about ❚ sync clean Upd quit ?:help /{self.prev_filter}  '
         # for action in self.actions:
             # line += f' {action[0]}:{action}'
         return line[1:]
@@ -219,9 +231,9 @@ class Vappman:
             # EXPAND
             if self.pick_is_installed:
                 actions['r'] = 'rmv'
+                actions['u'] = 'upd'
                 actions['b'] = 'bkup'
                 actions['o'] = 'overwr'
-                actions['u'] = 'upd'
                 actions['t'] = 'test'
             else:
                 actions['i'] = 'install'
@@ -241,6 +253,9 @@ class Vappman:
         wds = parts[0].split()
         this.win.head.pad.move(0, 0)
         for wd in wds:
+            if wd[0]in ('<', '|', '❚'):
+                this.win.add_header(wd + ' ', resume=True)
+                continue
             if wd:
                 this.win.add_header(wd[0], attr=cs.A_BOLD|cs.A_UNDERLINE, resume=True)
             if wd[1:]:

{vappman-0.8.dist-info → vappman-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vappman
-Version: 0.8
+Version: 0.9.1
 Summary: A visual wrapper for appman
 Author-email: Joe Defen <joedef@google.com>
 License: MIT
@@ -13,8 +13,8 @@ Classifier: Operating System :: POSIX :: Linux
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: psutil >=5.9
-Requires-Dist: importlib-metadata ; python_version < "3.8"
+Requires-Dist: psutil>=5.9
+Requires-Dist: importlib-metadata; python_version < "3.8"
 
 # vappman
 `vappman` presents a visual (curses) interface to `appman`.
@@ -69,12 +69,13 @@ But it does NOT cover:
 * Use `i` to install apps, and `r` to remove apps.  When you install or remove an app, `appman` drops out of `curses` mode, runs the `appman` command so you can see the result, and then prompts your to hit ENTER to return to `vappman.
 * Use `t` to "test" an installed app.  This launches a terminal emulator and then the app so you can see issues. This is not for daily use obviously, but for after install or when having unknown issues and you wish to start the investigation.
 
-## Example Screenshot (of v0.7 ... current release will vary slightly)
+## Example Screenshot (of v0.9 ... current release will vary slightly)
 ![vappman-with-filter](https://github.com/joedefen/vappman/blob/main/images/vappman-with-filter.png?raw=true).
 
 ---
 
 NOTES: in this example:
+* keys to the left of `❚` apply to the highlighted app; keys to the right apply globally.
 * the filter is `card` so it shows app lines with words starting with `card`.
 * the reverse video, current position is on `glabels`;
   thus if `i` (or ENTER) is typed, `appman install glabels` is run.
@@ -82,8 +83,8 @@ NOTES: in this example:
   all the filtered apps; otherwise, the decoration suggests where you are in the
   partial view of the filtered apps.
 * the matching installed app has the '✔✔✔' prefix.
-* the fixed top line shows some of the available action keys (e.g., `q` quits the app)
+* the fixed top line shows mos of the available action keys (e.g., `q` quits the app)
 * use `?` to open the help screen describing all keys (including navigation)
 
-## Screen Recording (Intro to vappman based on v0.7)
-[![Screen Recording](https://i9.ytimg.com/vi_webp/NUHYN9_DZtA/mq3.webp?sqp=CMTu4LMG-oaymwEmCMACELQB8quKqQMa8AEB-AHqBYAC4AOKAgwIABABGEogZShRMA8=&rs=AOn4CLBaBrOpAhJkRIQQNNdCzYaqpOYl-Q)](https://youtu.be/NUHYN9_DZtA)
+## Screen Recording (Intro to vappman based on v0.9)
+[![Screen Recording](https://i9.ytimg.com/vi_webp/NUHYN9_DZtA/mq3.webp?sqp=CMTu4LMG-oaymwEmCMACELQB8quKqQMa8AEB-AHqBYAC4AOKAgwIABABGEogZShRMA8=&rs=AOn4CLBaBrOpAhJkRIQQNNdCzYaqpOYl-Q)](https://www.youtube.com/watch?v=fC2EYMMcMQk)

vappman-0.9.1.dist-info/RECORD

@@ -0,0 +1,9 @@
+vappman/PowerWindow.py,sha256=pQGXsAMeuiHn-vtEiVG0rgW1eCslh3ukC-VrPhH_j3k,28587
+vappman/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+vappman/main.py,sha256=f1Hnx5SF0pXvKtERtdXoKW_R4UDxLUuq25MZoHJnc8g,17682
+vappman-0.9.1.dist-info/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
+vappman-0.9.1.dist-info/METADATA,sha256=JhPKqVdh-XtOum4iwLL7R-lKyrFgAU7xsbcG6yimI7M,5027
+vappman-0.9.1.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+vappman-0.9.1.dist-info/entry_points.txt,sha256=7_1MiUvkCJoElLePOCJYqhkQN4xmadBRQCKupOwzt90,46
+vappman-0.9.1.dist-info/top_level.txt,sha256=5_Gb5oZh7s2-i62gLXZ6INVALAV9D0-yqh0TvNqpPC4,8
+vappman-0.9.1.dist-info/RECORD,,

{vappman-0.8.dist-info → vappman-0.9.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.1)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

vappman-0.8.dist-info/RECORD

@@ -1,9 +0,0 @@
-vappman/PowerWindow.py,sha256=pQGXsAMeuiHn-vtEiVG0rgW1eCslh3ukC-VrPhH_j3k,28587
-vappman/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vappman/main.py,sha256=FBTCzbOa9dCyzTHX3ietF9_avrMRareYFxmnd65wc2M,17066
-vappman-0.8.dist-info/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
-vappman-0.8.dist-info/METADATA,sha256=BJMibKDn0HtJFZcvP55MtNLnqK1P77NeTFOHkaDTm7o,4921
-vappman-0.8.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-vappman-0.8.dist-info/entry_points.txt,sha256=7_1MiUvkCJoElLePOCJYqhkQN4xmadBRQCKupOwzt90,46
-vappman-0.8.dist-info/top_level.txt,sha256=5_Gb5oZh7s2-i62gLXZ6INVALAV9D0-yqh0TvNqpPC4,8
-vappman-0.8.dist-info/RECORD,,