vappman 0.4__tar.gz → 0.6__tar.gz

{vappman-0.4/src/vappman.egg-info → vappman-0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vappman
-Version: 0.4
+Version: 0.6
 Summary: A visual wrapper for appman
 Author-email: Joe Defen <joedef@google.com>
 License: MIT
@@ -22,20 +22,41 @@ Requires-Dist: psutil>=5.9
 * Install `vappman` using `pipx install vappman`, or however you do so.
 * Prerequisites: install [ivan-hc/AppMan: AppImage package manager to install, update (for real) and manage ALL of them locally thanks to "AM", the ever-growing AUR-inspired database listing (for now) 1900+ portable apps and programs for GNU/Linux. Manage your AppImages with the ease of APT and the power of PacMan.](https://github.com/ivan-hc/AppMan) and all of its prerequisites.
 
-NOTE: `vappman` is in a very preliminary state,
-but it implements the most needed, basic functionality:
-* filtering the app list
-* installing new apps
-* removing installed apps
+NOTE: `vappman` covers many capabilities of appman:
+* implicitly, (-f) files (or show installed), (-l) list available apps,
+  and (-q) search the app list
+* (-i) installing uninstalled apps
+* (-r) removing installed apps
+* (-b) backup / (-o) overwrite of installed apps
+* (-a) about (i.e., more info) for all apps
+* (-c) clean to remove unneeded files and directories
+* (-u) update installed apps; and `vappman` uses "U" for update
+       all installed apps
+
+But it does NOT cover:
+* (-d) download install script
+* (-h) help or full help for appman
+* (-H) home or set $HOME directory for apps
+* (-t) template for custom install template
+* (-v) version of appman
+* --force-latest to get the most recent stable release AND
+  all other options and unmentioned commands.
 
 ## Usage
 * Run `vappman` from the command line.
 * 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
+    * If you enter plain ole "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.)
@@ -46,10 +67,12 @@ but it implements the most needed, basic functionality:
 
 ---
 
-NOTES:
-* 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.
+NOTES: in this example:
+* 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.
 

{vappman-0.4 → vappman-0.6}/README.md

@@ -4,20 +4,41 @@
 * Install `vappman` using `pipx install vappman`, or however you do so.
 * Prerequisites: install [ivan-hc/AppMan: AppImage package manager to install, update (for real) and manage ALL of them locally thanks to "AM", the ever-growing AUR-inspired database listing (for now) 1900+ portable apps and programs for GNU/Linux. Manage your AppImages with the ease of APT and the power of PacMan.](https://github.com/ivan-hc/AppMan) and all of its prerequisites.
 
-NOTE: `vappman` is in a very preliminary state,
-but it implements the most needed, basic functionality:
-* filtering the app list
-* installing new apps
-* removing installed apps
+NOTE: `vappman` covers many capabilities of appman:
+* implicitly, (-f) files (or show installed), (-l) list available apps,
+  and (-q) search the app list
+* (-i) installing uninstalled apps
+* (-r) removing installed apps
+* (-b) backup / (-o) overwrite of installed apps
+* (-a) about (i.e., more info) for all apps
+* (-c) clean to remove unneeded files and directories
+* (-u) update installed apps; and `vappman` uses "U" for update
+       all installed apps
+
+But it does NOT cover:
+* (-d) download install script
+* (-h) help or full help for appman
+* (-H) home or set $HOME directory for apps
+* (-t) template for custom install template
+* (-v) version of appman
+* --force-latest to get the most recent stable release AND
+  all other options and unmentioned commands.
 
 ## Usage
 * Run `vappman` from the command line.
 * 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
+    * If you enter plain ole "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.)
@@ -28,10 +49,12 @@ but it implements the most needed, basic functionality:
 
 ---
 
-NOTES:
-* 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.
+NOTES: in this example:
+* 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.
 

{vappman-0.4 → vappman-0.6}/pyproject.toml

@@ -55,7 +55,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vappman"
-version = "0.4"
+version = "0.6"
 description = "A visual wrapper for appman"
 authors = [
     { name = "Joe Defen", email = "joedef@google.com" }

{vappman-0.4 → vappman-0.6}/src/vappman/main.py

@@ -14,6 +14,7 @@ Interactive, visual thin layer atop appman
 import os
 import sys
 import re
+import shutil
 import subprocess
 import traceback
 import copy
@@ -32,27 +33,42 @@ 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])
 
-        other = 'ir/q'
+        # EXPAND
+        other = 'airbou/qscU'
         other_keys = set(ord(x) for x in other)
+        other_keys.add(cs.KEY_ENTER)
+        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()
         self.apps = self.cmd_dict('appman list')
         self.installs = self.get_installed() # dict keyed by app
         self.win = Window(head_line=True, body_rows=len(self.apps)+20, head_rows=10,
                           keys=spin.keys ^ other_keys, mod_pick=self.mod_pick)
 
+    @staticmethod
+    def check_preqreqs():
+        """ Check that needed programs are installed. """
+        ok = True
+        for prog in 'curl grep jq sed wget appman'.split():
+            if shutil.which(prog) is None:
+                ok = False
+                print(f'ERROR: cannot find {prog!r} on $PATH')
+                if prog == 'appman':
+                    print('Install appman with:')
+                    print("""mkdir -p ~/.local/bin && cd /tmp &&"""
+                          """ wget https://raw.githubusercontent.com/ivan-hc/AM/main/APP-MANAGER"""
+                          """ -O appman && chmod a+x ./appman && mv ./appman ~/.local/bin/appman""")
+        if not ok:
+            sys.exit(1)
 
     def cmd_dict(self, cmd, start='◆ '):
         """ Get lines with the given start."""
@@ -77,7 +93,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):
@@ -89,13 +105,23 @@ class Vappman:
                 self.win.set_pick_mode(False)
                 self.spin.show_help_nav_keys(self.win)
                 self.spin.show_help_body(self.win)
+                # EXPAND
                 lines = [
                     'ALWAYS AVAILABLE:',
-                    '   / - filter apps',
                     '   q - 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',
                     'CONTEXT SENSITIVE:',
                     '   i - install uninstalled app',
                     '   r - remove installed app',
+                    '   b - backup installed app',
+                    '   u - update installed app',
+                    '   o - overwrite app from its backup',
+
                 ]
                 for line in lines:
                     self.win.put_body(line)
@@ -106,15 +132,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():
+                for app, line in self.installs.items():
+                    if app in self.apps:
+                        line = self.apps[app]
                     if wanted(line):
+                        line = '✔✔✔' + line[1:]
                         self.win.add_body(line)
                 for app, line in self.apps.items():
                     if app not in self.installs and wanted(line):
                         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))
@@ -122,11 +148,13 @@ class Vappman:
 
     def get_keys_line(self):
         """ TBD """
+        # EXPAND
         filt = self.prev_filter if self.prev_filter else '{No-Filt}'
         line = 'KEYS:'
         for key, verb in self.actions.items():
             line += f' {key}:{verb}'
-        line += f' ?:help q:quit /{filt}  '
+        # or EXPAND
+        line += f' ?:help q:quit a:about s:sync c:clean U:upd /{filt}  '
         # for action in self.actions:
             # line += f' {action[0]}:{action}'
         return line
@@ -139,8 +167,12 @@ class Vappman:
             line = lines[self.win.pick_pos]
             app = self.get_word1(line)
             self.pick_is_installed = bool(app in self.installs)
+            # EXPAND
             if self.pick_is_installed:
-                actions['r'] = 'remove'
+                actions['r'] = 'rmv'
+                actions['b'] = 'bkup'
+                actions['o'] = 'overwr'
+                actions['u'] = 'upd'
             else:
                 actions['i'] = 'install'
 
@@ -170,54 +202,59 @@ class Vappman:
 #           line = line[0:-over]
 
 #       return line + suffix
+    def run_appman(self, cmd):
+        Window.stop_curses()
+        os.system(f'clear; stty sane; {cmd};'
+                  + ' /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
+            elif 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 == ord('q'):
             self.win.stop_curses()
             os.system('clear; stty sane')
             sys.exit(0)
 
         if key == ord('i') and not self.pick_is_installed:
-            # pylint: disable=protected-access
-            Window.stop_curses()
-            os.system(f'clear; stty sane; appman install {self.pick_app};'
-                      + ' echo -e "\n\nHit ENTER to return to menu"; read FOO')
-            self.installs = self.get_installed()
-            Window._start_curses()
+            self.run_appman(f'appman install {self.pick_app}')
             return None
 
         if key == ord('r') and self.pick_is_installed:
-            # pylint: disable=protected-access
-            Window.stop_curses()
-            os.system(f'clear; stty sane; appman remove {self.pick_app};'
-                      + ' echo -e "\n\nHit ENTER to return to menu"; read FOO')
-            self.installs = self.get_installed() # dict keyed by app
-            Window._start_curses()
+            self.run_appman(f'appman remove {self.pick_app}')
             return None
 
+        if key == ord('s'):
+            self.run_appman('appman sync')
+        if key == ord('c'):
+            self.run_appman('appman clean')
+        if key == ord('b'):
+            self.run_appman(f'appman backup {self.pick_app}')
+        if key == ord('o'):
+            self.run_appman(f'appman overwrite {self.pick_app}')
+        if key == ord('a'):
+            self.run_appman(f'appman about {self.pick_app}')
+        if key == ord('u'):
+            self.run_appman(f'appman update {self.pick_app}')
+        if key == ord('U'):
+            self.run_appman(f'appman update')
+        # EXPAND
+
         if key == ord('/'):
             # pylint: disable=protected-access
 

{vappman-0.4 → vappman-0.6/src/vappman.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vappman
-Version: 0.4
+Version: 0.6
 Summary: A visual wrapper for appman
 Author-email: Joe Defen <joedef@google.com>
 License: MIT
@@ -22,20 +22,41 @@ Requires-Dist: psutil>=5.9
 * Install `vappman` using `pipx install vappman`, or however you do so.
 * Prerequisites: install [ivan-hc/AppMan: AppImage package manager to install, update (for real) and manage ALL of them locally thanks to "AM", the ever-growing AUR-inspired database listing (for now) 1900+ portable apps and programs for GNU/Linux. Manage your AppImages with the ease of APT and the power of PacMan.](https://github.com/ivan-hc/AppMan) and all of its prerequisites.
 
-NOTE: `vappman` is in a very preliminary state,
-but it implements the most needed, basic functionality:
-* filtering the app list
-* installing new apps
-* removing installed apps
+NOTE: `vappman` covers many capabilities of appman:
+* implicitly, (-f) files (or show installed), (-l) list available apps,
+  and (-q) search the app list
+* (-i) installing uninstalled apps
+* (-r) removing installed apps
+* (-b) backup / (-o) overwrite of installed apps
+* (-a) about (i.e., more info) for all apps
+* (-c) clean to remove unneeded files and directories
+* (-u) update installed apps; and `vappman` uses "U" for update
+       all installed apps
+
+But it does NOT cover:
+* (-d) download install script
+* (-h) help or full help for appman
+* (-H) home or set $HOME directory for apps
+* (-t) template for custom install template
+* (-v) version of appman
+* --force-latest to get the most recent stable release AND
+  all other options and unmentioned commands.
 
 ## Usage
 * Run `vappman` from the command line.
 * 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
+    * If you enter plain ole "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.)
@@ -46,10 +67,12 @@ but it implements the most needed, basic functionality:
 
 ---
 
-NOTES:
-* 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.
+NOTES: in this example:
+* 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.