vappman 0.7__tar.gz → 0.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vappman
-Version: 0.7
+Version: 0.9
 Summary: A visual wrapper for appman
 Author-email: Joe Defen <joedef@google.com>
 License: MIT
@@ -41,7 +41,7 @@ But it does NOT cover:
 * (-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.
@@ -67,13 +67,15 @@ But it does NOT cover:
       * `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.
+* 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
+## Example Screenshot (of v0.7 ... 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.
@@ -81,6 +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)

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

@@ -23,7 +23,7 @@ But it does NOT cover:
 * (-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.
@@ -49,13 +49,15 @@ But it does NOT cover:
       * `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.
+* 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
+## Example Screenshot (of v0.7 ... 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.
@@ -63,6 +65,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)

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

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

{vappman-0.7 → vappman-0.9}/src/vappman/PowerWindow.py

@@ -588,7 +588,7 @@ class Window:
     def alert(self, title='ALERT', message='', height=1, width=80):
         """Alert box"""
         def mod_key(key):
-            return  7 if key == 10 else key
+            return  7 if key in (10, curses.KEY_ENTER) else key
 
         # need 3 extra cols for rectangle (so we don't draw in southeast corner)
         # and 3 rows (top/prompt/bottom)

{vappman-0.7 → vappman-0.9}/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=consider-using-in,too-many-nested-blocks
 # pylint: disable=wrong-import-position,disable=wrong-import-order
 # import VirtEnv
 # VirtEnv.ensure_venv(__name__)
@@ -14,6 +14,7 @@ Interactive, visual thin layer atop appman
 import os
 import sys
 import re
+import glob
 import shutil
 import subprocess
 import traceback
@@ -34,7 +35,7 @@ class Vappman:
         spin.add_key('help_mode', '? - toggle help screen', vals=[False, True])
 
         # EXPAND
-        other = 'airbou/qscU'
+        other = 'airtbou/qxscU'
         other_keys = set(ord(x) for x in other)
         other_keys.add(cs.KEY_ENTER)
         other_keys.add(27) # ESCAPE
@@ -49,6 +50,9 @@ class Vappman:
         self.check_preqreqs()
         self.apps = self.cmd_dict('appman list')
         self.installs = self.get_installed() # dict keyed by app
+        self.appman_dir = self.get_appman_dir()
+        self.dot_desktop_dir = self.get_dot_desktop_dir()
+        self.terminal_emulator = None
         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)
 
@@ -94,6 +98,43 @@ class Vappman:
         rv = self.cmd_dict('appman files --byname')
         return rv
 
+    @staticmethod
+    def get_appman_dir():
+        """ Try to figure out where the apps are stored. """
+
+        appman_dir = None, None
+        try:
+            config_dir = os.getenv('XDG_CONFIG_HOME')
+            if not config_dir:
+                config_dir = os.path.join(os.getenv('HOME'), '.config')
+            config_file = os.path.join(config_dir, 'appman', 'appman-config')
+            with open(config_file, 'r', encoding='utf-8') as fh:
+                appman_dir = fh.read().strip()
+            appman_dir = os.path.join(os.getenv('HOME'), appman_dir)
+            os.listdir(appman_dir)
+            return appman_dir
+        except Exception as exc:
+            print(f'NOTE: cannot get appman dir; tried below {appman_dir!r}; {exc}')
+            print('    Check if contents of ~/config/appman/appman-config'
+                  + ' is the subdir of $HOME w your appman apps')
+            return None
+
+    @staticmethod
+    def get_dot_desktop_dir():
+        """ Try to figure out where the .desktop files are stored. """
+
+        try:
+            data_dir = os.getenv('XDG_DATA_HOME')
+            if not data_dir:
+                data_dir = os.path.join(os.getenv('HOME'), '.local', 'share')
+            dot_dir = os.path.join(data_dir, 'applications')
+            os.listdir(dot_dir)
+            return dot_dir
+        except Exception as exc:
+            print(f'NOTE: cannot get .desktop dir; tried below {data_dir!r}; {exc}')
+            print('    Check if contents of ~/.local/share/applications for .desktop files')
+            return None
+
     def main_loop(self):
         """ TBD """
 
@@ -106,20 +147,21 @@ class Vappman:
                 # EXPAND
                 lines = [
                     'ALWAYS AVAILABLE:',
-                    '   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',
+                    '   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',
+                    '   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:
@@ -127,6 +169,12 @@ class Vappman:
             else:
                 def wanted(line):
                     return not self.filter or self.filter.search(line)
+                def version_of(app):
+                    # ◆  krita      |  5.2.2   |  appimage-type2  |  355   MiB
+                    fields = self.installs[app].split('|')
+                    if len(fields) >= 2:
+                        return fields[1].strip()
+                    return '?version?'
 
                 # self.win.set_pick_mode(self.opts.pick_mode, self.opts.pick_size)
                 self.win.set_pick_mode(True)
@@ -135,7 +183,7 @@ class Vappman:
                     if app in self.apps:
                         line = self.apps[app]
                     if wanted(line[2:]):
-                        line = '✔✔✔' + line[1:]
+                        line = f'✔✔✔ {app} [{version_of(app)}] :{line.split(':', maxsplit=1)[1]}'
                         self.win.add_body(line)
                 for app, line in self.apps.items():
                     if app not in self.installs and wanted(line[2:]):
@@ -155,7 +203,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:]
@@ -171,9 +219,10 @@ 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'
 
@@ -192,6 +241,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:]:
@@ -213,6 +265,95 @@ class Vappman:
         self.installs = self.get_installed()
         Window._start_curses()
 
+    @staticmethod
+    def launch_desktop_file(desktop_file_path):
+        """ Launch the .desktop file using xdg-open in a detached process """
+        try:
+            trial = ['xdg-open', desktop_file_path]
+            subprocess.Popen(trial,
+                    stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, close_fds=True)
+            return None
+        except Exception:
+            return trial
+
+    def launch_in_terminal(self, executable):
+        """ Find a terminal emulator"""
+        if not self.terminal_emulator:
+            maybes = [
+                [ 'konsole', '--noclose', '-e', '"{command}"'],
+                [ 'gnome-terminal', '--', 'bash', '-c', '"{command}"; exec bash' ],
+                [ 'xfce4-terminal', '--hold', '--command="{command}"' ],
+                [ 'lxterminal', '-e', """bash -c '"{command}"; echo; read -p "Press Enter to close..."'"""],
+                # [ terminator', ],
+                # [ alacritty', ],
+                # [ termite', ],
+                # [ urxvt', ],
+                # [ sakura', ],
+                # [ tilix', ],
+                # [ kitty', ],
+                # [ hyper', ],
+                # [ guake', ],
+                # [ yakuake', ],
+            ]
+            for maybe in maybes:
+                if shutil.which(maybe[0]):
+                    self.terminal_emulator = maybe
+                    break
+        if self.terminal_emulator:
+            try:
+                trial = []
+                for wd in self.terminal_emulator:
+                    trial.append(wd.replace('{command}', executable))
+                subprocess.Popen(trial)
+                return None
+            except Exception:
+                return trial
+        return trial
+
+    def launch_app(self, app):
+        """ Try to run an app."""
+        # First dig out where it might be installed as a .desktop file
+        # by searching the 'remove' script
+        def get_unique_words_from_file(file_path):
+            seen_words = set()
+            with open(file_path, 'r', encoding='utf-8') as file:
+                for line in file:
+                    line_words = line.split()
+                    for word in line_words:
+                        if word not in seen_words:
+                            seen_words.add(word)
+            return seen_words
+
+        failures = []
+        executables = []
+        try:
+            for globname in get_unique_words_from_file(
+                    os.path.join(self.appman_dir, app, 'remove')):
+                results = glob.glob(globname)
+                if '/share/applications/AM-ZZZ' in globname:
+                    for result in results:
+                        if result.endswith('.desktop'):
+                            failure = self.launch_desktop_file(result)
+                            if failure:
+                                failures.append(' '.join(failure))
+                            return
+                elif '/.local/bin/' in globname:
+                    for result in results:
+                        if os.access(result, os.X_OK):
+                            executables.append(result)
+            for executable in executables:
+                failure = self.launch_in_terminal(executable)
+                if failure:
+                    failures.append(' '.join(failure))
+                return
+        except Exception as exc:
+            failures += f'cannot find .desktop/executable to run [{exc}]'
+        if failures:
+            message = ' '.join([f'Cannot launch {app}'] + failures)
+            self.win.alert(message=message)
+
+        self.launch_app(self.pick_app)
+
     def do_key(self, key):
         """ TBD """
         if not key:
@@ -222,21 +363,21 @@ class Vappman:
                 self.opts.help_mode = False
                 return True
             if self.pick_is_installed:
-                key = ord('r') # removed installed app
+                key = ord('r') # remove installed app
             else:
                 key = ord('i') # install uninstalled app
 
         if key in self.spin.keys:
             value = self.spin.do_key(key, self.win)
             return value
-        
+
         if key == 27: # ESCAPE
             self.prev_filter = ''
             self.filter = None
             self.win.pick_pos = 0
             return None
 
-        if key == ord('q'):
+        if key in (ord('q'), ord('x')):
             self.win.stop_curses()
             os.system('clear; stty sane')
             sys.exit(0)
@@ -249,6 +390,10 @@ class Vappman:
             self.run_appman(f'appman remove {self.pick_app}')
             return None
 
+        if key == ord('t') and self.pick_is_installed:
+            self.launch_app(self.pick_app)
+            return None
+
         if key == ord('s'):
             self.run_appman('appman sync')
         if key == ord('c'):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vappman
-Version: 0.7
+Version: 0.9
 Summary: A visual wrapper for appman
 Author-email: Joe Defen <joedef@google.com>
 License: MIT
@@ -41,7 +41,7 @@ But it does NOT cover:
 * (-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.
@@ -67,13 +67,15 @@ But it does NOT cover:
       * `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.
+* 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
+## Example Screenshot (of v0.7 ... 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.
@@ -81,6 +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)