Merge pull request #28 from seuyh/v2

V2

Author: seuyh

.banner/readme_banner.png

@@ -1,14 +1,16 @@
-/design/languages/installer_ru.ui
-/design/languages/installer_en.ui
-/design/resources.qrc
 /venv/
 /output/
 /.idea/
-/unused_resources/
-/data.json
 /.banner/
 /.github/
-/gui/__pycache__
-/libs/__pycache__
-/design/languages/__pycache__
 /presset.json
+README.md
+presset.json
+unlocker.log
+/UI/icons/1x/
+/UI/icons/social/
+/UI/icons/stellaris.ico
+/UI/recources.qrc
+/UI/ui_dialog.ui
+/UI/ui_main.ui
+/UI/ui_error.ui

.gitignore

@@ -0,0 +1,25 @@
+import requests
+from PyQt5.QtCore import QThread, pyqtSignal
+
+class ConnectionCheckThread(QThread):
+    github_status_checked = pyqtSignal(bool)
+    server_status_checked = pyqtSignal(bool)
+
+    def run(self):
+        try:
+            response = requests.get('https://github.com', timeout=10)
+            if response.status_code == 200:
+                self.github_status_checked.emit(True)
+            else:
+                raise Exception("GitHub no response")
+        except:
+            self.github_status_checked.emit(False)
+
+        try:
+            response = requests.get('https://seuyh.ru', timeout=10)
+            if response.status_code == 200:
+                self.server_status_checked.emit(True)
+            else:
+                raise Exception("Server no response")
+        except:
+            self.server_status_checked.emit(False)

Libs/ConnectionCheck.py

@@ -0,0 +1,97 @@
+from idlelib.iomenu import errors
+
+from requests import get
+from time import sleep
+from PyQt5 import QtCore
+import os
+
+
+class CreamAPI(QtCore.QThread):
+    progress_signal = QtCore.pyqtSignal(int)
+
+    def __init__(self):
+        super().__init__()
+        # self.dlc_callback = dlc_callback
+        # self.progress_callback = progress_callback
+        self.parent_directory = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+    def get_dlc_name(self, dlc_id, errors=0):
+        print('CreamApi creating...')
+        url = f"https://api.steamcmd.net/v1/info/{dlc_id}"
+        headers = {
+            "User-Agent": "Mozilla/5.0",
+            "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8",
+            "Accept-Encoding": "gzip, deflate, br",
+            "Accept-Language": "en-US,en;q=0.9",
+            "Cache-Control": "max-age=0",
+            "Connection": "keep-alive",
+            "Host": "api.steamcmd.net",
+            "Upgrade-Insecure-Requests": "1"
+        }
+        try:
+            response = get(url, headers=headers, timeout=3)
+            print(response)
+            if response.status_code == 200:
+                data = response.json()
+                dlc_name = data['data'][str(dlc_id)]['common']['name']
+                print(dlc_name)
+                return dlc_name
+            else:
+                return None
+        except Exception:
+            if errors >= 3:
+                return False
+            errors += 1
+            print('Cant connect steamcmd. Rertying...')
+            return self.get_dlc_name(dlc_id)
+
+    def get_dlc_list(self, app_id, errors=0):
+        url = f"https://api.steamcmd.net/v1/info/{app_id}"
+        headers = {
+            "User-Agent": "Mozilla/5.0",
+            "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8",
+            "Accept-Encoding": "gzip, deflate, br",
+            "Accept-Language": "en-US,en;q=0.9",
+            "Cache-Control": "max-age=0",
+            "Connection": "keep-alive",
+            "Host": "api.steamcmd.net",
+            "Upgrade-Insecure-Requests": "1"
+        }
+        try:
+            response = get(url, headers=headers, timeout=3)
+            data = response.json()
+            dlc_list_json = data['data'][str(app_id)]['extended']['listofdlc']
+            dlc_list = dlc_list_json.split(',')
+            return dlc_list
+        except Exception:
+            if errors >= 3:
+                return False
+            errors += 1
+            print('Cant connect steamcmd. Rertying...')
+            return self.get_dlc_list(app_id, errors)
+
+    def run(self):
+        print('Cream api creating...')
+        dlc_list = self.get_dlc_list(281990)
+        print(dlc_list)
+        if dlc_list:
+            self.check_and_update_dlc_list(dlc_list,
+                                           os.path.join(self.parent_directory, 'creamapi_steam_files', 'cream_api.ini'))
+            self.check_and_update_dlc_list(dlc_list,
+                                           os.path.join(self.parent_directory, 'creamapi_launcher_files', 'cream_api.ini'))
+            # self.launcher_creamapi(dlcs)
+            self.progress_signal.emit(100)
+        else:
+            print('SteamCmd unavailable. Skipped')
+            self.progress_signal.emit(100)
+            return
+
+
+    def check_and_update_dlc_list(self, dlc_list, path):
+        with open(path, 'r+') as file:
+            content = file.read()
+            for dlc_id in dlc_list:
+                if str(dlc_id) not in content:
+                    dlc_name = self.get_dlc_name(dlc_id)
+                    file.write(f"\n{dlc_id} = {dlc_name}")
+                    print('CreamApi writed')

Libs/CreamApiMaker.py

@@ -7,7 +7,7 @@
 class DownloaderThread(QtCore.QThread):
     progress_signal = QtCore.pyqtSignal(int, bool)
     progress_signal_2 = QtCore.pyqtSignal(int)
-    text_signal = QtCore.pyqtSignal(str)
+    # text_signal = QtCore.pyqtSignal(str)
     error_signal = QtCore.pyqtSignal(Exception)
     speed_signal = QtCore.pyqtSignal(float)
     finished = QtCore.pyqtSignal()
@@ -25,7 +25,7 @@ def run(self):
         request = urllib.request.Request(self.file_url, headers={"User-Agent": "Mozilla/5.0"})
         request.add_header('Range', f'bytes={self.downloaded_bytes}-')
         try:
-            with urllib.request.urlopen(request, timeout=10) as response:
+            with urllib.request.urlopen(request, timeout=25) as response:
                 total_size = int(response.headers.get('content-length', 0)) + self.downloaded_bytes
                 start_time = time()
 
@@ -56,8 +56,8 @@ def run(self):
         finally:
             progress_percentage = int((self.dlc_downloaded / self.dlc_count) * 100)
             self.progress_signal.emit(progress_percentage, True)
-            self.text_signal.emit(path.basename(self.save_path))
+            # self.text_signal.emit(path.basename(self.save_path))
             self.finished.emit()
 
     def cancel(self):
-        self.cancelled = True
+        self.cancelled = True

gui/DownloadThread.py Libs/DownloadThread.pygui/DownloadThread.py renamed to Libs/DownloadThread.py

@@ -49,4 +49,4 @@ def reg_search(vaule_data, vaule_name):
         winreg.CloseKey(key)
         return launcher_path
     except:
-        return 0
+        return 0

libs/game_path.py Libs/GamePath.pylibs/game_path.py renamed to Libs/GamePath.py

@@ -4,10 +4,11 @@
 from PyQt5 import QtCore
 from time import sleep
 from glob import glob
+from re import search
 
 
 class ReinstallThread(QtCore.QThread):
-    progress_signal = QtCore.pyqtSignal(int)
+    # progress_signal = QtCore.pyqtSignal(int)
     error_signal = QtCore.pyqtSignal(Exception)
     continue_reinstall = QtCore.pyqtSignal(str)
 
@@ -23,22 +24,46 @@ def __init__(self, msi_path, paradox_folder1, paradox_folder2, paradox_folder3,
         self.downloaded_launcher_dir = downloaded_launcher_dir
 
     def run(self):
+
+        latest_file = None
+        latest_version = (0, 0)
+        def extract_version(filename):
+            match = search(r'launcher-installer-windows_(\d+\.\d+)', filename)
+            if match:
+                return tuple(map(int, match.group(1).split('.')))
+            return None
         msi_files = glob(os.path.join(self.msi_path, "launcher-installer-windows_*.msi"))
+        if self.launcher_downloaded:
+            print('Alt unlock. Deleting all other launches')
+            try:
+                for file_path in msi_files:
+                    try:
+                        os.remove(file_path)
+                        print(f"Delete {file_path}")
+                    except Exception as e:
+                        print(f"Unable to delete {file_path}: {e}")
+            except:
+                pass
+            try:
+                move(self.downloaded_launcher_dir, self.msi_path)
+                print(f"Launcher moved: {self.msi_path}")
+            except Exception as e:
+                print(f"Unable to move launcher: {e}")
+                self.error_signal.emit(e)
+            msi_files = glob(os.path.join(self.msi_path, "launcher-installer-windows_*.msi"))
+
         if msi_files:
             msi_path = msi_files[0]
+
         else:
             msi_path = os.path.join(self.msi_path, "launcher-installer-windows.msi")
             if os.path.exists(msi_path):
                 pass
             else:
                 self.error_signal.emit('launcher_installer not found!')
-        print(f'Требуется ли подмена лаунчера: {self.launcher_downloaded}')
-        if self.launcher_downloaded:
-            os.remove(msi_path)
-            move(self.downloaded_launcher_dir, msi_path)
-        print(f'Путь к игре: {self.msi_path}')
-        print(f'Путь к лаунчеру: {msi_path}\nСуществует ли путь: {os.path.exists(msi_path)}')
-        print(f'Выполнение удаления')
+        print(f'Game path: {self.msi_path}')
+        print(f'Launcher Path: {msi_path}\nPath exists: {os.path.exists(msi_path)}')
+        print(f'Deleting launcher...')
         try:
             self.paradox_remove(self.paradox_folder1, self.paradox_folder2, self.paradox_folder3, self.paradox_folder4)
 
@@ -49,17 +74,16 @@ def run(self):
             #     print("Произошла ошибка при удалении:", error.decode())
 
             uninstall.wait()
-            self.progress_signal.emit(33)
+            # self.progress_signal.emit(33)
             sleep(1)
-            print(f'Выполнение установки')
+            print(f'Installing launcher...')
             install = Popen(
                 ['cmd.exe', '/c', 'msiexec', '/package', msi_path,
                  '/quiet', 'CREATE_DESKTOP_SHORTCUT=0'], shell=True)
             # output, error = install.communicate()
             # if uninstall.returncode != 0:
             #     print("Произошла ошибка при установке:", error.decode())
             install.wait()
-            self.progress_signal.emit(66)
             self.continue_reinstall.emit(self.paradox_folder1)
         except Exception as e:
             self.error_signal.emit(e)
@@ -73,15 +97,20 @@ def paradox_remove(paradox_folder1, paradox_folder2, paradox_folder3, paradox_fo
         # paradox_folder4 = os.path.join(user_home, "AppData", "Roaming", "paradox-launcher-v2")
         try:
             if os.path.exists(paradox_folder1):
+                print(f'Removing {paradox_folder1}')
                 rmtree(paradox_folder1)
 
             if os.path.exists(paradox_folder2):
+                print(f'Removing {paradox_folder2}')
                 rmtree(paradox_folder2)
 
             if os.path.exists(paradox_folder3):
+                print(f'Removing {paradox_folder3}')
                 rmtree(paradox_folder3)
 
             if os.path.exists(paradox_folder4):
+                print(f'Removing {paradox_folder4}')
                 rmtree(paradox_folder4)
-        except Exception:
-            pass
+        except Exception as e:
+            print(f'Cant delete {e}')
+            pass

libs/launcher_reinstall.py Libs/LauncherReinstall.pylibs/launcher_reinstall.py renamed to Libs/LauncherReinstall.py

@@ -0,0 +1,12 @@
+import requests
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+import sys
+
+requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
+headers = {'Cache-Control': 'no-cache', 'Pragma': 'no-cache'}
+try:
+    response_dlc_data = requests.get(
+        'https://raw.githubusercontent.com/seuyh/stellaris-dlc-unlocker/main/dlc_data.json', headers=headers).json()
+    dlc_data = response_dlc_data
+except Exception:
+    sys.exit(2)

Libs/ServerData.py

@@ -0,0 +1,76 @@
+import sys
+from datetime import datetime
+from functools import partial
+import io
+import traceback
+import atexit
+from PyQt5.QtCore import QTimer
+from UI_logic.ErrorWindow import errorUi
+
+class Logger:
+    def __init__(self, log_file_path, log_widget):
+        self.log_widget = log_widget
+        self.stdout_buffer = []
+        self.stderr_buffer = []
+        self.log_file = open(log_file_path, 'w', encoding='utf-8')
+        self.error = errorUi()
+
+        if sys.stdout is None:
+            sys.stdout = io.StringIO()
+        if sys.stderr is None:
+            sys.stderr = io.StringIO()
+
+        self.orig_stdout_write = sys.stdout.write
+        self.orig_stderr_write = sys.stderr.write
+
+        sys.stdout.write = partial(self.log_print, orig_write=self.orig_stdout_write, is_stderr=False)
+        sys.stderr.write = partial(self.log_print, orig_write=self.orig_stderr_write, is_stderr=True)
+
+        sys.excepthook = self.handle_exception
+        atexit.register(self.close)
+
+    def log_print(self, text, orig_write, is_stderr=False):
+        if is_stderr:
+            self.stderr_buffer.append(text)
+        else:
+            self.stdout_buffer.append(text)
+
+        if text.endswith('\n'):
+            if is_stderr:
+                full_message = ''.join(self.stderr_buffer)
+                self.stderr_buffer.clear()
+                self.handle_logging(full_message)
+            else:
+                full_message = ''.join(self.stdout_buffer)
+                self.stdout_buffer.clear()
+                self.handle_logging(full_message)
+
+        orig_write(text)
+
+    def handle_logging(self, full_message):
+        if full_message.strip():
+            log_text = f'[{datetime.now().strftime("%H:%M:%S")}] {full_message.strip()}'
+            self.log_file.write(log_text + '\n')
+            self.log_file.flush()
+            self.log_widget.addItem(log_text)
+            self.log_widget.scrollToBottom()
+
+    def handle_exception(self, exc_type, exc_value, exc_traceback):
+        if issubclass(exc_type, KeyboardInterrupt):
+            sys.__excepthook__(exc_type, exc_value, exc_traceback)
+            return
+
+        error_message = ''.join(traceback.format_exception(exc_type, exc_value, exc_traceback))
+        self.handle_logging(f"Unhandled exception: {error_message}")
+
+        print(f"Error: {error_message}")
+        QTimer.singleShot(0, lambda: self.errorexec('Crashed!\nSee unlocker.log', 'Exit', exitApp=True))
+
+    def close(self):
+        if self.log_file and not self.log_file.closed:
+            self.log_file.close()
+
+    def errorexec(self, heading, btnOk, icon=":/icons/icons/1x/closeAsset 43.png", exitApp=False):
+        print(f'Call errorexec: {heading, btnOk, icon, exitApp}')
+        errorUi.errorConstrict(self.error, heading, icon, btnOk, None, exitApp)
+        self.error.exec_()