umu-commander 1.5.4__py3-none-any.whl → 1.5.5__py3-none-any.whl

umu_commander/configuration.py

@@ -1,6 +1,8 @@
+import importlib
 import os
 import tomllib
 from pathlib import Path
+from typing import Any
 
 import tomli_w
 
@@ -10,63 +12,66 @@ 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(
+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(
                 [
-                    (override.info, override.value)
-                    for override in Configuration.DLL_OVERRIDES_OPTIONS
+                    DLLOverride(label, override_str)
+                    for label, override_str in toml_conf[
+                        "DLL_OVERRIDES_OPTIONS"
+                    ].items()
                 ]
             )
 
-            tomli_w.dump(toml_conf, conf_file)
+        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"]
 
-    @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
+        toml_conf["DLL_OVERRIDES_OPTIONS"] = dict(
+            [(override.info, override.value) for override in DLL_OVERRIDES_OPTIONS]
+        )
 
-        return attributes
+        tomli_w.dump(toml_conf, conf_file)

umu_commander/database.py

@@ -2,42 +2,53 @@ import json
 import os
 from collections import defaultdict
 
-from umu_commander.configuration import Configuration as config
+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
 
-        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))
+    if not os.path.exists(config.DB_DIR):
+        os.mkdir(config.DB_DIR)
 
-        except FileNotFoundError:
-            Database._db = defaultdict(lambda: defaultdict(list))
+    db_path: str = os.path.join(config.DB_DIR, config.DB_NAME)
+    if not os.path.exists(db_path):
+        return
 
-    @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")
+    with open(os.path.join(db_path), "rt") as db_file:
+        _db.update(json.load(db_file))
 
-    @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]
+def dump():
+    if not os.path.exists(config.DB_DIR):
+        os.mkdir(config.DB_DIR)
 
-        if proton_ver not in Database._db[proton_dir]:
-            Database._db[proton_dir][proton_ver] = []
+    with open(os.path.join(config.DB_DIR, config.DB_NAME), "wt") as db_file:
+        # noinspection PyTypeChecker
+        json.dump(_db, db_file, indent="\t")
 
-        return Database._db[proton_dir][proton_ver]
+
+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/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():

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/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/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.4.dist-info → umu_commander-1.5.5.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: umu-commander
-Version: 1.5.4
+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

umu_commander-1.5.5.dist-info/RECORD

@@ -0,0 +1,14 @@
+umu_commander/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+umu_commander/classes.py,sha256=SW8k4TrP4-W4DdaQC_P88wBIgeJ3TIaV7lyt32IfVD8,1654
+umu_commander/configuration.py,sha256=VmOmlXQS08OFlptu04P0zLgCsiToJMgKBXx35aRpnfU,2368
+umu_commander/database.py,sha256=_8FVW-gctDsR6K2LiHQy6Mr_yR0JTY-taIvqBb9Hr0E,1248
+umu_commander/main.py,sha256=-EghV73K7XlV_JXnYgLAc6Qt1svp3vT8s8TUVo6nIXQ,1945
+umu_commander/proton.py,sha256=ZJ3y8sjxTIKm5mUH32eXBGxGuJH_2gWXi_EoqJyOxko,2553
+umu_commander/tracking.py,sha256=V38nWlOZu0BUyPWssX6i0JoXOkd8NkKAdJ0hPauXlMM,3064
+umu_commander/umu_config.py,sha256=ilxWhiT2XhPn9qeJf-i2YWZIhVktPuMkNxpEfdnMF_A,4192
+umu_commander/util.py,sha256=e4IqnxT0K2lLsUUgqnK0Z60MJRasvGCzo90ZX-gVBOE,2648
+umu_commander-1.5.5.dist-info/METADATA,sha256=H7XhadfLpQZeVa8hUfP66Gm0oeTMsHdRM6oI_B4M_6o,3720
+umu_commander-1.5.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+umu_commander-1.5.5.dist-info/entry_points.txt,sha256=7RGP35zAHeEojZ-sv7JIITuMeH_VVNuG2g2_SUrUnbM,58
+umu_commander-1.5.5.dist-info/licenses/LICENSE.txt,sha256=yipFXBRmVZ2Q44x1q18HccPUAECBQLXAOAr21aS57uY,1071
+umu_commander-1.5.5.dist-info/RECORD,,

umu_commander-1.5.4.dist-info/RECORD

@@ -1,14 +0,0 @@
-umu_commander/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-umu_commander/classes.py,sha256=SW8k4TrP4-W4DdaQC_P88wBIgeJ3TIaV7lyt32IfVD8,1654
-umu_commander/configuration.py,sha256=tzVFoQx7M1RGGtP_c_k3IUVFNcLwsmjbQplTeKlFUnM,2398
-umu_commander/database.py,sha256=rkjEEy-Em9ghZOypsWyKTlNjDNMU4XXWuthnpfa6yz4,1343
-umu_commander/main.py,sha256=X1r73ATO6UwPCHhP7FhSFr7kp882q61K1a-Ky_uSFtM,1978
-umu_commander/proton.py,sha256=QWqU5N2v-QqP_d-kFGXxXiCufLFQywnMNrbuLXaINZk,2572
-umu_commander/tracking.py,sha256=MVj-GfbROyqhKa-m6557RGCzavTxgphNBVPJNtSTe3k,3058
-umu_commander/umu_config.py,sha256=3b5XeTZppmLpxUGBHi4JSBc7zmKxNKjboldwGfLE0rc,4091
-umu_commander/util.py,sha256=e4IqnxT0K2lLsUUgqnK0Z60MJRasvGCzo90ZX-gVBOE,2648
-umu_commander-1.5.4.dist-info/METADATA,sha256=XfTCvFLZk0OOe43aTsjucUg12N_CAfwo1QsONUVLYGQ,3707
-umu_commander-1.5.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-umu_commander-1.5.4.dist-info/entry_points.txt,sha256=7RGP35zAHeEojZ-sv7JIITuMeH_VVNuG2g2_SUrUnbM,58
-umu_commander-1.5.4.dist-info/licenses/LICENSE.txt,sha256=yipFXBRmVZ2Q44x1q18HccPUAECBQLXAOAr21aS57uY,1071
-umu_commander-1.5.4.dist-info/RECORD,,