PyPI - umu-commander - Versions diffs - 1.4.0__tar.gz → 1.5.1__tar.gz - Mend

umu-commander 1.4.0tar.gz → 1.5.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 (33) hide show

{umu_commander-1.4.0 → umu_commander-1.5.1}/.idea/misc.xml RENAMED Viewed

@@ -3,5 +3,5 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.12" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (umu-commander)" project-jdk-type="Python SDK" />
 </project>

{umu_commander-1.4.0 → umu_commander-1.5.1}/.idea/umu-commander.iml RENAMED Viewed

@@ -6,7 +6,7 @@
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.12" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.12 (umu-commander)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

{umu_commander-1.4.0 → umu_commander-1.5.1}/.idea/workspace.xml RENAMED Viewed

@@ -4,7 +4,23 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="043620f1-711f-4c27-a2e2-15fa501e8ce0" name="Changes" comment="Preparations for building" />
+    <list default="true" id="043620f1-711f-4c27-a2e2-15fa501e8ce0" name="Changes" comment="Preparations for building">
+      <change afterPath="$PROJECT_DIR$/src/umu_commander/config.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tests/test_config.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/umu-commander.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/umu-commander.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pyproject.toml" beforeDir="false" afterPath="$PROJECT_DIR$/pyproject.toml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/umu_commander/configuration.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/umu_commander/db.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/umu_commander/db.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/umu_commander/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/umu_commander/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/umu_commander/proton.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/umu_commander/proton.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/umu_commander/tracking.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/umu_commander/tracking.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/umu_commander/umu_config.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/umu_commander/umu_config.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/umu_commander/util.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/umu_commander/util.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/test_db.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_db.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/test_proton.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_proton.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/test_tracking.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_tracking.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,48 +66,77 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "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.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.create.executor": "Debug",
-    "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",
-    "git-widget-placeholder": "master",
-    "last_opened_file_path": "/home/hiroshi/Code/Python/umu-commander/src/umu_commander/proton.py",
-    "run.code.analysis.last.selected.profile": "aDefault",
-    "settings.editor.selected.configurable": "com.intellij.pycharm.community.ide.impl.configuration.PythonContentEntriesConfigurable"
+  <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.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;Debug&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" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/src/umu-commander" />
       <recent name="$PROJECT_DIR$/src" />
     </key>
   </component>
-  <component name="RunManager" selected="Shell Script.Build">
+  <component name="RunManager" selected="Python.run">
+    <configuration name="create" type="PythonConfigurationType" factoryName="Python">
+      <module name="umu-commander" />
+      <option name="ENV_FILES" value="" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/umu_commander/main.py" />
+      <option name="PARAMETERS" value="create" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
     <configuration name="delete" type="PythonConfigurationType" factoryName="Python">
       <module name="umu-commander" />
       <option name="ENV_FILES" value="" />
@@ -101,9 +146,8 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="SDK_NAME" value="Python 3.12" />
       <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
+      <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/umu_commander/main.py" />
@@ -124,9 +168,8 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="SDK_NAME" value="Python 3.12" />
       <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
+      <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/umu_commander/main.py" />
@@ -147,9 +190,8 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="SDK_NAME" value="Python 3.12" />
       <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
+      <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/umu_commander/main.py" />
@@ -170,9 +212,8 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="SDK_NAME" value="Python 3.12" />
       <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
+      <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/umu_commander/main.py" />
@@ -193,9 +234,8 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="SDK_NAME" value="Python 3.12" />
       <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
+      <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/umu_commander/main.py" />
@@ -239,6 +279,36 @@
         <option name="RunConfigurationTask" enabled="true" run_configuration_name="Build" run_configuration_type="ShConfigurationType" />
       </method>
     </configuration>
+    <configuration name="Python tests for test_config.Config" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
+      <module name="umu-commander" />
+      <option name="ENV_FILES" value="" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tests" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;test_config.Config&quot;" />
+      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
+      <method v="2" />
+    </configuration>
+    <configuration name="Python tests for test_config.Config.test_missing_config" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
+      <module name="umu-commander" />
+      <option name="ENV_FILES" value="" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tests" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;test_config.Config.test_missing_config&quot;" />
+      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
+      <method v="2" />
+    </configuration>
     <configuration name="Run tests" type="tests" factoryName="Autodetect">
       <module name="umu-commander" />
       <option name="ENV_FILES" value="" />
@@ -260,10 +330,19 @@
       <item itemvalue="Python.track" />
       <item itemvalue="Python.untrack" />
       <item itemvalue="Python.delete" />
+      <item itemvalue="Python.create" />
       <item itemvalue="Python tests.Run tests" />
+      <item itemvalue="Python tests.Python tests for test_config.Config" />
+      <item itemvalue="Python tests.Python tests for test_config.Config.test_missing_config" />
       <item itemvalue="Shell Script.Upload" />
       <item itemvalue="Shell Script.Build" />
     </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Python tests.Python tests for test_config.Config" />
+        <item itemvalue="Python tests.Python tests for test_config.Config.test_missing_config" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
@@ -688,19 +767,10 @@
     <option name="LAST_COMMIT_MESSAGE" value="Preparations for building" />
   </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>131</line>
-          <option name="timeStamp" value="13" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/umu_commander/tracking.py</url>
-          <line>15</line>
-          <option name="timeStamp" value="31" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
+    <watches-manager>
+      <configuration name="PythonConfigurationType">
+        <watch expression="cls._conf" language="Python" />
+      </configuration>
+    </watches-manager>
   </component>
 </project>

{umu_commander-1.4.0 → umu_commander-1.5.1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umu-commander
-Version: 1.4.0
+Version: 1.5.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.4.0 → umu_commander-1.5.1}/pyproject.toml RENAMED Viewed

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 [project]
 name = "umu-commander"
-version = "1.4.0"
+version = "1.5.1"
 authors = [
   { name="Mpaxlamitsounas", email="worldstudy123@gmail.com" },
 ]
@@ -15,6 +15,10 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: POSIX :: Linux",
 ]
+dependendies =[
+    "tomli-w"
+]
 license = "MIT"
 license-files = ["LICEN[CS]E*"]
 keywords = ["umu"]

umu_commander-1.5.1/src/umu_commander/classes.py ADDED Viewed

@@ -0,0 +1,81 @@
+from dataclasses import dataclass
+from enum import Enum
+@dataclass
+class Element:
+    group_id: str = ""
+    value: str = ""
+    info: str = ""
+    def as_proton_ver(self) -> "ProtonVer":
+        return ProtonVer(self.group_id, self.value, self.info)
+    def as_dll_override(self) -> "DLLOverride":
+        return DLLOverride(self.info, self.value)
+@dataclass
+class ProtonVer(Element):
+    def __init__(self, dir: str = "", version_num: str = "", user_count: str = ""):
+        super().__init__(group_id=dir, value=version_num, info=user_count)
+    @property
+    def dir(self):
+        return self.group_id
+    @property
+    def version_num(self):
+        return self.value
+    @property
+    def user_count(self):
+        return self.info
+@dataclass
+class DLLOverride(Element):
+    def __init__(self, label: str = "", override_str: str = ""):
+        super().__init__(group_id="", value=override_str, info=label)
+    @property
+    def override_str(self):
+        return self.value
+    @property
+    def label(self):
+        return self.info
+@dataclass
+class Value(Element):
+    def __init__(self, value: str):
+        super().__init__(value=value)
+@dataclass
+class Group:
+    identity: str = ""
+    label: str = ""
+    elements: list[Element] = list
+@dataclass
+class ProtonDir(Group):
+    @property
+    def path(self):
+        return self.identity
+    @property
+    def versions(self) -> list[ProtonVer]:
+        return [e.as_proton_ver() for e in self.elements]
+    @versions.setter
+    def versions(self, value):
+        self.elements = value
+class ExitCode(Enum):
+    SUCCESS = 0
+    READING_ERROR = 1
+    INVALID_SELECTION = 2

umu_commander-1.5.1/src/umu_commander/configuration.py ADDED Viewed

@@ -0,0 +1,72 @@
+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.1/src/umu_commander/database.py ADDED Viewed

@@ -0,0 +1,43 @@
+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]

{umu_commander-1.4.0 → umu_commander-1.5.1}/src/umu_commander/main.py RENAMED Viewed

@@ -1,9 +1,13 @@
 #!/usr/bin/python3
+import os
 import sys
 from json import JSONDecodeError
-from umu_commander import db, tracking, umu_config
-from umu_commander.configuration import *
+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():
@@ -15,16 +19,24 @@ def print_help():
     )
-def main() -> int:
+def main() -> ExitCode:
+    try:
+        config.load()
+    except (JSONDecodeError, KeyError):
+        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"))
     try:
         db.load()
     except JSONDecodeError:
-        print(f"Tracking file at {os.path.join(DB_DIR, DB_NAME)} could not be read.")
-        return 2
+        db_path: str = os.path.join(config.DB_DIR, config.DB_NAME)
+        print(f"Tracking file at {db_path} could not be read.")
+        os.rename(db_path, os.path.join(config.DB_DIR, config.DB_NAME + ".old"))
     if len(sys.argv) == 1:
         print_help()
-        return 0
+        return ExitCode.SUCCESS
     verb: str = sys.argv[1]
     match verb:
@@ -43,13 +55,13 @@ def main() -> int:
         case _:
             print("Invalid verb.")
             print_help()
-            return 3
+            return ExitCode.INVALID_SELECTION
     tracking.untrack_unlinked()
     db.dump()
-    return 0
+    return ExitCode.SUCCESS
 if __name__ == "__main__":
-    exit(main())
+    exit(main().value)

umu-commander 1.4.0__tar.gz → 1.5.1__tar.gz

Potentially problematic release.

umu-commander 1.4.0tar.gz → 1.5.1tar.gz