umu-commander 1.5.3__tar.gz → 1.5.5__tar.gz

umu_commander-1.5.5/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]/shelved.patch

@@ -0,0 +1,229 @@
+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.5.3 → umu_commander-1.5.5}/.idea/workspace.xml

@@ -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.5.2" />
+    <list default="true" id="043620f1-711f-4c27-a2e2-15fa501e8ce0" name="Changes" comment="1.5.4">
+      <change beforePath="$PROJECT_DIR$/pyproject.toml" beforeDir="false" afterPath="$PROJECT_DIR$/pyproject.toml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -50,46 +52,46 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <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_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.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.Upload.executor": "Run",
-    "git-widget-placeholder": "master",
-    "last_opened_file_path": "/home/hiroshi/Code/Python/umu-commander/tests",
-    "run.code.analysis.last.selected.profile": "aDefault",
-    "settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
+  <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_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;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.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/tests&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>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/tests" />
@@ -379,46 +381,6 @@
       <option name="presentableId" value="Default" />
       <updated>1751043400140</updated>
     </task>
-    <task id="LOCAL-00009" summary="Update readme and decapitalise umu">
-      <option name="closed" value="true" />
-      <created>1751918299613</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1751918299613</updated>
-    </task>
-    <task id="LOCAL-00010" summary="Add example config">
-      <option name="closed" value="true" />
-      <created>1751919191540</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1751919191540</updated>
-    </task>
-    <task id="LOCAL-00011" summary="Tweak &quot;latest umu&quot; functionality">
-      <option name="closed" value="true" />
-      <created>1751919211128</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1751919211128</updated>
-    </task>
-    <task id="LOCAL-00012" summary="Update readme">
-      <option name="closed" value="true" />
-      <created>1751919216236</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1751919216236</updated>
-    </task>
-    <task id="LOCAL-00013" summary="Automatically untrack removed directories">
-      <option name="closed" value="true" />
-      <created>1751919326145</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1751919326145</updated>
-    </task>
     <task id="LOCAL-00014" summary="Update readme">
       <option name="closed" value="true" />
       <created>1751919652836</created>
@@ -771,7 +733,47 @@
       <option name="project" value="LOCAL" />
       <updated>1754003619303</updated>
     </task>
-    <option name="localTasksCounter" value="58" />
+    <task id="LOCAL-00058" summary="made typo.">
+      <option name="closed" value="true" />
+      <created>1754004029502</created>
+      <option name="number" value="00058" />
+      <option name="presentableId" value="LOCAL-00058" />
+      <option name="project" value="LOCAL" />
+      <updated>1754004029502</updated>
+    </task>
+    <task id="LOCAL-00059" summary="1.5.3">
+      <option name="closed" value="true" />
+      <created>1754004038591</created>
+      <option name="number" value="00059" />
+      <option name="presentableId" value="LOCAL-00059" />
+      <option name="project" value="LOCAL" />
+      <updated>1754004038591</updated>
+    </task>
+    <task id="LOCAL-00060" summary="Fix error code returning">
+      <option name="closed" value="true" />
+      <created>1754004871181</created>
+      <option name="number" value="00060" />
+      <option name="presentableId" value="LOCAL-00060" />
+      <option name="project" value="LOCAL" />
+      <updated>1754004871181</updated>
+    </task>
+    <task id="LOCAL-00061" summary="Update documentation.">
+      <option name="closed" value="true" />
+      <created>1754005126667</created>
+      <option name="number" value="00061" />
+      <option name="presentableId" value="LOCAL-00061" />
+      <option name="project" value="LOCAL" />
+      <updated>1754005126667</updated>
+    </task>
+    <task id="LOCAL-00062" summary="1.5.4">
+      <option name="closed" value="true" />
+      <created>1754005137926</created>
+      <option name="number" value="00062" />
+      <option name="presentableId" value="LOCAL-00062" />
+      <option name="project" value="LOCAL" />
+      <updated>1754005137926</updated>
+    </task>
+    <option name="localTasksCounter" value="63" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -798,11 +800,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Add UMU_PROTON_DIR config key" />
-    <MESSAGE value="Rename DB methods&#10;Rename variables for consistency&#10;Use dataclasses to group data better&#10;Add full support for multiple proton directories" />
-    <MESSAGE value="shorter" />
-    <MESSAGE value="Add some comments, rename a DB method" />
-    <MESSAGE value="Move src code to src directory" />
     <MESSAGE value="Update documentation on the change" />
     <MESSAGE value="Reorganised project&#10;Split methods from util.py into proton.py&#10;Various fixes&#10;Formatting" />
     <MESSAGE value="Add project files" />
@@ -823,6 +820,11 @@
     <MESSAGE value="Improve config handling" />
     <MESSAGE value="Update documentation" />
     <MESSAGE value="1.5.2" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.5.2" />
+    <MESSAGE value="made typo." />
+    <MESSAGE value="1.5.3" />
+    <MESSAGE value="Fix error code returning" />
+    <MESSAGE value="Update documentation." />
+    <MESSAGE value="1.5.4" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.5.4" />
   </component>
 </project>

{umu_commander-1.5.3 → umu_commander-1.5.5}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: umu-commander
-Version: 1.5.3
+Version: 1.5.5
 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
 Author-email: Mpaxlamitsounas <worldstudy123@gmail.com>
 License-Expression: MIT
 License-File: LICENSE.txt
-Keywords: umu
+Keywords: umu,umu-launcher
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.12
@@ -49,4 +49,11 @@ umu-commander needs one of the following verbs specified after the executable na
   * This is NOT equivalent to `umu-run --config <config_name>`, as vanilla umu configs do not support setting environment variables as of 07/2025.
   
 ### Installation/Usage
-Add umu-run to your PATH and then install with pipx by running `pipx install umu-commander`. After that you can invoke umu-commander by running `umu-commander <verb>`. 
+Add umu-run to your PATH and then install with pipx by running `pipx install umu-commander`. After that you can invoke umu-commander by running `umu-commander <verb>`. 
+
+### Return codes
+| Number | Name              | Description                                                     |
+|:-------|:------------------|:----------------------------------------------------------------|
+| 0      | SUCCESS           | Program executed as intended.                                   |
+| 1      | READING_ERROR     | Failed to parse a file and could not recover.                   |
+| 2      | INVALID_SELECTION | User selected an invalid verb or there are no valid selections. |

{umu_commander-1.5.3 → umu_commander-1.5.5}/README.md

@@ -33,4 +33,11 @@ umu-commander needs one of the following verbs specified after the executable na
   * This is NOT equivalent to `umu-run --config <config_name>`, as vanilla umu configs do not support setting environment variables as of 07/2025.
   
 ### Installation/Usage
-Add umu-run to your PATH and then install with pipx by running `pipx install umu-commander`. After that you can invoke umu-commander by running `umu-commander <verb>`. 
+Add umu-run to your PATH and then install with pipx by running `pipx install umu-commander`. After that you can invoke umu-commander by running `umu-commander <verb>`. 
+
+### Return codes
+| Number | Name              | Description                                                     |
+|:-------|:------------------|:----------------------------------------------------------------|
+| 0      | SUCCESS           | Program executed as intended.                                   |
+| 1      | READING_ERROR     | Failed to parse a file and could not recover.                   |
+| 2      | INVALID_SELECTION | User selected an invalid verb or there are no valid selections. |

{umu_commander-1.5.3 → umu_commander-1.5.5}/pyproject.toml

@@ -4,9 +4,9 @@ build-backend = "hatchling.build"
 
 [project]
 name = "umu-commander"
-version = "1.5.3"
+version = "1.5.5"
 authors = [
-  { name="Mpaxlamitsounas", email="worldstudy123@gmail.com" },
+    { name = "Mpaxlamitsounas", email = "worldstudy123@gmail.com" },
 ]
 description = "umu-commander is an interactive CLI tool to help you manage umu."
 readme = "README.md"
@@ -15,13 +15,16 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: POSIX :: Linux",
 ]
-dependencies =[
+dependencies = [
     "tomli-w"
 ]
 
 license = "MIT"
 license-files = ["LICEN[CS]E*"]
-keywords = ["umu"]
+keywords = [
+    "umu",
+    "umu-launcher"
+]
 
 [project.urls]
 Homepage = "https://github.com/Mpaxlamitsounas/umu-commander"

umu_commander-1.5.5/src/umu_commander/configuration.py

@@ -0,0 +1,77 @@
+import importlib
+import os
+import tomllib
+from pathlib import Path
+from typing import Any
+
+import tomli_w
+
+from umu_commander.classes import DLLOverride
+
+CONFIG_DIR: str = os.path.join(Path.home(), ".config")
+CONFIG_NAME: str = "umu-commander.toml"
+
+
+PROTON_PATHS: tuple[str, ...] = (
+    os.path.join(Path.home(), ".local/share/Steam/compatibilitytools.d/"),
+    os.path.join(Path.home(), ".local/share/umu/compatibilitytools"),
+)
+UMU_PROTON_PATH: str = os.path.join(
+    Path.home(), ".local/share/Steam/compatibilitytools.d/"
+)
+DB_NAME: str = "tracking.json"
+DB_DIR: str = os.path.join(Path.home(), ".local/share/umu/compatibilitytools")
+UMU_CONFIG_NAME: str = "umu-config.toml"
+DEFAULT_PREFIX_DIR: str = os.path.join(Path.home(), ".local/share/wineprefixes/")
+DLL_OVERRIDES_OPTIONS: tuple[DLLOverride, ...] = (
+    DLLOverride("winhttp for BepInEx", "winhttp.dll=n;"),
+)
+
+
+def load():
+    config_path: str = os.path.join(CONFIG_DIR, CONFIG_NAME)
+    if not os.path.exists(config_path):
+        return
+
+    with open(config_path, "rb") as conf_file:
+        toml_conf = tomllib.load(conf_file)
+        if "DLL_OVERRIDES_OPTIONS" in toml_conf:
+            toml_conf["DLL_OVERRIDES_OPTIONS"] = tuple(
+                [
+                    DLLOverride(label, override_str)
+                    for label, override_str in toml_conf[
+                        "DLL_OVERRIDES_OPTIONS"
+                    ].items()
+                ]
+            )
+
+        module = importlib.import_module(__name__)
+        for key, value in toml_conf.items():
+            setattr(module, key, value)
+
+
+def _get_attributes() -> dict[str, Any]:
+    module = importlib.import_module(__name__)
+    attributes: dict[str, Any] = {}
+    for key in dir(module):
+        value = getattr(module, key)
+        if not key.startswith("_") and not callable(value) and key.upper() == key:
+            attributes[key] = value
+
+    return attributes
+
+
+def dump():
+    if not os.path.exists(CONFIG_DIR):
+        os.mkdir(CONFIG_DIR)
+
+    with open(os.path.join(CONFIG_DIR, CONFIG_NAME), "wb") as conf_file:
+        toml_conf = _get_attributes()
+        del toml_conf["CONFIG_DIR"]
+        del toml_conf["CONFIG_NAME"]
+
+        toml_conf["DLL_OVERRIDES_OPTIONS"] = dict(
+            [(override.info, override.value) for override in DLL_OVERRIDES_OPTIONS]
+        )
+
+        tomli_w.dump(toml_conf, conf_file)

umu_commander-1.5.5/src/umu_commander/database.py

@@ -0,0 +1,54 @@
+import json
+import os
+from collections import defaultdict
+
+import umu_commander.configuration as config
+
+_db: defaultdict[str, defaultdict[str, list[str]]] = defaultdict(
+    lambda: defaultdict(list)
+)
+
+
+def load():
+    global _db
+
+    if not os.path.exists(config.DB_DIR):
+        os.mkdir(config.DB_DIR)
+
+    db_path: str = os.path.join(config.DB_DIR, config.DB_NAME)
+    if not os.path.exists(db_path):
+        return
+
+    with open(os.path.join(db_path), "rt") as db_file:
+        _db.update(json.load(db_file))
+
+
+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")
+
+
+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 _db[proton_dir]
+
+    if proton_ver not in _db[proton_dir]:
+        _db[proton_dir][proton_ver] = []
+
+    return _db[proton_dir][proton_ver]
+
+
+def _reset():
+    global _db
+    _db = defaultdict(lambda: defaultdict(list))

{umu_commander-1.5.3 → umu_commander-1.5.5}/src/umu_commander/main.py

@@ -3,11 +3,11 @@ import os
 import sys
 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.configuration import Configuration as config
-from umu_commander.database import Database as db
 
 
 def print_help():
@@ -36,7 +36,7 @@ def main() -> ExitCode:
 
     if len(sys.argv) == 1:
         print_help()
-        return ExitCode.SUCCESS
+        return ExitCode.SUCCESS.value
 
     verb: str = sys.argv[1]
     match verb:
@@ -55,14 +55,14 @@ def main() -> ExitCode:
         case _:
             print("Invalid verb.")
             print_help()
-            return ExitCode.INVALID_SELECTION
+            return ExitCode.INVALID_SELECTION.value
 
     tracking.untrack_unlinked()
     db.dump()
     config.dump()
 
-    return ExitCode.SUCCESS
+    return ExitCode.SUCCESS.value
 
 
 if __name__ == "__main__":
-    exit(main().value)
+    exit(main())

{umu_commander-1.5.3 → umu_commander-1.5.5}/src/umu_commander/proton.py

@@ -2,9 +2,9 @@ import os
 import re
 import subprocess
 
+import umu_commander.configuration as config
+import umu_commander.database as db
 from umu_commander.classes import ProtonDir, ProtonVer
-from umu_commander.configuration import Configuration as config
-from umu_commander.database import Database as db
 
 
 def _natural_sort_proton_ver_key(p: ProtonVer, _nsre=re.compile(r"(\d+)")):
@@ -25,9 +25,9 @@ def refresh_proton_versions():
         if "PROTONPATH" in line and "/" in line:
             try:
                 left: int = line.rfind("/") + 1
-                print(f"Using {line[left:len(line) - 1]}.")
+                print(f":Latest umu Proton: {line[left:len(line) - 1]}.")
             except ValueError:
-                print("Could not fetch latest UMU-Proton.")
+                print("Could not fetch latest umu Proton.")
 
             break
 

{umu_commander-1.5.3 → umu_commander-1.5.5}/src/umu_commander/tracking.py

@@ -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,
@@ -21,7 +21,7 @@ def untrack(quiet: bool = False):
                 db.get(proton_dir, proton_ver).remove(current_dir)
 
     if not quiet:
-        print("Directory removed from all user lists.")
+        print("Directory removed from all tracking lists.")
 
 
 def track(
@@ -32,7 +32,7 @@ def track(
 
     if proton_ver is None:
         proton_ver: ProtonVer = get_selection(
-            "Select Proton version to add directory as user:",
+            "Select Proton version to track directory with:",
             None,
             collect_proton_versions(sort=True),
         ).as_proton_ver()
@@ -43,7 +43,7 @@ def track(
 
     if not quiet:
         print(
-            f"Directory {current_directory} added to Proton version's {proton_ver.version_num} in {proton_ver.dir} user list."
+            f"Directory {current_directory} added to Proton version's {proton_ver.version_num} in {proton_ver.dir} tracking list."
         )
 
 
@@ -57,10 +57,10 @@ def users():
     if proton_ver.dir in db.get() and proton_ver.version_num in db.get(proton_ver.dir):
         version_users: list[str] = db.get(proton_ver.dir, proton_ver.version_num)
         if len(version_users) > 0:
-            print(f"Directories using {proton_ver.version_num} of {proton_ver.dir}:")
+            print(f"Directories tracked by {proton_ver.version_num} of {proton_ver.dir}:")
             print(*version_users, sep="\n")
         else:
-            print("No directories currently use this version.")
+            print("This version is tracking no directories.")
     else:
         print("This version hasn't been used by umu before.")
 
@@ -73,7 +73,7 @@ def delete():
 
             if len(version_users) == 0:
                 selection: str = input(
-                    f"{proton_ver} in {proton_dir} has no using directories, delete? (Y/N) ? "
+                    f"Version {proton_ver} in {proton_dir} is tracking no directories, delete? (Y/N) ? "
                 )
                 if selection.lower() == "y":
                     try:

{umu_commander-1.5.3 → umu_commander-1.5.5}/src/umu_commander/umu_config.py

@@ -5,9 +5,9 @@ from typing import Any
 
 import tomli_w
 
+import umu_commander.configuration as config
 from umu_commander import tracking
 from umu_commander.classes import DLLOverride, ProtonVer
-from umu_commander.configuration import Configuration as config
 from umu_commander.proton import collect_proton_versions, refresh_proton_versions
 from umu_commander.util import (
     get_selection,
@@ -54,7 +54,7 @@ def create():
     ]
     selected: set[int] = set()
     while True:
-        print("Select DLLs to override, you can select multiple:")
+        print("Select DLLs to override, multiple can be selected:")
         for idx, override in enumerate(possible_overrides):
             if idx in selected:
                 idx = "Y"
@@ -122,10 +122,14 @@ def create():
         if not selected_umu_latest:
             tracking.track(proton_ver, False)
     except:
-        print("Could not create configiguration file.")
+        print("Could not create configuration file.")
 
 
 def run():
+    if not os.path.exists(config.UMU_CONFIG_NAME):
+        print("No umu config in current directory.")
+        return
+
     with open(config.UMU_CONFIG_NAME, "rb") as toml_file:
         toml_conf = tomllib.load(toml_file)
 
@@ -137,3 +141,4 @@ def run():
             args=["umu-run", "--config", config.UMU_CONFIG_NAME],
             env=os.environ,
         )
+

{umu_commander-1.5.3 → umu_commander-1.5.5}/src/umu_commander/util.py

@@ -58,7 +58,7 @@ def get_selection(
 ) -> Element:
     if not _selection_set_valid(selection_elements, selection_groups):
         print("Nothing to select from.")
-        exit(ExitCode.INVALID_SELECTION)
+        exit(ExitCode.INVALID_SELECTION.value)
 
     if selection_groups is None:
         selection_groups = []

{umu_commander-1.5.3 → umu_commander-1.5.5}/tests/test_config.py

@@ -1,9 +1,9 @@
 import os.path
 import unittest
 
+import umu_commander.configuration as config
 from tests import *
 from umu_commander import configuration
-from umu_commander.configuration import Configuration as config
 
 
 class Config(unittest.TestCase):
@@ -16,7 +16,7 @@ class Config(unittest.TestCase):
         teardown()
 
     def test_missing_config(self):
-        config.load()
+        config.dump()
         self.assertTrue(
             os.path.exists(os.path.join(TESTING_DIR, configuration.CONFIG_NAME))
         )

{umu_commander-1.5.3 → umu_commander-1.5.5}/tests/test_db.py

@@ -1,22 +1,23 @@
 import unittest
 from json import JSONDecodeError
 
+import umu_commander.configuration as config
+import umu_commander.database as db
 from tests import *
-from umu_commander.configuration import Configuration as config
-from umu_commander.database import Database as db
 
 
 class Database(unittest.TestCase):
     def setUp(self):
         config.DB_DIR = TESTING_DIR
         setup()
+        db._reset()
 
     def tearDown(self):
         teardown()
 
     def test_missing_db(self):
         db.load()
-        self.assertEqual(db.get(), {})
+        self.assertEqual(db.get().keys(), {}.keys())
 
     def test_malformed_db(self):
         with open(os.path.join(config.DB_DIR, config.DB_NAME), "tw") as db_file:

{umu_commander-1.5.3 → umu_commander-1.5.5}/tests/test_proton.py

@@ -1,9 +1,9 @@
 import unittest
 
+import umu_commander.configuration as config
 from tests import *
 from umu_commander import proton
 from umu_commander.classes import Group
-from umu_commander.configuration import Configuration as config
 
 
 class Tracking(unittest.TestCase):

{umu_commander-1.5.3 → umu_commander-1.5.5}/tests/test_tracking.py

@@ -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.configuration import Configuration as config
-from umu_commander.database import Database as db
 
 
 class Tracking(unittest.TestCase):

umu_commander-1.5.3/src/umu_commander/configuration.py

@@ -1,72 +0,0 @@
-import os
-import tomllib
-from pathlib import Path
-
-import tomli_w
-
-from umu_commander.classes import DLLOverride
-
-CONFIG_DIR: str = os.path.join(Path.home(), ".config")
-CONFIG_NAME: str = "umu-commander.toml"
-
-
-class Configuration:
-    PROTON_PATHS: tuple[str, ...] = (
-        os.path.join(Path.home(), ".local/share/Steam/compatibilitytools.d/"),
-        os.path.join(Path.home(), ".local/share/umu/compatibilitytools"),
-    )
-    UMU_PROTON_PATH: str = os.path.join(
-        Path.home(), ".local/share/Steam/compatibilitytools.d/"
-    )
-    DB_NAME: str = "tracking.json"
-    DB_DIR: str = os.path.join(Path.home(), ".local/share/umu/compatibilitytools")
-    UMU_CONFIG_NAME: str = "umu-config.toml"
-    DEFAULT_PREFIX_DIR: str = os.path.join(Path.home(), ".local/share/wineprefixes/")
-    DLL_OVERRIDES_OPTIONS: tuple[DLLOverride, ...] = (
-        DLLOverride("winhttp for BepInEx", "winhttp.dll=n;"),
-    )
-
-    @staticmethod
-    def load():
-        try:
-            with open(os.path.join(CONFIG_DIR, CONFIG_NAME), "rb") as conf_file:
-                toml_conf = tomllib.load(conf_file)
-                toml_conf["DLL_OVERRIDES_OPTIONS"] = tuple(
-                    [
-                        DLLOverride(label, override_str)
-                        for label, override_str in toml_conf[
-                            "DLL_OVERRIDES_OPTIONS"
-                        ].items()
-                    ]
-                )
-
-                for key, value in toml_conf.items():
-                    setattr(Configuration, key, value)
-
-        except FileNotFoundError:
-            Configuration.dump()
-
-    @staticmethod
-    def dump():
-        if not os.path.exists(CONFIG_DIR):
-            os.mkdir(CONFIG_DIR)
-
-        with open(os.path.join(CONFIG_DIR, CONFIG_NAME), "wb") as conf_file:
-            toml_conf = Configuration._get_attributes()
-            toml_conf["DLL_OVERRIDES_OPTIONS"] = dict(
-                [
-                    (override.info, override.value)
-                    for override in Configuration.DLL_OVERRIDES_OPTIONS
-                ]
-            )
-
-            tomli_w.dump(toml_conf, conf_file)
-
-    @staticmethod
-    def _get_attributes():
-        attributes = {}
-        for key, value in vars(Configuration).items():
-            if not key.startswith("__") and not callable(getattr(Configuration, key)):
-                attributes[key] = value
-
-        return attributes

umu_commander-1.5.3/src/umu_commander/database.py

@@ -1,43 +0,0 @@
-import json
-import os
-from collections import defaultdict
-
-from umu_commander.configuration import Configuration as config
-
-
-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)
-
-        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))
-
-        except FileNotFoundError:
-            Database._db = defaultdict(lambda: defaultdict(list))
-
-    @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")
-
-    @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
-
-        if proton_ver is None:
-            return Database._db[proton_dir]
-
-        if proton_ver not in Database._db[proton_dir]:
-            Database._db[proton_dir][proton_ver] = []
-
-        return Database._db[proton_dir][proton_ver]