vappman 2.1.1__tar.gz → 2.1.3__tar.gz

{vappman-2.1.1 → vappman-2.1.3}/PKG-INFO

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

{vappman-2.1.1 → vappman-2.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "vappman"
-version = "2.1.1"
+version = "2.1.3"
 description = "A visual wrapper for appman"
 authors = [
     { name = "Joe Defen", email = "joedef@google.com" }

{vappman-2.1.1 → vappman-2.1.3}/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-2.1.1 → vappman-2.1.3}/vappman/main.py

@@ -386,7 +386,7 @@ class Vappman(Prerequisites):
         print(f'{self.has_am=}')
         print(f'{self.has_appman=}')
         self.disk_state = PersistentState('vappman',
-                      max_backups=1, install_opts='', database='vm')
+                      max_backups=1, install_opts='', database='am')
         self.appman = AppmanVars()
         self.launcher = AppmanLauncher(self.appman)
 
@@ -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: