PyPI - umu-commander - Versions diffs - 1.6.0__tar.gz → 1.6.1__tar.gz - Mend

umu-commander 1.6.0tar.gz → 1.6.1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of umu-commander might be problematic. Click here for more details.

Files changed (35) hide show

{umu_commander-1.6.0 → umu_commander-1.6.1}/.idea/workspace.xml RENAMED Viewed

@@ -4,7 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="043620f1-711f-4c27-a2e2-15fa501e8ce0" name="Changes" comment="1.6.0" />
+    <list default="true" id="043620f1-711f-4c27-a2e2-15fa501e8ce0" name="Changes" comment="1.6.1">
+      <change beforePath="$PROJECT_DIR$/src/umu_commander/__main__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/umu_commander/__main__.py" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -50,52 +52,52 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Python tests.Python tests for test_config.Config.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for test_config.Config.test_missing_config.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for test_db.DB.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for test_db.Database.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for test_db.Database.test_addition_removal.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for test_db.Database.test_missing_db.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for test_proton.Tracking.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for test_proton.Tracking.test_collect_proton_versions.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for test_tracking.Tracking.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for test_tracking.Tracking.test_track.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for test_tracking.Tracking.test_track_untrack.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for test_tracking.TrackingTest.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for test_tracking.TrackingTest.test_track.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for tests.test_db.DB.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for tests.test_db.DBTest.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for tests.test_db.DBTest.test_addition_removal.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for tests.test_db.DBTest.test_malformed_db.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for tests.test_db.DBTest.test_missing_db.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for tests.test_tracking.Tracking.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests for tests.test_tracking.TrackingTest.executor&quot;: &quot;Debug&quot;,
-    &quot;Python tests.Python tests for tests.test_tracking.TrackingTest.test_track.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Python tests in tests.executor&quot;: &quot;Run&quot;,
-    &quot;Python tests.Run tests.executor&quot;: &quot;Debug&quot;,
-    &quot;Python.Build.executor&quot;: &quot;Run&quot;,
-    &quot;Python.Module.executor&quot;: &quot;Run&quot;,
-    &quot;Python.create.executor&quot;: &quot;Run&quot;,
-    &quot;Python.delete.executor&quot;: &quot;Run&quot;,
-    &quot;Python.manage.executor&quot;: &quot;Run&quot;,
-    &quot;Python.run.executor&quot;: &quot;Run&quot;,
-    &quot;Python.track.executor&quot;: &quot;Run&quot;,
-    &quot;Python.umu-commander.executor&quot;: &quot;Run&quot;,
-    &quot;Python.untrack.executor&quot;: &quot;Run&quot;,
-    &quot;Python.users.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;Shell Script.Build.executor&quot;: &quot;Run&quot;,
-    &quot;Shell Script.Cleanup builds.executor&quot;: &quot;Run&quot;,
-    &quot;Shell Script.Upload.executor&quot;: &quot;Run&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/home/hiroshi/Code/Python/umu-commander/src/umu_commander&quot;,
-    &quot;run.code.analysis.last.selected.profile&quot;: &quot;aDefault&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Python tests.Python tests for test_config.Config.executor": "Run",
+    "Python tests.Python tests for test_config.Config.test_missing_config.executor": "Run",
+    "Python tests.Python tests for test_db.DB.executor": "Run",
+    "Python tests.Python tests for test_db.Database.executor": "Run",
+    "Python tests.Python tests for test_db.Database.test_addition_removal.executor": "Run",
+    "Python tests.Python tests for test_db.Database.test_missing_db.executor": "Run",
+    "Python tests.Python tests for test_proton.Tracking.executor": "Run",
+    "Python tests.Python tests for test_proton.Tracking.test_collect_proton_versions.executor": "Run",
+    "Python tests.Python tests for test_tracking.Tracking.executor": "Run",
+    "Python tests.Python tests for test_tracking.Tracking.test_track.executor": "Run",
+    "Python tests.Python tests for test_tracking.Tracking.test_track_untrack.executor": "Run",
+    "Python tests.Python tests for test_tracking.TrackingTest.executor": "Run",
+    "Python tests.Python tests for test_tracking.TrackingTest.test_track.executor": "Run",
+    "Python tests.Python tests for tests.test_db.DB.executor": "Run",
+    "Python tests.Python tests for tests.test_db.DBTest.executor": "Run",
+    "Python tests.Python tests for tests.test_db.DBTest.test_addition_removal.executor": "Run",
+    "Python tests.Python tests for tests.test_db.DBTest.test_malformed_db.executor": "Run",
+    "Python tests.Python tests for tests.test_db.DBTest.test_missing_db.executor": "Run",
+    "Python tests.Python tests for tests.test_tracking.Tracking.executor": "Run",
+    "Python tests.Python tests for tests.test_tracking.TrackingTest.executor": "Debug",
+    "Python tests.Python tests for tests.test_tracking.TrackingTest.test_track.executor": "Run",
+    "Python tests.Python tests in tests.executor": "Run",
+    "Python tests.Run tests.executor": "Run",
+    "Python.Build.executor": "Run",
+    "Python.Module.executor": "Run",
+    "Python.create.executor": "Run",
+    "Python.delete.executor": "Run",
+    "Python.manage.executor": "Run",
+    "Python.run.executor": "Run",
+    "Python.track.executor": "Run",
+    "Python.umu-commander.executor": "Run",
+    "Python.untrack.executor": "Run",
+    "Python.users.executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "Shell Script.Build.executor": "Run",
+    "Shell Script.Cleanup builds.executor": "Run",
+    "Shell Script.Upload.executor": "Run",
+    "git-widget-placeholder": "master",
+    "last_opened_file_path": "/home/hiroshi/Code/Python/umu-commander/src/umu_commander",
+    "run.code.analysis.last.selected.profile": "aDefault",
+    "settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/src/umu_commander" />
@@ -411,46 +413,6 @@
       <option name="presentableId" value="Default" />
       <updated>1751043400140</updated>
     </task>
-    <task id="LOCAL-00042" summary="Preparations for building">
-      <option name="closed" value="true" />
-      <created>1753344771423</created>
-      <option name="number" value="00042" />
-      <option name="presentableId" value="LOCAL-00042" />
-      <option name="project" value="LOCAL" />
-      <updated>1753344771423</updated>
-    </task>
-    <task id="LOCAL-00043" summary="Preparations for building">
-      <option name="closed" value="true" />
-      <created>1753346217252</created>
-      <option name="number" value="00043" />
-      <option name="presentableId" value="LOCAL-00043" />
-      <option name="project" value="LOCAL" />
-      <updated>1753346217253</updated>
-    </task>
-    <task id="LOCAL-00044" summary="Preparations for building">
-      <option name="closed" value="true" />
-      <created>1753347983462</created>
-      <option name="number" value="00044" />
-      <option name="presentableId" value="LOCAL-00044" />
-      <option name="project" value="LOCAL" />
-      <updated>1753347983462</updated>
-    </task>
-    <task id="LOCAL-00045" summary="Break off configuration">
-      <option name="closed" value="true" />
-      <created>1754002639114</created>
-      <option name="number" value="00045" />
-      <option name="presentableId" value="LOCAL-00045" />
-      <option name="project" value="LOCAL" />
-      <updated>1754002639114</updated>
-    </task>
-    <task id="LOCAL-00046" summary="Rework DB">
-      <option name="closed" value="true" />
-      <created>1754002669820</created>
-      <option name="number" value="00046" />
-      <option name="presentableId" value="LOCAL-00046" />
-      <option name="project" value="LOCAL" />
-      <updated>1754002669820</updated>
-    </task>
     <task id="LOCAL-00047" summary="Create convenience classes">
       <option name="closed" value="true" />
       <created>1754002693811</created>
@@ -803,7 +765,47 @@
       <option name="project" value="LOCAL" />
       <updated>1754730732601</updated>
     </task>
-    <option name="localTasksCounter" value="91" />
+    <task id="LOCAL-00091" summary="Handle exiting more gracefully&#10;dispatch refactor&#10;minor wording &amp; formatting tweaks">
+      <option name="closed" value="true" />
+      <created>1754753478994</created>
+      <option name="number" value="00091" />
+      <option name="presentableId" value="LOCAL-00091" />
+      <option name="project" value="LOCAL" />
+      <updated>1754753478994</updated>
+    </task>
+    <task id="LOCAL-00092" summary="Add default values">
+      <option name="closed" value="true" />
+      <created>1757363605608</created>
+      <option name="number" value="00092" />
+      <option name="presentableId" value="LOCAL-00092" />
+      <option name="project" value="LOCAL" />
+      <updated>1757363605609</updated>
+    </task>
+    <task id="LOCAL-00093" summary="Fix">
+      <option name="closed" value="true" />
+      <created>1757363932806</created>
+      <option name="number" value="00093" />
+      <option name="presentableId" value="LOCAL-00093" />
+      <option name="project" value="LOCAL" />
+      <updated>1757363932806</updated>
+    </task>
+    <task id="LOCAL-00094" summary="Formatting">
+      <option name="closed" value="true" />
+      <created>1757363955353</created>
+      <option name="number" value="00094" />
+      <option name="presentableId" value="LOCAL-00094" />
+      <option name="project" value="LOCAL" />
+      <updated>1757363955353</updated>
+    </task>
+    <task id="LOCAL-00095" summary="1.6.1">
+      <option name="closed" value="true" />
+      <created>1757363962261</created>
+      <option name="number" value="00095" />
+      <option name="presentableId" value="LOCAL-00095" />
+      <option name="project" value="LOCAL" />
+      <updated>1757363962261</updated>
+    </task>
+    <option name="localTasksCounter" value="96" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -830,10 +832,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Check for umu-config existence" />
-    <MESSAGE value="formatting" />
-    <MESSAGE value="Misc fixes in configuration module" />
-    <MESSAGE value="Fix import error" />
     <MESSAGE value="Misc fixes in configuration module" />
     <MESSAGE value="Fix import error" />
     <MESSAGE value="Change DB structure" />
@@ -844,7 +842,6 @@
     <MESSAGE value="Reformat main flow" />
     <MESSAGE value="Update tests" />
     <MESSAGE value="Add dynamic versioning" />
-    <MESSAGE value="Formatting" />
     <MESSAGE value="Add dynamic versioning &amp; 1.5.6" />
     <MESSAGE value="Add dynamic versioning" />
     <MESSAGE value="Implement dynamic versioning" />
@@ -855,6 +852,22 @@
     <MESSAGE value="1.5.7" />
     <MESSAGE value="Remove use &quot;Always use latest UMU-Proton&quot;" />
     <MESSAGE value="1.6.0" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.6.0" />
+    <MESSAGE value="Handle exiting more gracefully&#10;dispatch refactor&#10;minor wording &amp; formatting tweaks" />
+    <MESSAGE value="Add default values" />
+    <MESSAGE value="Fix" />
+    <MESSAGE value="Formatting" />
+    <MESSAGE value="1.6.1" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.6.1" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/src/umu_commander/util.py</url>
+          <line>96</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
   </component>
 </project>

{umu_commander-1.6.0 → umu_commander-1.6.1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umu-commander
-Version: 1.6.0
+Version: 1.6.1
 Summary: umu-commander is an interactive CLI tool to help you manage umu.
 Project-URL: Homepage, https://github.com/Mpaxlamitsounas/umu-commander
 Project-URL: Issues, https://github.com/Mpaxlamitsounas/umu-commander/issues

umu_commander-1.6.1/src/umu_commander/__init__.py ADDED Viewed

	@@ -0,0 +1 @@
1	+ VERSION = "v1.6.1"

{umu_commander-1.6.0 → umu_commander-1.6.1}/src/umu_commander/__main__.py RENAMED Viewed

@@ -10,34 +10,43 @@ from umu_commander.classes import ExitCode
 from umu_commander.configuration import CONFIG_DIR, CONFIG_NAME
 from umu_commander.util import print_help
+# TODO: Add related projects shoutout
+# https://github.com/Faugus/faugus-launcher
+# https://github.com/SeongGino/Nero-umu
+# https://github.com/korewaChino/umu-wrapper
+# TODO: https://inquirerpy.readthedocs.io/en/latest/
 def main() -> ExitCode:
     try:
         config.load()
     except (JSONDecodeError, KeyError):
         config_path: str = os.path.join(CONFIG_DIR, CONFIG_NAME)
-        old_config_path: str = os.path.join(CONFIG_DIR, CONFIG_NAME + ".old")
+        config_path_old: str = os.path.join(CONFIG_DIR, CONFIG_NAME + ".old")
         print(f"Config file at {config_path} could not be read.")
-        if not os.path.exists(old_config_path):
-            print(f"Config file renamed to {old_config_path}.")
-            os.rename(config_path, old_config_path)
+        if not os.path.exists(config_path_old):
+            print(f"Config file renamed to {config_path_old}.")
+            os.rename(config_path, config_path_old)
     except FileNotFoundError:
         config.dump()
     try:
         db.load()
     except JSONDecodeError:
         db_path: str = os.path.join(config.DB_DIR, config.DB_NAME)
-        old_db_path: str = os.path.join(config.DB_DIR, config.DB_NAME + ".old")
+        db_path_old: str = os.path.join(config.DB_DIR, config.DB_NAME + ".old")
         print(f"Tracking file at {db_path} could not be read.")
-        if not os.path.exists(old_db_path):
-            print(f"DB file renamed to {old_db_path}.")
-            os.rename(db_path, old_db_path)
+        if not os.path.exists(db_path_old):
+            print(f"DB file renamed to {db_path_old}.")
+            os.rename(db_path, db_path_old)
     except FileNotFoundError:
         pass
@@ -51,20 +60,29 @@ def main() -> ExitCode:
         "run": umu_config.run,
     }
-    if len(sys.argv) == 1:
+    try:
+        dispatch[sys.argv[1]]()
+    except IndexError:
         print_help()
-        return ExitCode.SUCCESS.value
-    elif sys.argv[1] not in dispatch:
-        print("Invalid verb.")
+        return_val = ExitCode.SUCCESS
+    except KeyError:
+        print("Unrecognised verb.")
         print_help()
-        return ExitCode.INVALID_SELECTION.value
+        return_val = ExitCode.INVALID_SELECTION
+    except ValueError:
+        return_val = ExitCode.INVALID_SELECTION
-    dispatch[sys.argv[1]]()
+    else:
+        return_val = ExitCode.SUCCESS
-    tracking.untrack_unlinked()
-    db.dump()
+    finally:
+        tracking.untrack_unlinked()
+        db.dump()
-    return ExitCode.SUCCESS.value
+    return return_val.value
 if __name__ == "__main__":

{umu_commander-1.6.0 → umu_commander-1.6.1}/src/umu_commander/umu_config.py RENAMED Viewed

@@ -7,12 +7,9 @@ import tomli_w
 import umu_commander.configuration as config
 from umu_commander import tracking
-from umu_commander.classes import DLLOverride, ProtonVer
+from umu_commander.classes import DLLOverride, ProtonVer, Value
 from umu_commander.proton import collect_proton_versions, refresh_proton_versions
-from umu_commander.util import (
-    get_selection,
-    strings_to_values,
-)
+from umu_commander.util import get_selection, string_to_value, strings_to_values
 def create():
@@ -21,12 +18,12 @@ def create():
     params: dict[str, Any] = {"umu": {}, "env": {}}
     # Prefix selection
+    prefix_default: Value = string_to_value("Current directory")
     selection: str = get_selection(
         "Select wine prefix:",
-        strings_to_values(
-            [*os.listdir(config.DEFAULT_PREFIX_DIR), "Current directory"]
-        ),
+        [*strings_to_values(os.listdir(config.DEFAULT_PREFIX_DIR)), prefix_default],
         None,
+        default_element=prefix_default,
     ).value
     if selection == "Current directory":
@@ -57,20 +54,24 @@ def create():
                 idx = "Y"
             print(f"{idx}) {override.label}")
-        try:
-            index: int = int(input("? "))
-            print("")
-        except ValueError:
+        index: str = input("? ")
+        if index == "":
+            break
+        if index.isdecimal():
+            index: int = int(index)
+        else:
             continue
+        # reset
         if index == 0:
             selected = set()
             continue
+        # done
         if index == 1:
             break
-        index: int = int(index)
         if index - 1 < len(possible_overrides):
             selected.add(index)
@@ -83,10 +84,12 @@ def create():
             ].override_str
     # Set language locale
+    lang_default: Value = string_to_value("Default")
     match get_selection(
         "Select locale:",
-        strings_to_values(["Default", "Japanese"]),
+        strings_to_values([lang_default, "Japanese"]),
         None,
+        default_element=lang_default,
     ).value:
         case "Default":
             pass

{umu_commander-1.6.0 → umu_commander-1.6.1}/src/umu_commander/util.py RENAMED Viewed

@@ -1,9 +1,13 @@
 from umu_commander import VERSION
-from umu_commander.classes import Element, ExitCode, Group, Value
+from umu_commander.classes import Element, Group, Value
+def string_to_value(value: str) -> Value:
+    return Value(value)
 def strings_to_values(values: list[str]) -> list[Value]:
-    return [Value(value) for value in values]
+    return [string_to_value(value) for value in values]
 def _selection_set_valid(
@@ -56,10 +60,11 @@ def get_selection(
     prompt: str,
     selection_elements: list[Element] | None,
     selection_groups: list[Group] | None,
+    default_element: Element = None,
 ) -> Element:
     if not _selection_set_valid(selection_elements, selection_groups):
         print("Nothing to select from.")
-        exit(ExitCode.INVALID_SELECTION.value)
+        raise ValueError
     if selection_groups is None:
         selection_groups = []
@@ -82,15 +87,30 @@ def get_selection(
             enum_start_idx += len(group.elements)
-        selection_index: str = input("? ")
+        selection: str = input("? ")
         print("")
-        if selection_index.isdecimal():
-            selection_index: int = int(selection_index) - 1
-            if enum_start_idx - 1 > selection_index >= 0:
+        if selection == "":
+            if default_element is not None:
+                return default_element
+            # If only 1 choice
+            if len(selection_groups) == 0 and len(selection_elements) == 1:
+                return selection_elements[0]
+            # len(selection_groups) == 1 and len(selection_groups[0].elements) == 1
+            groups_with_one_element: list[Group] = [
+                group for group in selection_groups if len(group.elements) == 1
+            ]
+            if len(groups_with_one_element) == 1:
+                return groups_with_one_element[0].elements[0]
+        elif selection.isdecimal():
+            selection: int = int(selection) - 1
+            if enum_start_idx - 1 > selection >= 0:
                 break
     return _translate_index_to_selection(
-        selection_index, selection_elements, selection_groups
+        selection, selection_elements, selection_groups
     )

umu_commander-1.6.0/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]/shelved.patch DELETED Viewed

@@ -1,229 +0,0 @@
-Index: tests/test_db.py
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>import unittest\nfrom json import JSONDecodeError\n\nimport umu_commander.configuration as config\nfrom tests import *\nfrom umu_commander.database import Database as db\n\n\nclass Database(unittest.TestCase):\n    def setUp(self):\n        config.DB_DIR = TESTING_DIR\n        setup()\n\n    def tearDown(self):\n        teardown()\n\n    def test_missing_db(self):\n        db.load()\n        self.assertEqual(db.get(), {})\n\n    def test_malformed_db(self):\n        with open(os.path.join(config.DB_DIR, config.DB_NAME), \"tw\") as db_file:\n            db_file.write(\"{\")\n\n        with self.assertRaises(JSONDecodeError):\n            db.load()\n\n    def test_addition_removal(self):\n        db.load()\n        db.get(PROTON_DIR_1, PROTON_BIG).append(USER_DIR)\n\n        self.assertIn(PROTON_BIG, db.get(PROTON_DIR_1))\n        self.assertIn(USER_DIR, db.get(PROTON_DIR_1, PROTON_BIG))\n\n        db.get(PROTON_DIR_1, PROTON_BIG).remove(USER_DIR)\n\n        self.assertIn(PROTON_BIG, db.get(PROTON_DIR_1))\n        self.assertNotIn(USER_DIR, db.get(PROTON_DIR_1, PROTON_BIG))\n\n        del db.get(PROTON_DIR_1)[PROTON_BIG]\n        self.assertNotIn(PROTON_BIG, db.get(PROTON_DIR_1))\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/tests/test_db.py b/tests/test_db.py
---- a/tests/test_db.py	(revision 2c990ed1cab5a20498dc2cfe9bd4e331f60cb3af)
-+++ b/tests/test_db.py	(date 1754467945899)
-@@ -2,8 +2,8 @@
- from json import JSONDecodeError
- import umu_commander.configuration as config
-+import umu_commander.database as db
- from tests import *
--from umu_commander.database import Database as db
- class Database(unittest.TestCase):
-Index: tests/test_config.py
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>import os.path\nimport unittest\n\nimport umu_commander.configuration as config\nfrom tests import *\nfrom umu_commander import configuration\n\n\nclass Config(unittest.TestCase):\n    def setUp(self):\n        configuration._CONFIG_DIR = TESTING_DIR\n        configuration.DB_DIR = TESTING_DIR\n        setup()\n\n    def tearDown(self):\n        teardown()\n\n    def test_missing_config(self):\n        config.load()\n        self.assertTrue(\n            os.path.exists(os.path.join(TESTING_DIR, configuration._CONFIG_NAME))\n        )\n        config.load()\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/tests/test_config.py b/tests/test_config.py
---- a/tests/test_config.py	(revision 2c990ed1cab5a20498dc2cfe9bd4e331f60cb3af)
-+++ b/tests/test_config.py	(date 1754467762383)
-@@ -8,7 +8,7 @@
- class Config(unittest.TestCase):
-     def setUp(self):
--        configuration._CONFIG_DIR = TESTING_DIR
-+        configuration.CONFIG_DIR = TESTING_DIR
-         configuration.DB_DIR = TESTING_DIR
-         setup()
-@@ -18,6 +18,6 @@
-     def test_missing_config(self):
-         config.load()
-         self.assertTrue(
--            os.path.exists(os.path.join(TESTING_DIR, configuration._CONFIG_NAME))
-+            os.path.exists(os.path.join(TESTING_DIR, configuration.CONFIG_NAME))
-         )
-         config.load()
-Index: src/umu_commander/database.py
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>import json\nimport os\nfrom collections import defaultdict\n\nimport umu_commander.configuration as config\n\n\nclass Database:\n    _db: defaultdict[str, defaultdict[str, list[str]]]\n\n    @staticmethod\n    def load():\n        if not os.path.exists(config.DB_DIR):\n            os.mkdir(config.DB_DIR)\n\n        try:\n            with open(os.path.join(config.DB_DIR, config.DB_NAME), \"rt\") as db_file:\n                Database._db = defaultdict(lambda: defaultdict(list))\n                Database._db.update(json.load(db_file))\n\n        except FileNotFoundError:\n            Database._db = defaultdict(lambda: defaultdict(list))\n\n    @staticmethod\n    def dump():\n        with open(os.path.join(config.DB_DIR, config.DB_NAME), \"wt\") as db_file:\n            # noinspection PyTypeChecker\n            json.dump(Database._db, db_file, indent=\"\\t\")\n\n    @staticmethod\n    def get(\n        proton_dir: str = None, proton_ver: str = None\n    ) -> dict[str, dict[str, list[str]]] | dict[str, list[str]] | list[str]:\n        if proton_dir is None and proton_ver is None:\n            return Database._db\n\n        if proton_ver is None:\n            return Database._db[proton_dir]\n\n        if proton_ver not in Database._db[proton_dir]:\n            Database._db[proton_dir][proton_ver] = []\n\n        return Database._db[proton_dir][proton_ver]\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/umu_commander/database.py b/src/umu_commander/database.py
---- a/src/umu_commander/database.py	(revision 2c990ed1cab5a20498dc2cfe9bd4e331f60cb3af)
-+++ b/src/umu_commander/database.py	(date 1754467762394)
-@@ -4,40 +4,46 @@
- import umu_commander.configuration as config
-+_db: defaultdict[str, defaultdict[str, list[str]]] = defaultdict(
-+    lambda: defaultdict(list)
-+)
--class Database:
--    _db: defaultdict[str, defaultdict[str, list[str]]]
--    @staticmethod
--    def load():
--        if not os.path.exists(config.DB_DIR):
--            os.mkdir(config.DB_DIR)
-+def load():
-+    global _db
-+
-+    if not os.path.exists(config.DB_DIR):
-+        os.mkdir(config.DB_DIR)
--        try:
--            with open(os.path.join(config.DB_DIR, config.DB_NAME), "rt") as db_file:
--                Database._db = defaultdict(lambda: defaultdict(list))
--                Database._db.update(json.load(db_file))
-+    db_path: str = os.path.join(config.DB_DIR, config.DB_NAME)
-+    if not os.path.exists(db_path):
-+        return
--        except FileNotFoundError:
--            Database._db = defaultdict(lambda: defaultdict(list))
-+    with open(os.path.join(db_path), "rt") as db_file:
-+        _db.update(json.load(db_file))
--    @staticmethod
--    def dump():
--        with open(os.path.join(config.DB_DIR, config.DB_NAME), "wt") as db_file:
--            # noinspection PyTypeChecker
--            json.dump(Database._db, db_file, indent="\t")
-+
-+def dump():
-+    if not os.path.exists(config.DB_DIR):
-+        os.mkdir(config.DB_DIR)
-+
-+    with open(os.path.join(config.DB_DIR, config.DB_NAME), "wt") as db_file:
-+        # noinspection PyTypeChecker
-+        json.dump(_db, db_file, indent="\t")
--    @staticmethod
--    def get(
--        proton_dir: str = None, proton_ver: str = None
--    ) -> dict[str, dict[str, list[str]]] | dict[str, list[str]] | list[str]:
--        if proton_dir is None and proton_ver is None:
--            return Database._db
-+
-+def get(
-+    proton_dir: str = None, proton_ver: str = None
-+) -> dict[str, dict[str, list[str]]] | dict[str, list[str]] | list[str]:
-+    global _db
-+
-+    if proton_dir is None and proton_ver is None:
-+        return _db
--        if proton_ver is None:
--            return Database._db[proton_dir]
-+    if proton_ver is None:
-+        return _db[proton_dir]
--        if proton_ver not in Database._db[proton_dir]:
--            Database._db[proton_dir][proton_ver] = []
-+    if proton_ver not in _db[proton_dir]:
-+        _db[proton_dir][proton_ver] = []
--        return Database._db[proton_dir][proton_ver]
-+    return _db[proton_dir][proton_ver]
-Index: tests/test_tracking.py
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>import unittest\n\nimport umu_commander.configuration as config\nfrom tests import *\nfrom umu_commander import tracking\nfrom umu_commander.classes import ProtonVer\nfrom umu_commander.database import Database as db\n\n\nclass Tracking(unittest.TestCase):\n    def setUp(self):\n        config.DB_DIR = TESTING_DIR\n        setup()\n        db.load()\n\n    def tearDown(self):\n        teardown()\n\n    def test_track_untrack(self):\n        os.chdir(USER_DIR)\n\n        tracking.track(ProtonVer(PROTON_DIR_1, PROTON_BIG), refresh_versions=False)\n        self.assertIn(PROTON_BIG, db.get(PROTON_DIR_1))\n        self.assertIn(USER_DIR, db.get(PROTON_DIR_1, PROTON_BIG))\n\n        tracking.untrack(quiet=True)\n        self.assertIn(PROTON_BIG, db.get(PROTON_DIR_1))\n        self.assertNotIn(USER_DIR, db.get(PROTON_DIR_1, PROTON_BIG))\n\n    def test_track_auto_untrack(self):\n        os.chdir(USER_DIR)\n\n        tracking.track(ProtonVer(PROTON_DIR_1, PROTON_BIG), refresh_versions=False)\n        self.assertIn(PROTON_BIG, db.get(PROTON_DIR_1))\n        self.assertIn(USER_DIR, db.get(PROTON_DIR_1, PROTON_BIG))\n\n        os.rmdir(USER_DIR)\n        tracking.untrack_unlinked()\n        self.assertIn(PROTON_BIG, db.get(PROTON_DIR_1))\n        self.assertNotIn(\n            USER_DIR,\n            db.get(PROTON_DIR_1, PROTON_BIG),\n            \"Auto untrack did not untrack removed directory.\",\n        )\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/tests/test_tracking.py b/tests/test_tracking.py
---- a/tests/test_tracking.py	(revision 2c990ed1cab5a20498dc2cfe9bd4e331f60cb3af)
-+++ b/tests/test_tracking.py	(date 1754467945864)
-@@ -1,10 +1,10 @@
- import unittest
- import umu_commander.configuration as config
-+import umu_commander.database as db
- from tests import *
- from umu_commander import tracking
- from umu_commander.classes import ProtonVer
--from umu_commander.database import Database as db
- class Tracking(unittest.TestCase):
-Index: src/umu_commander/proton.py
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>import os\nimport re\nimport subprocess\n\nimport umu_commander.configuration as config\nfrom umu_commander.classes import ProtonDir, ProtonVer\nfrom umu_commander.database import Database as db\n\n\ndef _natural_sort_proton_ver_key(p: ProtonVer, _nsre=re.compile(r\"(\\d+)\")):\n    s: str = p.version_num\n    return [int(text) if text.isdigit() else text for text in _nsre.split(s)]\n\n\ndef refresh_proton_versions():\n    print(\"Updating umu Proton.\")\n    umu_update_process = subprocess.run(\n        [\"umu-run\", '\"\"'],\n        env={\"PROTONPATH\": \"UMU-Latest\", \"UMU_LOG\": \"debug\"},\n        capture_output=True,\n        text=True,\n    )\n\n    for line in umu_update_process.stderr.split(\"\\n\"):\n        if \"PROTONPATH\" in line and \"/\" in line:\n            try:\n                left: int = line.rfind(\"/\") + 1\n                print(f\"Using {line[left:len(line) - 1]}.\")\n            except ValueError:\n                print(\"Could not fetch latest UMU-Proton.\")\n\n            break\n\n\ndef _sort_proton_versions(versions: list[ProtonVer]) -> list[ProtonVer]:\n    return sorted(versions, key=_natural_sort_proton_ver_key, reverse=True)\n\n\ndef collect_proton_versions(\n    sort: bool = False, user_count: bool = False\n) -> list[ProtonDir]:\n    def get_user_count(proton_dir: str, proton_ver) -> str:\n        return (\n            \"(\" + str(len(db.get(proton_dir, proton_ver))) + \")\"\n            if proton_ver in db.get(proton_dir)\n            else \"(-)\"\n        )\n\n    proton_dirs: list[ProtonDir] = []\n    for proton_dir in config.PROTON_PATHS:\n        versions: list[ProtonVer] = [\n            ProtonVer(\n                proton_dir,\n                version,\n                get_user_count(proton_dir, version) if user_count else \"\",\n            )\n            for version in os.listdir(proton_dir)\n            if os.path.isdir(os.path.join(proton_dir, version))\n        ]\n\n        if sort:\n            versions = sorted(versions, key=_natural_sort_proton_ver_key, reverse=True)\n\n        proton_dirs.append(\n            ProtonDir(proton_dir, f\"Proton versions in {proton_dir}:\", versions)\n        )\n\n    return proton_dirs\n\n\ndef get_latest_umu_proton():\n    umu_proton_versions: list[ProtonVer] = [\n        ProtonVer(config.UMU_PROTON_PATH, version)\n        for version in os.listdir(config.UMU_PROTON_PATH)\n        if \"UMU\" in version\n        and os.path.isdir(os.path.join(config.UMU_PROTON_PATH, version))\n    ]\n    umu_proton_versions = sorted(\n        umu_proton_versions, key=_natural_sort_proton_ver_key, reverse=True\n    )\n\n    return umu_proton_versions[0].version_num\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/umu_commander/proton.py b/src/umu_commander/proton.py
---- a/src/umu_commander/proton.py	(revision 2c990ed1cab5a20498dc2cfe9bd4e331f60cb3af)
-+++ b/src/umu_commander/proton.py	(date 1754467945890)
-@@ -3,8 +3,8 @@
- import subprocess
- import umu_commander.configuration as config
-+import umu_commander.database as db
- from umu_commander.classes import ProtonDir, ProtonVer
--from umu_commander.database import Database as db
- def _natural_sort_proton_ver_key(p: ProtonVer, _nsre=re.compile(r"(\d+)")):
-Index: src/umu_commander/tracking.py
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>import os\nimport shutil\n\nfrom umu_commander.classes import ProtonDir, ProtonVer\nfrom umu_commander.database import Database as db\nfrom umu_commander.proton import (\n    collect_proton_versions,\n    get_latest_umu_proton,\n    refresh_proton_versions,\n)\nfrom umu_commander.util import (\n    get_selection,\n)\n\n\ndef untrack(quiet: bool = False):\n    current_dir: str = os.getcwd()\n    for proton_dir in db.get().keys():\n        for proton_ver in db.get(proton_dir):\n            if current_dir in db.get(proton_dir, proton_ver):\n                db.get(proton_dir, proton_ver).remove(current_dir)\n\n    if not quiet:\n        print(\"Directory removed from all user lists.\")\n\n\ndef track(\n    proton_ver: ProtonVer = None, refresh_versions: bool = True, quiet: bool = False\n):\n    if refresh_versions:\n        refresh_proton_versions()\n\n    if proton_ver is None:\n        proton_ver: ProtonVer = get_selection(\n            \"Select Proton version to add directory as user:\",\n            None,\n            collect_proton_versions(sort=True),\n        ).as_proton_ver()\n\n    untrack(quiet=True)\n    current_directory: str = os.getcwd()\n    db.get(proton_ver.dir, proton_ver.version_num).append(current_directory)\n\n    if not quiet:\n        print(\n            f\"Directory {current_directory} added to Proton version's {proton_ver.version_num} in {proton_ver.dir} user list.\"\n        )\n\n\ndef users():\n    proton_dirs: list[ProtonDir] = collect_proton_versions(sort=True, user_count=True)\n\n    proton_ver: ProtonVer = get_selection(\n        \"Select Proton version to view user list:\", None, proton_dirs\n    ).as_proton_ver()\n\n    if proton_ver.dir in db.get() and proton_ver.version_num in db.get(proton_ver.dir):\n        version_users: list[str] = db.get(proton_ver.dir, proton_ver.version_num)\n        if len(version_users) > 0:\n            print(f\"Directories using {proton_ver.version_num} of {proton_ver.dir}:\")\n            print(*version_users, sep=\"\\n\")\n        else:\n            print(\"No directories currently use this version.\")\n    else:\n        print(\"This version hasn't been used by umu before.\")\n\n\ndef delete():\n    for proton_dir in db.get().keys():\n        for proton_ver, version_users in db.get(proton_dir).copy().items():\n            if proton_ver == get_latest_umu_proton():\n                continue\n\n            if len(version_users) == 0:\n                selection: str = input(\n                    f\"{proton_ver} in {proton_dir} has no using directories, delete? (Y/N) ? \"\n                )\n                if selection.lower() == \"y\":\n                    try:\n                        shutil.rmtree(os.path.join(proton_dir, proton_ver))\n                    except FileNotFoundError:\n                        pass\n                    del db.get(proton_dir)[proton_ver]\n\n\ndef untrack_unlinked():\n    for proton_dir in db.get().keys():\n        for proton_ver, version_users in db.get()[proton_dir].items():\n            for user in version_users:\n                if not os.path.exists(user):\n                    db.get(proton_dir, proton_ver).remove(user)\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/umu_commander/tracking.py b/src/umu_commander/tracking.py
---- a/src/umu_commander/tracking.py	(revision 2c990ed1cab5a20498dc2cfe9bd4e331f60cb3af)
-+++ b/src/umu_commander/tracking.py	(date 1754467945881)
-@@ -1,8 +1,8 @@
- import os
- import shutil
-+import umu_commander.database as db
- from umu_commander.classes import ProtonDir, ProtonVer
--from umu_commander.database import Database as db
- from umu_commander.proton import (
-     collect_proton_versions,
-     get_latest_umu_proton,
-Index: src/umu_commander/main.py
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>#!/usr/bin/python3\nimport os\nimport sys\nfrom json import JSONDecodeError\n\nimport umu_commander.configuration as config\nfrom umu_commander import tracking, umu_config\nfrom umu_commander.classes import ExitCode\nfrom umu_commander.configuration import _CONFIG_DIR, _CONFIG_NAME\nfrom umu_commander.database import Database as db\n\n\ndef print_help():\n    print(\n        \"umu-commander is an interactive CLI tool to help you manage Proton versions used by umu, as well as create enhanced launch configs.\",\n        \"\",\n        \"For details, explanations, and more, see the README.md file, or visit https://github.com/Mpaxlamitsounas/umu-commander.\",\n        sep=\"\\n\",\n    )\n\n\ndef main() -> ExitCode:\n    try:\n        config.load()\n    except (JSONDecodeError, KeyError):\n        config_path: str = os.path.join(_CONFIG_DIR, _CONFIG_NAME)\n        print(f\"Config file at {config_path} could not be read.\")\n        os.rename(config_path, os.path.join(_CONFIG_DIR, _CONFIG_NAME + \".old\"))\n\n    try:\n        db.load()\n    except JSONDecodeError:\n        db_path: str = os.path.join(config.DB_DIR, config.DB_NAME)\n        print(f\"Tracking file at {db_path} could not be read.\")\n        os.rename(db_path, os.path.join(config.DB_DIR, config.DB_NAME + \".old\"))\n\n    if len(sys.argv) == 1:\n        print_help()\n        return ExitCode.SUCCESS.value\n\n    verb: str = sys.argv[1]\n    match verb:\n        case \"track\":\n            tracking.track()\n        case \"untrack\":\n            tracking.untrack()\n        case \"users\":\n            tracking.users()\n        case \"delete\":\n            tracking.delete()\n        case \"create\":\n            umu_config.create()\n        case \"run\":\n            umu_config.run()\n        case _:\n            print(\"Invalid verb.\")\n            print_help()\n            return ExitCode.INVALID_SELECTION.value\n\n    tracking.untrack_unlinked()\n    db.dump()\n    config.dump()\n\n    return ExitCode.SUCCESS.value\n\n\nif __name__ == \"__main__\":\n    exit(main())\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/umu_commander/main.py b/src/umu_commander/main.py
---- a/src/umu_commander/main.py	(revision 2c990ed1cab5a20498dc2cfe9bd4e331f60cb3af)
-+++ b/src/umu_commander/main.py	(date 1754467945908)
-@@ -4,10 +4,10 @@
- from json import JSONDecodeError
- import umu_commander.configuration as config
-+import umu_commander.database as db
- from umu_commander import tracking, umu_config
- from umu_commander.classes import ExitCode
--from umu_commander.configuration import _CONFIG_DIR, _CONFIG_NAME
--from umu_commander.database import Database as db
-+from umu_commander.configuration import CONFIG_DIR, CONFIG_NAME
- def print_help():
-@@ -23,9 +23,9 @@
-     try:
-         config.load()
-     except (JSONDecodeError, KeyError):
--        config_path: str = os.path.join(_CONFIG_DIR, _CONFIG_NAME)
-+        config_path: str = os.path.join(CONFIG_DIR, CONFIG_NAME)
-         print(f"Config file at {config_path} could not be read.")
--        os.rename(config_path, os.path.join(_CONFIG_DIR, _CONFIG_NAME + ".old"))
-+        os.rename(config_path, os.path.join(CONFIG_DIR, CONFIG_NAME + ".old"))
-     try:
-         db.load()

umu_commander-1.6.0/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]1/shelved.patch DELETED Viewed

@@ -1,12 +0,0 @@
-Index: src/umu_commander/__init__.py
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>VERSION = \"v1.5.6\"\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/umu_commander/__init__.py b/src/umu_commander/__init__.py
---- a/src/umu_commander/__init__.py	(revision ebc968e623b6ee38499de12ff2a04c4bf2311db2)
-+++ b/src/umu_commander/__init__.py	(date 1754484120387)
-@@ -1,1 +1,0 @@
--VERSION = "v1.5.6"

umu_commander-1.6.0/.idea/shelf/Uncommitted_changes_before_rebase__Changes_.xml DELETED Viewed

@@ -1,4 +0,0 @@
-<changelist name="Uncommitted_changes_before_rebase_[Changes]" date="1754468467307" recycled="true" deleted="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before rebase [Changes]" />
-</changelist>

umu_commander-1.6.0/.idea/shelf/Uncommitted_changes_before_rebase__Changes_1.xml DELETED Viewed

@@ -1,4 +0,0 @@
-<changelist name="Uncommitted_changes_before_rebase_[Changes]1" date="1754484165593" recycled="true" deleted="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]1/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before rebase [Changes]" />
-</changelist>