vappman 2.0.6__py3-none-any.whl → 2.1.1__py3-none-any.whl

vappman/AppmanVars.py

@@ -28,7 +28,7 @@ class AppmanVars:
         """Returns True if appman-mode file exists."""
         return not self.is_user_mode()
 
-    def set_system_mode(self, enable: bool):
+    def set_system_mode_cheat(self, enable: bool):
         """Sets the mode by creating or removing the appman-mode file."""
         try:
             if enable:

vappman/main.py

@@ -140,9 +140,10 @@ class HomeScreen(VappmanScreen):
 
         title = "APPMAN"
         if not app.has_appman:
-            title = 'm:AM-SYSTEM' if app.opts.in_system_mode else 'm:AM-USER'
-            if app.appman.is_system_mode() != app.opts.in_system_mode:
-                app.appman.set_system_mode(app.opts.in_system_mode)
+            was_in_system_mode = app.in_system_mode 
+            app.in_system_mode = app.appman.is_system_mode()
+            title = 'm:AM-SYSTEM' if app.in_system_mode else 'm:AM-USER'
+            if was_in_system_mode != app.in_system_mode:
                 app.installs, app.installs_by_appname = app.get_installed(repull=False)
         # Save persistent state if any options changed
         app.disk_state.save_if_changed(app.opts)
@@ -173,7 +174,7 @@ class HomeScreen(VappmanScreen):
                 else:
                     line += ns.synopsis
 
-                status = "installed" if app.opts.in_system_mode or 'U' in where else "uninstalled"
+                status = "installed" if app.in_system_mode or 'U' in where else "uninstalled"
                 win.add_body(line, context=Context(status, info=ns))
 
                 if idx == win.pick_pos:
@@ -349,6 +350,13 @@ class HomeScreen(VappmanScreen):
         app.win.passthrough_mode = True
         return None
 
+    def toggle_system_mode_ACTION(self):
+        """ Switch between user and system mode """
+        app = self.app
+        if app.in_system_mode:
+            return app.run_appman('--user')
+        return app.run_appman('--system')
+
 
 class VappmanHelpScreen(BasicHelpScreen):
     """Help screen with vappman-specific additions"""
@@ -402,6 +410,7 @@ class Vappman(Prerequisites):
         self.apps_by_name_db = self.cache_mgr.apps_by_key
         self.saved_outputs = {}
         self.installs, self.installs_by_appname = self.get_installed() # dict keyed by app
+        self.in_system_mode = self.appman.is_system_mode()
 
         win_opts = ConsoleWindowOpts()
         win_opts.head_line=True
@@ -432,8 +441,7 @@ class Vappman(Prerequisites):
         spin.add_key('fancy_header', '_ - fancy header mode', vals=['Underline', 'Reverse', 'Off'])
         spin.add_key('demo_mode', '* - demo_mode', vals=[False, True])
         if not self.has_appman:
-            spin.add_key('in_system_mode', 'm - AM system mode', vals=[False, True])
-            self.opts.in_system_mode = self.appman.is_system_mode()
+            spin.add_key('toggle_system_mode', 'm - toggle system mode', genre='action')
         spin.add_key('max_backups', '# - max backups per app', vals=[-1, 2, 1])
         self.opts.max_backups = self.disk_state.max_backups
         self.opts.install_opts = self.disk_state.install_opts
@@ -546,7 +554,7 @@ class Vappman(Prerequisites):
             if 'files' in cmd.split():
                 if current_in_user_mode is True:
                     # temp: promote to system mode to get all apps
-                    self.appman.set_system_mode(True)
+                    self.appman.set_system_mode_cheat(True)
 
             # Run the command and capture the output
             try:
@@ -556,11 +564,11 @@ class Vappman(Prerequisites):
             except Exception as exc:
                 ConsoleWindow.stop_curses()
                 if current_in_user_mode is True:
-                    self.appman.set_system_mode(False)
+                    self.appman.set_system_mode_cheat(False)
                 print(f'FAILED: {command}: {exc}')
                 sys.exit(1)
             if current_in_user_mode is True:
-                self.appman.set_system_mode(False)
+                self.appman.set_system_mode_cheat(False)
 
             if result.returncode != 0:
                 print(f'WARNING: {command}: {result.returncode=}')

{vappman-2.0.6.dist-info → vappman-2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vappman
-Version: 2.0.6
+Version: 2.1.1
 Summary: A visual wrapper for appman
 Keywords: app,installer,manager,appimages
 Author-email: Joe Defen <joedef@google.com>
@@ -10,7 +10,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX :: Linux
 License-File: LICENSE
-Requires-Dist: console-window >= 1.2.1
+Requires-Dist: console-window == 1.3.2
 Project-URL: Bug Tracker, https://github.com/joedefen/vappman/issues
 Project-URL: Homepage, https://github.com/joedefen/vappman
 
@@ -32,7 +32,7 @@ Project-URL: Homepage, https://github.com/joedefen/vappman
 
 #### Key Features (Added in V2)
 
-* **Dual Mode Support**: Works with both `am` (system-wide) and `appman` (user-local). One key (`m`) switches instantly between user (local install) and system (non-local install) modes when using `am`.
+* **Dual Mode Support**: Works with both `am` (system-wide) and `appman` (user-local). The (`m`) m-key toggles user (local install) and system (non-local install) modes when using `am`.
 * **Multi-Database Support**: Access all of `am`'s app databases including:
   * `am` - Main AppImage database with 2000+ portable Linux applications
   * `busybox` - Minimal Unix utilities as binaries

{vappman-2.0.6.dist-info → vappman-2.1.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
 vappman/AppimageDoctor.py,sha256=ohXy5xgTRDXIp2TrbacOqUp_VVODYTdsPrFFk5EeOds,13497
 vappman/AppmanLauncher.py,sha256=T3RXi3CpsdoSmVMMlkkuLHnQpUT2IcjRU0V3Lw6hA6Y,8774
-vappman/AppmanVars.py,sha256=TyLtHxJfhnWnbWBVzgU-a6ncX-eoCtyKHkZRwyO84SI,3725
+vappman/AppmanVars.py,sha256=reA_3TPvkhD3BUDuVEBAFGMS6uOmzjsQhOIJ7pdmttk,3731
 vappman/CommandRunner.py,sha256=-fF2dH58SODBRXannU8EhKDa8LLP-9_25Tyo8IDSXAQ,1264
 vappman/PersistentState.py,sha256=65aOCaW5pbHdFFQtBYZB0TwQAvHgMFzwDLkPXRQxoGw,3275
 vappman/Prerequisites.py,sha256=iBUkBQqPCNV-BXKDzZmKh7xaKGZE1QFzYTjbd3cuATE,10177
 vappman/VappmanListCache.py,sha256=lsA82WyGssYherJ3lK1DGABghbAupDNfLOgyu3C9-Oc,9852
 vappman/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vappman/main.py,sha256=5sxkskEETKsc2jcgaV3402z7zp5gJF6JpFTYiiS1ubw,31880
-vappman-2.0.6.dist-info/entry_points.txt,sha256=c9NHAQ8xJLkwtSWlw_nGNlAPCMODp_qGj4wlaHvbVUM,45
-vappman-2.0.6.dist-info/licenses/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
-vappman-2.0.6.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-vappman-2.0.6.dist-info/METADATA,sha256=xKaWUOJYAltkYhV9wFzmknt5GVIw3QQHahNJ-p3iKWo,12395
-vappman-2.0.6.dist-info/RECORD,,
+vappman/main.py,sha256=b0KpZvtTioDnUPGR7lYX2pEbJ3ddbaMFanFI2jVXE2A,32149
+vappman-2.1.1.dist-info/entry_points.txt,sha256=c9NHAQ8xJLkwtSWlw_nGNlAPCMODp_qGj4wlaHvbVUM,45
+vappman-2.1.1.dist-info/licenses/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
+vappman-2.1.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+vappman-2.1.1.dist-info/METADATA,sha256=AZU6Qf6YZJQzhJcrfvpBCZx5IyZbEiyZm2-KWvVHLvU,12378
+vappman-2.1.1.dist-info/RECORD,,