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

vappman/AppmanVars.py

@@ -10,7 +10,7 @@ class AppLocation(NamedTuple):
     usr_path: Path  # Path to user storage dir or None
 
 class AppmanVars:
-    """ Encapuslates the places / functions we need to know
+    """ Encapsulates the places / functions we need to know
     about to observe, manage am/appman. """
     def __init__(self):
         self.system_app_dir = Path("/opt")

vappman/main.py

@@ -481,9 +481,9 @@ class Vappman(Prerequisites):
             1st word.
         """
         def parse_app_list(lines):
-            nonlocal current_in_user_mode
+            nonlocal switch_to_system_mode
             installs, installs_by_appname = {}, {}
-            local = False
+            local = True if self.has_appman else False
             has_db_column = False
 
             # Process line by line
@@ -492,7 +492,7 @@ class Vappman(Prerequisites):
             for line in lines:
                 line = line.strip()
                 # Determine to reset location (Global vs Local)
-                if 'HAVE INSTALLED' in line:
+                if not self.has_appman and 'HAVE INSTALLED' in line:
                     local = bool('LOCAL' in line)
 
                 # Check column headers to see if DB column is present
@@ -529,7 +529,7 @@ class Vappman(Prerequisites):
                         # Store as a SimpleNamespace for dot-notation access
                         ns = installs.get((name, db), None)
                         if ns:  # we have both user and system apps
-                            if current_in_user_mode and local:
+                            if switch_to_system_mode and local:
                                 ns.version=version
                             ns.where += where
                         else:
@@ -547,12 +547,12 @@ class Vappman(Prerequisites):
         command = ['appman' if self.has_appman else 'am']
         command += cmd.split()
         output_key = ' '.join(command)
-        current_in_user_mode = self.appman.is_user_mode()
+        switch_to_system_mode = not self.has_appman and self.appman.is_user_mode()
 
         output = self.saved_outputs.get(output_key, None)
         if repull or not output:
             if 'files' in cmd.split():
-                if current_in_user_mode is True:
+                if switch_to_system_mode is True:
                     # temp: promote to system mode to get all apps
                     self.appman.set_system_mode_cheat(True)
 
@@ -563,11 +563,11 @@ class Vappman(Prerequisites):
                         stderr=subprocess.PIPE, check=False)
             except Exception as exc:
                 ConsoleWindow.stop_curses()
-                if current_in_user_mode is True:
+                if switch_to_system_mode is True:
                     self.appman.set_system_mode_cheat(False)
                 print(f'FAILED: {command}: {exc}')
                 sys.exit(1)
-            if current_in_user_mode is True:
+            if switch_to_system_mode is True:
                 self.appman.set_system_mode_cheat(False)
 
             if result.returncode != 0:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vappman
-Version: 2.1.1
+Version: 2.1.2
 Summary: A visual wrapper for appman
 Keywords: app,installer,manager,appimages
 Author-email: Joe Defen <joedef@google.com>

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

@@ -1,14 +1,14 @@
 vappman/AppimageDoctor.py,sha256=ohXy5xgTRDXIp2TrbacOqUp_VVODYTdsPrFFk5EeOds,13497
 vappman/AppmanLauncher.py,sha256=T3RXi3CpsdoSmVMMlkkuLHnQpUT2IcjRU0V3Lw6hA6Y,8774
-vappman/AppmanVars.py,sha256=reA_3TPvkhD3BUDuVEBAFGMS6uOmzjsQhOIJ7pdmttk,3731
+vappman/AppmanVars.py,sha256=5Gsdm9dNHeJpaF4mgkpbIZtWQP_sOuuRCs3cSGYpX20,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=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,,
+vappman/main.py,sha256=_kM5S74ZDZHsXdes614BWDmx4ERUQLJSqGwbUUgUXmc,32232
+vappman-2.1.2.dist-info/entry_points.txt,sha256=c9NHAQ8xJLkwtSWlw_nGNlAPCMODp_qGj4wlaHvbVUM,45
+vappman-2.1.2.dist-info/licenses/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
+vappman-2.1.2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+vappman-2.1.2.dist-info/METADATA,sha256=IbBu_S4tdoyzFde81WX96boGgpOENdT6EpAKImfPYcY,12378
+vappman-2.1.2.dist-info/RECORD,,