vappman 0.5__tar.gz → 0.7__tar.gz

{vappman-0.5/src/vappman.egg-info → vappman-0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vappman
-Version: 0.5
+Version: 0.7
 Summary: A visual wrapper for appman
 Author-email: Joe Defen <joedef@google.com>
 License: MIT
@@ -47,12 +47,25 @@ But it does NOT cover:
 * It presents some keys available on the top line.
     * Use '?' to learn the navigation keys (e.g., you can use the mouse wheel,
       arrow keys, and many `vi`-like keys)
+    * '?' also elaborates the meaning of the available keys for operations.
+    * NOTE: `ENTER` acts differently based on context:
+      * In help, it returns to the main menu.
+      * On an uninstalled app, it installs it.
+      * On an installed app, it uninstalls it.
 * Then `vappman` presents a list of installed apps, followed by available/uninstalled apps.
+    * Installed apps have prefix '✔✔✔' (i.e., three checks).
+    * Uninstalled apps have prefix '◆' (i.e., a solid diamond).
 * Enter `/` to enter a "filter" for installed/uninstalled apps, if you wish.
-    * If you enter plain old "words", then those words must match the beginning of words
-      of the apps or descriptions (in order, but not contiguously).
-    * Or you can enter an regular expression acceptable to python (e.g., `\b` means word
-      boundary, etc.)
+    * If you enter plain ole "words", then those words must match:
+      * the start of words on the apps line (in order, but not contiguously) and/or
+      * the start of the remainder of the previous word match
+        (i.e., `/bit fight` matches `bitfighter`).
+    * Or you can enter an regular expression acceptable to python; e.g.,
+      * `^` matches the line starting with the app name
+      * `\b` matches a word boundary; and so forth.
+    * NOTES:
+      * `ESC` clears the filter and jumps to the top of the listing.
+      * Each time the filter is changed, the position jumps to the top of the listing.
 * 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.
 
 ## Example Screenshot
@@ -61,9 +74,13 @@ But it does NOT cover:
 ---
 
 NOTES: in this example:
-* the filter is `card` so it shows apps with words starting with `card`.
-* the current position is on `glabels`; thus if `i` is typed, `appman install glabels` is run.
+* 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.
 * if the horizontal line (second line show) has no decorations, then you are looking
   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)
+* use `?` to open the help screen describing all keys (including navigation)
 

{vappman-0.5 → vappman-0.7}/README.md

@@ -29,12 +29,25 @@ But it does NOT cover:
 * It presents some keys available on the top line.
     * Use '?' to learn the navigation keys (e.g., you can use the mouse wheel,
       arrow keys, and many `vi`-like keys)
+    * '?' also elaborates the meaning of the available keys for operations.
+    * NOTE: `ENTER` acts differently based on context:
+      * In help, it returns to the main menu.
+      * On an uninstalled app, it installs it.
+      * On an installed app, it uninstalls it.
 * Then `vappman` presents a list of installed apps, followed by available/uninstalled apps.
+    * Installed apps have prefix '✔✔✔' (i.e., three checks).
+    * Uninstalled apps have prefix '◆' (i.e., a solid diamond).
 * Enter `/` to enter a "filter" for installed/uninstalled apps, if you wish.
-    * If you enter plain old "words", then those words must match the beginning of words
-      of the apps or descriptions (in order, but not contiguously).
-    * Or you can enter an regular expression acceptable to python (e.g., `\b` means word
-      boundary, etc.)
+    * If you enter plain ole "words", then those words must match:
+      * the start of words on the apps line (in order, but not contiguously) and/or
+      * the start of the remainder of the previous word match
+        (i.e., `/bit fight` matches `bitfighter`).
+    * Or you can enter an regular expression acceptable to python; e.g.,
+      * `^` matches the line starting with the app name
+      * `\b` matches a word boundary; and so forth.
+    * NOTES:
+      * `ESC` clears the filter and jumps to the top of the listing.
+      * Each time the filter is changed, the position jumps to the top of the listing.
 * 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.
 
 ## Example Screenshot
@@ -43,9 +56,13 @@ But it does NOT cover:
 ---
 
 NOTES: in this example:
-* the filter is `card` so it shows apps with words starting with `card`.
-* the current position is on `glabels`; thus if `i` is typed, `appman install glabels` is run.
+* 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.
 * if the horizontal line (second line show) has no decorations, then you are looking
   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)
+* use `?` to open the help screen describing all keys (including navigation)
 

{vappman-0.5 → vappman-0.7}/pyproject.toml

@@ -35,7 +35,7 @@
 # PUBLIC Build and deploy (from project directory):
 #   ## BUMP the version (below in [project])
 #   rm -rf dist; python3 -m build; ls dist/.
-#   python3 -m twine upload dist/* # keyring --disable # may be required
+#   python3 -m twine upload dist/*     # keyring --disable # may be required
 #     ## Enter __token__ and the saved TOKEN (in bitwarden)
 #   pipx upgrade pwr-tray || pipx install pwr-tray # >= python3.11
 #   --OR-- sudo python3 -m pip install pwr-tray # <= python3.10
@@ -55,7 +55,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vappman"
-version = "0.5"
+version = "0.7"
 description = "A visual wrapper for appman"
 authors = [
     { name = "Joe Defen", email = "joedef@google.com" }

{vappman-0.5 → vappman-0.7}/src/vappman/main.py

@@ -6,7 +6,7 @@ Interactive, visual thin layer atop appman
 # pylint: disable=broad-exception-caught,consider-using-with
 # pylint: disable=too-many-instance-attributes,too-many-branches
 # pylint: disable=too-many-return-statements,too-many-statements
-
+# pylint: disable=consider-using-in
 # pylint: disable=wrong-import-position,disable=wrong-import-order
 # import VirtEnv
 # VirtEnv.ensure_venv(__name__)
@@ -17,10 +17,7 @@ import re
 import shutil
 import subprocess
 import traceback
-import copy
-import shutil
 import curses as cs
-from types import SimpleNamespace
 from vappman.PowerWindow import Window, OptionSpinner
 
 
@@ -33,21 +30,20 @@ class Vappman:
         assert not Vappman.singleton
         Vappman.singleton = self
 
-        self.summary_lines = []
-        self.new_summary_lines = True
-
         spin = self.spin = OptionSpinner()
         spin.add_key('help_mode', '? - toggle help screen', vals=[False, True])
 
         # EXPAND
         other = 'airbou/qscU'
         other_keys = set(ord(x) for x in other)
+        other_keys.add(cs.KEY_ENTER)
+        other_keys.add(27) # ESCAPE
+        other_keys.add(10) # another form of ENTER
         self.opts = spin.default_obj
 
         self.actions = {} # currently available actions
         self.pick_app = '' # current picked app
         self.pick_is_installed = False
-        # self.verbs = {'i': 'install', 'r': 'remove', 'v': 'view',}
         self.prev_filter = '' # string
         self.filter = None # compiled pattern
         self.check_preqreqs()
@@ -95,7 +91,7 @@ class Vappman:
 
     def get_installed(self):
         """ Get the list of lines of installed apps """
-        rv = self.cmd_dict('appman files --by-name')
+        rv = self.cmd_dict('appman files --byname')
         return rv
 
     def main_loop(self):
@@ -116,6 +112,8 @@ class Vappman:
                     '   c - clean (remove unneeded files/folters)',
                     '   U - update ALL installed apps',
                     '   / - filter apps',
+                    '   ENTER = install, remove, or return from help',
+                    '   ESC = clear filter and jump to top',
                     'CONTEXT SENSITIVE:',
                     '   i - install uninstalled app',
                     '   r - remove installed app',
@@ -133,15 +131,15 @@ class Vappman:
                 # self.win.set_pick_mode(self.opts.pick_mode, self.opts.pick_size)
                 self.win.set_pick_mode(True)
                 self.win.add_header(self.get_keys_line(), attr=cs.A_BOLD)
-                for line in self.installs.values():
-                    if wanted(line):
+                for app, line in self.installs.items():
+                    if app in self.apps:
+                        line = self.apps[app]
+                    if wanted(line[2:]):
+                        line = '✔✔✔' + line[1:]
                         self.win.add_body(line)
                 for app, line in self.apps.items():
-                    if app not in self.installs and wanted(line):
+                    if app not in self.installs and wanted(line[2:]):
                         self.win.add_body(line)
-#           if self.new_summary_lines:
-#               self.win.pick_pos = self.win.scroll_pos = 0
-#               self.new_summary_lines = False
             self.win.render()
 
             _ = self.do_key(self.win.prompt(seconds=300))
@@ -150,15 +148,17 @@ class Vappman:
     def get_keys_line(self):
         """ TBD """
         # EXPAND
-        filt = self.prev_filter if self.prev_filter else '{No-Filt}'
-        line = 'KEYS:'
+        line = ''
         for key, verb in self.actions.items():
-            line += f' {key}:{verb}'
+            if key[0] == verb[0]:
+                line += f' {verb}'
+            else:
+                line += f' {key}:{verb}'
         # or EXPAND
-        line += f' ?:help q:quit a:about s:sync c:clean U:upd /{filt}  '
+        line += f' ?:help quit about sync clean Upd /{self.prev_filter}  '
         # for action in self.actions:
             # line += f' {action[0]}:{action}'
-        return line
+        return line[1:]
 
     def get_actions(self, line):
         """ Determine the type of the current line and available commands."""
@@ -186,54 +186,56 @@ class Vappman:
         """
         this = Vappman.singleton
         this.pick_app, this.actions = this.get_actions(line)
-        keys_line = this.get_keys_line().ljust(this.win.get_pad_width())
-        this.win.head.pad.addstr(0, 0, keys_line, cs.A_BOLD)
-
+        header = this.get_keys_line()
+        # ASSUME line ends in /....
+        parts = header.split('/', maxsplit=1)
+        wds = parts[0].split()
+        this.win.head.pad.move(0, 0)
+        for wd in wds:
+            if wd:
+                this.win.add_header(wd[0], attr=cs.A_BOLD|cs.A_UNDERLINE, resume=True)
+            if wd[1:]:
+                this.win.add_header(wd[1:] + ' ', resume=True)
+
+        this.win.add_header('/', attr=cs.A_BOLD+cs.A_UNDERLINE, resume=True)
+        if len(parts) > 1 and parts[1]:
+            this.win.add_header(f'{parts[1]}', resume=True)
+        _, col = this.win.head.pad.getyx()
+        pad = ' ' * (this.win.get_pad_width()-col)
+        this.win.add_header(pad, resume=True)
         return line
-#       #IF WE WANT TO DO SOMETHING ON THE LINE...
-#       suffix = ''
-#       for action in actions:
-#           suffix += f' {action[0]}:{action}'
-#       block_char = "\u2588"
-#       suffix = f'{block_char*5} {suffix}'
-#       over = len(line) + len(suffix) - this.win.get_pad_width()
-#       if over < 0:
-#           line += ' '*(-over)
-#       elif over > 0:
-#           line = line[0:-over]
-
-#       return line + suffix
+
     def run_appman(self, cmd):
+        """ Run a 'appman' command """
         Window.stop_curses()
         os.system(f'clear; stty sane; {cmd};'
-                  + ' echo -e "\n\nHit ENTER to return to menu"; read FOO')
+                  + r' /bin/echo -e "\n\n===== Press ENTER for menu ====> \c"; read FOO')
         self.installs = self.get_installed()
         Window._start_curses()
 
     def do_key(self, key):
         """ TBD """
-        def dashes(ns, ok=True):
-            try:
-                # use checkmark or circle-backslash
-                filler = ('\u2713' if ok else '\u2342') * (ns.end - ns.start)
-                line = self.summary_lines[self.win.pick_pos]
-                line = line[0:ns.start] + filler + line[ns.end:]
-                self.summary_lines[self.win.pick_pos] = line
-                self.win.draw(self.win.pick_pos, 0, line, width=self.win.get_pad_width(), header=False)
-                self.win.fix_positions(delta=1)
-                self.win.render()
-            except Exception:
-                pass
-
         if not key:
             return True
+        if key == cs.KEY_ENTER or key == 10: # Handle ENTER
+            if self.opts.help_mode:
+                self.opts.help_mode = False
+                return True
+            if self.pick_is_installed:
+                key = ord('r') # removed installed app
+            else:
+                key = ord('i') # install uninstalled app
+
         if key in self.spin.keys:
             value = self.spin.do_key(key, self.win)
-            if key in (ord('p'), ord('s')):
-                self.win.set_pick_mode(on=self.opts.pick_mode, pick_size=self.opts.pick_size)
-            elif key == ord('n'):
-                self.win.alert(title='Info', message=f'got: {value}')
             return value
+        
+        if key == 27: # ESCAPE
+            self.prev_filter = ''
+            self.filter = None
+            self.win.pick_pos = 0
+            return None
+
         if key == ord('q'):
             self.win.stop_curses()
             os.system('clear; stty sane')
@@ -260,11 +262,12 @@ class Vappman:
         if key == ord('u'):
             self.run_appman(f'appman update {self.pick_app}')
         if key == ord('U'):
-            self.run_appman(f'appman update')
+            self.run_appman('appman update')
         # EXPAND
 
         if key == ord('/'):
             # pylint: disable=protected-access
+            start_filter = self.prev_filter
 
             prefix = ''
             while True:
@@ -274,18 +277,22 @@ class Vappman:
                 pattern.strip()
                 if not pattern:
                     self.filter = None
-                    return None
+                    break
 
                 try:
                     if re.match(r'^[\-\w\s]*$', pattern):
                         words = pattern.split()
-                        self.filter = re.compile(r'\b' + r'\b.*'.join(words), re.IGNORECASE)
-                        return None
+                        self.filter = re.compile(r'\b' + r'(|.*\b)'.join(words), re.IGNORECASE)
+                        break
                     self.filter = re.compile(pattern, re.IGNORECASE)
-                    return None
+                    break
                 except Exception:
                     prefix = 'Bad regex: '
 
+            if start_filter != self.prev_filter:
+                # when filter changes, move to top
+                self.win.pick_pos = 0
+
             return None
         return None
 

{vappman-0.5 → vappman-0.7/src/vappman.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vappman
-Version: 0.5
+Version: 0.7
 Summary: A visual wrapper for appman
 Author-email: Joe Defen <joedef@google.com>
 License: MIT
@@ -47,12 +47,25 @@ But it does NOT cover:
 * It presents some keys available on the top line.
     * Use '?' to learn the navigation keys (e.g., you can use the mouse wheel,
       arrow keys, and many `vi`-like keys)
+    * '?' also elaborates the meaning of the available keys for operations.
+    * NOTE: `ENTER` acts differently based on context:
+      * In help, it returns to the main menu.
+      * On an uninstalled app, it installs it.
+      * On an installed app, it uninstalls it.
 * Then `vappman` presents a list of installed apps, followed by available/uninstalled apps.
+    * Installed apps have prefix '✔✔✔' (i.e., three checks).
+    * Uninstalled apps have prefix '◆' (i.e., a solid diamond).
 * Enter `/` to enter a "filter" for installed/uninstalled apps, if you wish.
-    * If you enter plain old "words", then those words must match the beginning of words
-      of the apps or descriptions (in order, but not contiguously).
-    * Or you can enter an regular expression acceptable to python (e.g., `\b` means word
-      boundary, etc.)
+    * If you enter plain ole "words", then those words must match:
+      * the start of words on the apps line (in order, but not contiguously) and/or
+      * the start of the remainder of the previous word match
+        (i.e., `/bit fight` matches `bitfighter`).
+    * Or you can enter an regular expression acceptable to python; e.g.,
+      * `^` matches the line starting with the app name
+      * `\b` matches a word boundary; and so forth.
+    * NOTES:
+      * `ESC` clears the filter and jumps to the top of the listing.
+      * Each time the filter is changed, the position jumps to the top of the listing.
 * 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.
 
 ## Example Screenshot
@@ -61,9 +74,13 @@ But it does NOT cover:
 ---
 
 NOTES: in this example:
-* the filter is `card` so it shows apps with words starting with `card`.
-* the current position is on `glabels`; thus if `i` is typed, `appman install glabels` is run.
+* 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.
 * if the horizontal line (second line show) has no decorations, then you are looking
   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)
+* use `?` to open the help screen describing all keys (including navigation)