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

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/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,too-many-nested-blocks
 # pylint: disable=wrong-import-position,disable=wrong-import-order
 # import VirtEnv
 # VirtEnv.ensure_venv(__name__)
@@ -14,13 +14,11 @@ Interactive, visual thin layer atop appman
 import os
 import sys
 import re
+import glob
 import shutil
 import subprocess
 import traceback
-import copy
-import shutil
 import curses as cs
-from types import SimpleNamespace
 from vappman.PowerWindow import Window, OptionSpinner
 
 
@@ -37,9 +35,10 @@ 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
         other_keys.add(10) # another form of ENTER
         self.opts = spin.default_obj
 
@@ -51,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)
 
@@ -96,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 """
 
@@ -108,18 +147,20 @@ class Vappman:
                 # EXPAND
                 lines = [
                     'ALWAYS AVAILABLE:',
-                    '   q - quit program (CTL-C disabled)',
+                    '   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',
+                    '   ESC = clear filter and jump to top',
                     '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'
                     '   o - overwrite app from its backup',
 
                 ]
@@ -128,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,11 +182,11 @@ class Vappman:
                 for app, line in self.installs.items():
                     if app in self.apps:
                         line = self.apps[app]
-                    if wanted(line):
-                        line = '✔✔✔' + line[1:]
+                    if wanted(line[2:]):
+                        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):
+                    if app not in self.installs and wanted(line[2:]):
                         self.win.add_body(line)
             self.win.render()
 
@@ -149,15 +196,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."""
@@ -173,6 +222,7 @@ class Vappman:
                 actions['b'] = 'bkup'
                 actions['o'] = 'overwr'
                 actions['u'] = 'upd'
+                actions['t'] = 'test'
             else:
                 actions['i'] = 'install'
 
@@ -185,30 +235,122 @@ 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};'
-                  + ' /bin/echo -e "\n\n===== Press ENTER for menu ====> \c"; read FOO')
+                  + r' /bin/echo -e "\n\n===== Press ENTER for menu ====> \c"; read FOO')
         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:
@@ -217,16 +359,22 @@ class Vappman:
             if self.opts.help_mode:
                 self.opts.help_mode = False
                 return True
-            elif self.pick_is_installed:
-                key = ord('r') # removed installed app
+            if self.pick_is_installed:
+                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 == ord('q'):
+
+        if key == 27: # ESCAPE
+            self.prev_filter = ''
+            self.filter = None
+            self.win.pick_pos = 0
+            return None
+
+        if key in (ord('q'), ord('x')):
             self.win.stop_curses()
             os.system('clear; stty sane')
             sys.exit(0)
@@ -239,6 +387,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'):
@@ -252,11 +404,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:
@@ -266,18 +419,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.6.dist-info → vappman-0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vappman
-Version: 0.6
+Version: 0.8
 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.
@@ -56,13 +56,20 @@ But it does NOT cover:
     * 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 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.)
+    * 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.
+* 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).
 
 ---
@@ -75,4 +82,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)
+* 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.8.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=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,,

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

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

vappman-0.6.dist-info/RECORD

@@ -1,9 +0,0 @@
-vappman/PowerWindow.py,sha256=OLCX-RkbJZ2wwaY7M-4Eo9PQuR95TWrGNIY8DdVRpsE,28567
-vappman/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vappman/main.py,sha256=rSWpH_l_IgH3jR4HSG-H8lvmuuAZWStPo-AMtSIsZYY,10483
-vappman-0.6.dist-info/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
-vappman-0.6.dist-info/METADATA,sha256=pWiQZo-R_ePgEX3Yz9oAcNty2XBmYCArV--3ErQd_HI,3850
-vappman-0.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-vappman-0.6.dist-info/entry_points.txt,sha256=7_1MiUvkCJoElLePOCJYqhkQN4xmadBRQCKupOwzt90,46
-vappman-0.6.dist-info/top_level.txt,sha256=5_Gb5oZh7s2-i62gLXZ6INVALAV9D0-yqh0TvNqpPC4,8
-vappman-0.6.dist-info/RECORD,,