vappman 2.0.7__tar.gz → 2.1.2__tar.gz

{vappman-2.0.7 → vappman-2.1.2}/.gitignore

@@ -1,4 +1,5 @@
 # Byte-compiled / optimized / DLL files
+.venv/
 __pycache__/
 .vscode/
 *.egg-info/

{vappman-2.0.7 → vappman-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: vappman
-Version: 2.0.7
+Version: 2.1.2
 Summary: A visual wrapper for appman
 Keywords: app,installer,manager,appimages
 Author-email: Joe Defen <joedef@google.com>
@@ -9,7 +9,8 @@ Description-Content-Type: text/markdown
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX :: Linux
-Requires-Dist: console-window >= 1.2.1
+License-File: LICENSE
+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
 
@@ -34,7 +35,7 @@ Project-URL: Homepage, https://github.com/joedefen/vappman
 * **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 AppImages
+  * `busybox` - Minimal Unix utilities as binaries
   * `appbundle` - AppBundle format packages (portable application bundles)
   * `python` - Python interpreters (multiple versions available as AppImages)
   * `soarpkg` - [Soar User Repository](https://github.com/pkgforge/soarpkgs) packages (portable, distro-independent binaries)

{vappman-2.0.7 → vappman-2.1.2}/README.md

@@ -19,7 +19,7 @@
 * **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 AppImages
+  * `busybox` - Minimal Unix utilities as binaries
   * `appbundle` - AppBundle format packages (portable application bundles)
   * `python` - Python interpreters (multiple versions available as AppImages)
   * `soarpkg` - [Soar User Repository](https://github.com/pkgforge/soarpkgs) packages (portable, distro-independent binaries)

{vappman-2.0.7 → vappman-2.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "vappman"
-version = "2.0.7"
+version = "2.1.2"
 description = "A visual wrapper for appman"
 authors = [
     { name = "Joe Defen", email = "joedef@google.com" }
@@ -19,7 +19,7 @@ classifiers = [
     "Operating System :: POSIX :: Linux"
 ]
 dependencies = [
-    'console-window >= 1.2.1',
+    'console-window == 1.3.2',
 ]
 
 [project.urls]

{vappman-2.0.7 → vappman-2.1.2}/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.0.7 → vappman-2.1.2}/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: