added argument for the cli, gui and cli source are now inside the interface directory

main.pyw

@@ -12,20 +12,25 @@ translater = load_language(options.language.get())
 
 
 def main_gui():
-    from source.gui import install
+    from source.interface.gui import install
     self.window = install.Window(options)
     self.window.run()
 
 
-def main_cli():
-    from source.cli import install
-    install.cli(options)
+def main_cli(argparser: argparse.ArgumentParser):
+    from source.interface.cli import install
+    install.cli(options, argparser)
 
 
-parser = argparse.ArgumentParser()
-parser.add_argument("-i", "--interface", choices=["gui", "cli"], default="gui")
-args = parser.parse_args()
+argparser = argparse.ArgumentParser()
+argparser.add_argument(
+    "-i", "--interface",
+    choices=["gui", "cli"],
+    default="gui",
+    help="should the installer be started with a graphical interface or with the command line interface"
+)
+args, _ = argparser.parse_known_args()
 
 match args.interface:
     case "gui": main_gui()
-    case "cli": main_cli()
+    case "cli": main_cli(argparser)

source/interface/cli/install.py

@@ -1,3 +1,4 @@
+import argparse
 from pathlib import Path
 
 from source.mkw.Game import Game
@@ -6,26 +7,36 @@ from source.translation import translate as _
 from source.mkw.collection.Extension import Extension
 
 
-def cli(options):
-    print(_("TITLE_INSTALL"))
+def cli(options, argparser: argparse.ArgumentParser):
+    argparser.add_argument("-m", "--mod", help="name of the mod to install")
+    argparser.add_argument("-s", "--source", help="path to the original game")
+    argparser.add_argument("-d", "--dest", help="destination directory of the patched game")
+    argparser.add_argument("-ot", "--output_type", help="format of the patched game")
+    args = argparser.parse_args()
 
     packs = []
     for pack in Path("./Pack/").iterdir():
         packs.append(pack)
 
-    mod_name = input(_("TEXT_INPUT_MOD_NAME") % [pack.name for pack in packs])
+    mod_name = args.mod
+    choices = [pack.name for pack in packs]
+    while mod_name is None or mod_name not in choices: mod_name = input(_("TEXT_INPUT_MOD_NAME") % choices)
     mod_config = ModConfig.from_file(Path(f"./Pack/{mod_name}/mod_config.json"))
 
-    source_path = input(_("TEXT_INPUT_SOURCE_PATH"))
+    source_path = args.source
+    if source_path is None: source_path = input(_("TEXT_INPUT_SOURCE_PATH"))
     game = Game(source_path)
 
-    destination_directory = input(_("TEXT_INPUT_DESTINATION_DIRECTORY"))
+    destination_directory = args.dest
+    if destination_directory is None: destination_directory = input(_("TEXT_INPUT_DESTINATION_DIRECTORY"))
     destination_path = Path(destination_directory)
 
-    output_name = input(_("TEXT_INPUT_OUPUT_TYPE") % [extension.name for extension in Extension])
+    output_name = args.output_type
+    choices = [extension.name for extension in Extension]
+    if output_name is None or mod_name not in choices: output_name = input(_("TEXT_INPUT_OUPUT_TYPE") % choices)
     output_type = Extension[output_name]
 
-    progressbar_max: int = 30
+    progressbar_max: int = 40
 
     title: str = ""
     description: str = ""

source/interface/gui/install.py

@@ -9,7 +9,8 @@ from tkinter import messagebox
 import webbrowser
 from typing import Generator
 
-from source.gui import better_gui_error, mystuff, mod_settings
+from source.interface.gui import better_gui_error
+from source.interface.gui import mod_settings, mystuff
 from source.mkw.Game import Game
 from source.mkw.ModConfig import ModConfig
 from source.option import Options
@@ -373,7 +374,7 @@ class ButtonInstall(ttk.Button):
             if available_space_local < minimum_space_available:
                 if not messagebox.askokcancel(
                     _("WARNING"),
-                    _("WARNING_LOW_SPACE_CONTINUE") % (Path(".").resolve().drive, available_space_local/Go)
+                    _("WARNING_LOW_SPACE_CONTINUE") % (Path(".").resolve().drive, available_space_local / Go)
                 ):
                     return
 

source/interface/gui/preview/__init__.py

@@ -36,4 +36,4 @@ class AbstractPreviewWindow(tkinter.Toplevel, ABC):
         raise InvalidPreviewWindowName(name)
 
 
-from source.gui.preview import track_formatting, track_selecting, track_sorting
+from source.interface.gui.preview import track_formatting, track_selecting, track_sorting

source/interface/gui/preview/track_formatting.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 import re
 
 from source.mkw.collection import MKWColor
-from source.gui.preview import AbstractPreviewWindow
+from source.interface.gui.preview import AbstractPreviewWindow
 
 if TYPE_CHECKING:
     from source.mkw.ModConfig import ModConfig

source/interface/gui/preview/track_selecting.py

@@ -3,8 +3,8 @@ from tkinter import ttk
 from typing import TYPE_CHECKING
 
 from source.mkw.collection import MKWColor
-from source.gui.preview import AbstractPreviewWindow
-from source.gui import better_gui_error
+from source.interface.gui.preview import AbstractPreviewWindow
+from source.interface.gui import better_gui_error
 
 if TYPE_CHECKING:
     from source.mkw.ModConfig import ModConfig

source/interface/gui/preview/track_sorting.py

@@ -3,8 +3,8 @@ from tkinter import ttk
 from typing import TYPE_CHECKING
 
 from source.mkw.collection import MKWColor
-from source.gui.preview import AbstractPreviewWindow
-from source.gui import better_gui_error
+from source.interface.gui.preview import AbstractPreviewWindow
+from source.interface.gui import better_gui_error
 
 if TYPE_CHECKING:
     from source.mkw.ModConfig import ModConfig

source/mkw/ModSettings/SettingsType/String.py

@@ -1,5 +1,5 @@
 from source.mkw.ModSettings.AbstractModSettings import AbstractModSettings
-from source.gui.preview import AbstractPreviewWindow
+from source.interface.gui.preview import AbstractPreviewWindow
 
 
 class String(AbstractModSettings):