umu-commander 1.5.7__py3-none-any.whl → 1.6.1__py3-none-any.whl

umu_commander/__init__.py

@@ -1 +1 @@
-VERSION = "v1.5.7"
+VERSION = "v1.6.1"

umu_commander/__main__.py

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

umu_commander/umu_config.py

@@ -7,12 +7,9 @@ import tomli_w
 
 import umu_commander.configuration as config
 from umu_commander import tracking
-from umu_commander.classes import DLLOverride, ProtonVer
+from umu_commander.classes import DLLOverride, ProtonVer, Value
 from umu_commander.proton import collect_proton_versions, refresh_proton_versions
-from umu_commander.util import (
-    get_selection,
-    strings_to_values,
-)
+from umu_commander.util import get_selection, string_to_value, strings_to_values
 
 
 def create():
@@ -21,12 +18,12 @@ def create():
     params: dict[str, Any] = {"umu": {}, "env": {}}
 
     # Prefix selection
+    prefix_default: Value = string_to_value("Current directory")
     selection: str = get_selection(
         "Select wine prefix:",
-        strings_to_values(
-            [*os.listdir(config.DEFAULT_PREFIX_DIR), "Current directory"]
-        ),
+        [*strings_to_values(os.listdir(config.DEFAULT_PREFIX_DIR)), prefix_default],
         None,
+        default_element=prefix_default,
     ).value
 
     if selection == "Current directory":
@@ -38,13 +35,10 @@ def create():
     selected_umu_latest: bool = False
     proton_ver: ProtonVer = get_selection(
         "Select Proton version:",
-        strings_to_values(["Always latest UMU Proton"]),
+        None,
         collect_proton_versions(sort=True),
     ).as_proton_ver()
-    if proton_ver.version_num == "Always latest UMU Proton":
-        selected_umu_latest = True
-    else:
-        params["umu"]["proton"] = os.path.join(proton_ver.dir, proton_ver.version_num)
+    params["umu"]["proton"] = os.path.join(proton_ver.dir, proton_ver.version_num)
 
     # Select DLL overrides
     possible_overrides: list[DLLOverride] = [
@@ -60,20 +54,24 @@ def create():
                 idx = "Y"
             print(f"{idx}) {override.label}")
 
-        try:
-            index: int = int(input("? "))
-            print("")
-        except ValueError:
+        index: str = input("? ")
+        if index == "":
+            break
+
+        if index.isdecimal():
+            index: int = int(index)
+        else:
             continue
 
+        # reset
         if index == 0:
             selected = set()
             continue
 
+        # done
         if index == 1:
             break
 
-        index: int = int(index)
         if index - 1 < len(possible_overrides):
             selected.add(index)
 
@@ -86,10 +84,12 @@ def create():
             ].override_str
 
     # Set language locale
+    lang_default: Value = string_to_value("Default")
     match get_selection(
         "Select locale:",
-        strings_to_values(["Default", "Japanese"]),
+        strings_to_values([lang_default, "Japanese"]),
         None,
+        default_element=lang_default,
     ).value:
         case "Default":
             pass
@@ -119,8 +119,7 @@ def create():
 
         print(f"Configuration file {config.UMU_CONFIG_NAME} created at {os.getcwd()}.")
         print(f"Use by running umu-commander run.")
-        if not selected_umu_latest:
-            tracking.track(proton_ver, False)
+        tracking.track(proton_ver, False)
     except:
         print("Could not create configuration file.")
 

umu_commander/util.py

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

{umu_commander-1.5.7.dist-info → umu_commander-1.6.1.dist-info}/METADATA

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

umu_commander-1.6.1.dist-info/RECORD

@@ -0,0 +1,14 @@
+umu_commander/__init__.py,sha256=O3Os9OZXP0MuNOiOG5Nn-gntDX-c5PfKt1v8m6ScYjY,19
+umu_commander/__main__.py,sha256=b5T4HnlLYreaLL9rbr0p7xT4roIoMJ8qJO3o_tcpK_M,2352
+umu_commander/classes.py,sha256=3vEC7Iq3buEUaIIJKO1ze57hs9yQ_-9pnkazHkSfcLk,1655
+umu_commander/configuration.py,sha256=bF_1n_8PQ04GmJZpC1scQ5OBZbsVXPstJ9RGfKE-D5k,2277
+umu_commander/database.py,sha256=mkBX0e6YEv2dWU2hCMaZwhSD02f_XefW0qbErcVHHYo,1183
+umu_commander/proton.py,sha256=K3KhaXxZawOZN84XKhXKP-HkIrW-sLSbMwoKBL2SrAU,2552
+umu_commander/tracking.py,sha256=WfWeQWnNNK_q-1rFt0HPFNDD8z7VcTCYKI5A_W8xNIg,3113
+umu_commander/umu_config.py,sha256=Jmsc_xW1u7JaxbmwBc070IV3YLsggz-qEUeU0yn92KE,4232
+umu_commander/util.py,sha256=8zn0c3gyAuZ8uuiDga4amsOYGFRy2FwzADsyJ1au0LY,3671
+umu_commander-1.6.1.dist-info/METADATA,sha256=0CcDHBDRyTS6oXlnny-PkFX0if2yTZSYiFLYhmnuTsA,5391
+umu_commander-1.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+umu_commander-1.6.1.dist-info/entry_points.txt,sha256=ljyUmDmgCCMm7mQgB1syoWbf_5AiemyrS6YN7eTn9CI,62
+umu_commander-1.6.1.dist-info/licenses/LICENSE.txt,sha256=yipFXBRmVZ2Q44x1q18HccPUAECBQLXAOAr21aS57uY,1071
+umu_commander-1.6.1.dist-info/RECORD,,

umu_commander-1.5.7.dist-info/RECORD

@@ -1,14 +0,0 @@
-umu_commander/__init__.py,sha256=lcnQtXuTVWKAbnJJVjHY-7vVuwMzH4utpGhuBnhGa-M,19
-umu_commander/__main__.py,sha256=Zo5NbQ8lYsmNo7oN3ekeJ5VPyiETcbasEYkfBMkFZ-A,1994
-umu_commander/classes.py,sha256=3vEC7Iq3buEUaIIJKO1ze57hs9yQ_-9pnkazHkSfcLk,1655
-umu_commander/configuration.py,sha256=bF_1n_8PQ04GmJZpC1scQ5OBZbsVXPstJ9RGfKE-D5k,2277
-umu_commander/database.py,sha256=mkBX0e6YEv2dWU2hCMaZwhSD02f_XefW0qbErcVHHYo,1183
-umu_commander/proton.py,sha256=K3KhaXxZawOZN84XKhXKP-HkIrW-sLSbMwoKBL2SrAU,2552
-umu_commander/tracking.py,sha256=WfWeQWnNNK_q-1rFt0HPFNDD8z7VcTCYKI5A_W8xNIg,3113
-umu_commander/umu_config.py,sha256=gJsK4g33vtBpfvfSJcQBCoM3zzuWQ9kGX5IUSOFw6ow,4191
-umu_commander/util.py,sha256=hTNGK6HN5nHGH5HEA8mUxOM5f2S_IpawHmbhpw2H4ig,3013
-umu_commander-1.5.7.dist-info/METADATA,sha256=toDp_fgD8IoCkqeLbhzDHGsaGKxhBSrlovb7YK5ENko,5391
-umu_commander-1.5.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-umu_commander-1.5.7.dist-info/entry_points.txt,sha256=ljyUmDmgCCMm7mQgB1syoWbf_5AiemyrS6YN7eTn9CI,62
-umu_commander-1.5.7.dist-info/licenses/LICENSE.txt,sha256=yipFXBRmVZ2Q44x1q18HccPUAECBQLXAOAr21aS57uY,1071
-umu_commander-1.5.7.dist-info/RECORD,,