Test push

Author: Mythical-Github

src/ue4ss_installer_gui/__main__.py

@@ -1,3 +1,25 @@
 from ue4ss_installer_gui import main
 
+# import dearpygui.dearpygui as dpg
+
+# dpg.create_context()
+
+# with dpg.window(label="Delete Files", modal=True, show=False, tag="modal_id", no_title_bar=True):
+#     dpg.add_text("All those beautiful files will be deleted.\nThis operation cannot be undone!")
+#     dpg.add_separator()
+#     dpg.add_checkbox(label="Don't ask me next time")
+#     with dpg.group(horizontal=True):
+#         dpg.add_button(label="OK", width=75, callback=lambda: dpg.configure_item("modal_id", show=False))
+#         dpg.add_button(label="Cancel", width=75, callback=lambda: dpg.configure_item("modal_id", show=False))
+
+# with dpg.window(label="Tutorial"):
+#     dpg.add_button(label="Open Dialog", callback=lambda: dpg.configure_item("modal_id", show=True))
+
+# dpg.create_viewport(title='Custom Title', width=800, height=600)
+# dpg.setup_dearpygui()
+# dpg.show_viewport()
+# dpg.start_dearpygui()
+# dpg.destroy_context()
+
+
 main.main()

src/ue4ss_installer_gui/add_game_screen.py

@@ -16,3 +16,5 @@
 FOOTER_HEIGHT = 28
 DIVIDER_HEIGHT = 15
 MARGIN = 40
+
+UE4SS_REPO_URL = "https://github.com/UE4SS-RE/RE-UE4SS"

src/ue4ss_installer_gui/constants.py

@@ -12,8 +12,8 @@ class GamePlatforms(Enum):
 
 @dataclass
 class GameInfo:
-    game_title: str
     install_dir: Path
+    game_title: str
     ue4ss_version: str
     installed_files: List[Path] = field(default_factory=list)
     platform: GamePlatforms = GamePlatforms.OTHER

src/ue4ss_installer_gui/data_structures.py

@@ -1,8 +1,13 @@
 import os
 
+from ue4ss_installer_gui.screens import main as main_screen
+
 import dearpygui.dearpygui as dpg
 
-from ue4ss_installer_gui import file_io, main_screen, constants, settings
+from ue4ss_installer_gui import file_io, constants, settings
+
+# when loading autopopulation, if a game dir exists, but game is uninstalled, do now show it unless, there is an ue4ss installation
+# when this happens maybe show a warning or exclamation point mark or something
 
 
 def main():
@@ -31,7 +36,7 @@ def main():
     main_screen.push_main_screen()
     dpg.set_viewport_pos([constants.x, constants.y])
     dpg.setup_dearpygui()
-    dpg.set_primary_window("MainWindow", True)
+    dpg.set_primary_window("main_window", True)
     dpg.show_viewport()
     dpg.start_dearpygui()
     dpg.destroy_context()

src/ue4ss_installer_gui/main.py

@@ -0,0 +1,166 @@
+import os
+import pathlib
+
+from ue4ss_installer_gui.screens import main
+
+import dearpygui.dearpygui as dpg
+
+from ue4ss_installer_gui import data_structures, settings, constants, ue4ss, file_io
+
+
+# make sure it allows multiple game installs of the same game, show some _1 _2 or something
+# have it check the game dir not the game title for if it already exists later
+# if it's not an unreal game make it show a different popup, right now it says it's already in the list
+
+
+def game_dir_actually_has_unreal_game_check(game_dir_path: pathlib.Path):
+    acceptable_dirs = [
+        f"{file_io.SCRIPT_DIR}/Engine/Binaries",
+        f"{file_io.SCRIPT_DIR}/Engine/Shared",
+        f"{file_io.SCRIPT_DIR}/Engine/Shared",
+    ]
+    acceptable_files = [f"{file_io.SCRIPT_DIR}/Manifest_NonUFSFiles_Win64.txt"]
+    for acceptable_dir in acceptable_dirs:
+        if os.path.isdir(os.path.normpath(acceptable_dir)):
+            return True
+    for acceptable_file in acceptable_files:
+        if os.path.isfile(os.path.normpath(acceptable_file)):
+            return True
+    init_not_an_unreal_game_popup(game_dir_path)
+    from time import sleep
+
+    sleep(0.1)
+    dpg.configure_item("not_an_unreal_game_pop_up", show=True)
+    return False
+
+
+def call_dismiss_pop_up_game_already_in_list():
+    dpg.delete_item("game_already_exists_popup")
+
+
+def call_dismiss_pop_up_not_unreal_game():
+    dpg.delete_item("not_an_unreal_game_pop_up")
+
+
+def init_not_an_unreal_game_popup(game_directory: pathlib.Path):
+    if dpg.does_item_exist("not_an_unreal_game_pop_up"):
+        dpg.delete_item("not_an_unreal_game_pop_up")
+    dpg.add_window(
+        modal=True,
+        tag="not_an_unreal_game_pop_up",
+        no_title_bar=True,
+        min_size=[100, 140],
+    )
+    message = " The following game directory does not contain an unreal game:"
+    message_two = os.path.normpath(str(game_directory))
+    dpg.add_text(message, parent="not_an_unreal_game_pop_up", wrap=384)
+    dpg.add_text(message_two, parent="not_an_unreal_game_pop_up", wrap=384)
+    dpg.add_separator(parent="not_an_unreal_game_pop_up")
+    dpg.add_button(
+        label="Close",
+        parent="not_an_unreal_game_pop_up",
+        width=-1,
+        height=-1,
+        callback=call_dismiss_pop_up_not_unreal_game,
+    )
+
+
+def init_game_already_in_list_pop_up(game_directory: pathlib.Path):
+    dpg.add_window(
+        modal=True,  # this is randomly breaking it right now
+        tag="game_already_exists_popup",
+        no_title_bar=True,
+        width=constants.window_width - 200,
+        height=constants.window_height - 700,
+        pos=(100, constants.y + 100),
+    )
+    message = " The following game already exists in the games list:"
+    message_two = os.path.normpath(str(game_directory))
+    dpg.add_text(message, parent="game_already_exists_popup", wrap=384)
+    dpg.add_text(message_two, parent="game_already_exists_popup", wrap=384)
+    dpg.add_separator(parent="game_already_exists_popup")
+    dpg.add_button(
+        label="Close",
+        parent="game_already_exists_popup",
+        width=-1,
+        height=-1,
+        callback=call_dismiss_pop_up_game_already_in_list,
+    )
+
+
+def game_already_in_list_check(game_directory: pathlib.Path) -> bool:
+    # this checks currently only the games in settings, it needs to also check the autopopulated list
+    game_entries = settings.get_settings().get("games", {})
+    is_game_already_in_list = False
+    for game_entry in game_entries:
+        if os.path.normpath(game_entry["install_dir"]) == os.path.normpath(
+            str(game_directory)
+        ):
+            is_game_already_in_list = True
+            break
+    if is_game_already_in_list:
+        init_game_already_in_list_pop_up(game_directory)
+        from time import sleep
+
+        sleep(0.1)
+        dpg.configure_item("game_already_exists_popup", show=True)
+        return True
+    return False
+
+
+def add_manual_game_to_settings_file(game_dir_path: pathlib.Path) -> bool:
+    was_valid = True
+    if game_already_in_list_check(game_dir_path) == True:
+        was_valid = False
+    if game_dir_actually_has_unreal_game_check(game_dir_path) == False:
+        was_valid = False
+    if was_valid == False:
+        return was_valid
+    loaded_settings = settings.get_settings()
+    game_entry = data_structures.GameInfo(
+        install_dir=game_dir_path,
+        game_title=os.path.basename(str(game_dir_path)),
+        ue4ss_version=ue4ss.get_default_ue4ss_version_tag(),
+        installed_files=[],
+        platform=data_structures.GamePlatforms.OTHER,
+    )
+
+    new_installed_files = []
+    for file in game_entry.installed_files:
+        new_installed_files.append(file)
+
+    game_entry_dict = {
+        "game_title": game_entry.game_title,
+        "install_dir": str(game_entry.install_dir),
+        "ue4ss_version": game_entry.ue4ss_version,
+        "installed_files": new_installed_files,
+        "platform": game_entry.platform.name,
+    }
+
+    games_list = loaded_settings.get("games", [])
+    games_list.append(game_entry_dict)
+    loaded_settings["games"] = games_list
+
+    settings.save_settings(loaded_settings)
+    return was_valid
+
+
+def callback_directory_selected(sender, app_data):
+    if add_manual_game_to_settings_file(pathlib.Path(app_data["file_path_name"])):
+        dpg.delete_item("directory_picker")
+        main.add_new_game_to_games_list(os.path.basename(app_data["file_path_name"]))
+
+
+def choose_directory():
+    if dpg.does_item_exist("directory_picker"):
+        dpg.delete_item("directory_picker")
+
+    dpg.add_file_dialog(
+        directory_selector=True,
+        show=True,
+        callback=callback_directory_selected,
+        tag="directory_picker",
+        width=constants.window_width - 80,
+        height=constants.window_height - 80,
+        modal=True,
+    )

src/ue4ss_installer_gui/screens/__init__.py

@@ -11,11 +11,14 @@
 #     keep mods and settings checkbox, ticked on by default
 #     horizontal
 #         switches between
-#             reinstall/uninstall/install/verify/progress bar for downloading
+#             reinstall/uninstall/
+#             install/a list of horizontals
+#                         for each horizontal
+#                             check box
+#                             text label of the release file name/extensionn
+#             progress bar for downloading
 
-# filter releases download files by
-#     "zMapGenBP.zip"
-#     "zCustomGameConfigs.zip"
+# filter default things to install ticked releases download files by
 #     "Dev" and "UE4SS"
 #     not "Dev" and "UE4SS"
 #     if not "Dev" in any "XInput"

src/ue4ss_installer_gui/screens/add_game.py

@@ -1,9 +1,22 @@
 import os
 import webbrowser
+import pathlib
 
 import dearpygui.dearpygui as dpg
 
-from ue4ss_installer_gui import add_game_screen, steam, epic, unreal_engine, constants
+from ue4ss_installer_gui.screens import add_game
+
+from ue4ss_installer_gui import (
+    steam,
+    epic,
+    unreal_engine,
+    constants,
+    settings,
+    unreal,
+    ue4ss,
+)
+
+# have to handle when people uninstall games, and leave eu4ss, and when people fully nuke
 
 
 scroll_area_height = (
@@ -40,6 +53,17 @@ def init_main_screen_sub_header():
         dpg.add_text(subheader_text, wrap=constants.window_width - 40)
 
 
+def get_game_dirs_in_settings() -> list[pathlib.Path]:
+    settings_game_dirs = []
+    loaded_settings = settings.get_settings()
+    games_list = loaded_settings.get("games", {})
+    for entry in games_list:
+        settings_game_dirs.append(entry.get("install_dir"))
+    for settings_game_dir in settings_game_dirs:
+        print(settings_game_dir)
+    return settings_game_dirs
+
+
 def init_main_screen_game_list_scroll_box():
     with dpg.child_window(
         width=-1, height=scroll_area_height, tag="GameListScroll", autosize_x=True
@@ -56,9 +80,17 @@ def init_main_screen_game_list_scroll_box():
                 str(base_dir)
             )
         ]
-
+        str_game_settings_list = []
+        for game_dir in get_game_dirs_in_settings():
+            print(f"game_dir: {game_dir}")
+            str_game_settings_list.append(game_dir)
+        all_game_dirs.extend(str_game_settings_list)
         for game_dir in all_game_dirs:
-            add_new_game_to_games_list(os.path.basename(game_dir))
+            if (
+                unreal.does_directory_contain_unreal_game(pathlib.Path(game_dir))
+                or ue4ss.is_ue4ss_installed()
+            ):
+                add_new_game_to_games_list(os.path.basename(game_dir))
 
 
 def init_main_screen_footer_section():
@@ -91,13 +123,13 @@ def init_main_screen_footer_section():
             dpg.add_spacer(width=constants.window_width - (4 * 50 + 20 + 160) - 24)
 
             dpg.add_button(label="Add Game Manually", width=160, height=30, tag="ag")
-            dpg.set_item_callback("ag", callback=add_game_screen.choose_directory)
+            dpg.set_item_callback("ag", callback=add_game.choose_directory)
 
 
 def push_main_screen():
     with dpg.window(
         label="UE4SS Installer",
-        tag="MainWindow",
+        tag="main_window",
         no_title_bar=True,
         width=constants.window_width,
         height=constants.window_height,

…s_installer_gui/configure_game_screen.py …_installer_gui/screens/configure_game.pysrc/ue4ss_installer_gui/configure_game_screen.py renamed to src/ue4ss_installer_gui/screens/configure_game.py src/ue4ss_installer_gui/configure_game_screen.py renamed to src/ue4ss_installer_gui/screens/configure_game.py

@@ -21,7 +21,7 @@ def init_settings():
     logger.log_message(f"Settings initialized from {SETTINGS_FILE}")
 
 
-def load_settings() -> tomlkit.TOMLDocument:
+def get_settings() -> tomlkit.TOMLDocument:
     if not os.path.isfile(SETTINGS_FILE):
         logger.log_message(f"Settings file {SETTINGS_FILE} does not exist!")
         raise FileNotFoundError("Missing settings file.")