Merge branch 'seuyh:main' into main

Libs/DownloadThread.py

@@ -52,6 +52,7 @@ class DownloaderThread(QtCore.QThread):
             file.close()
 
         except Exception as e:
+            self.cancelled = True
             self.error_signal.emit(e)
         finally:
             progress_percentage = int((self.dlc_downloaded / self.dlc_count) * 100)

Libs/GamePath.py

@@ -27,7 +27,7 @@ def stellaris_path():
 
 
 def launcher_path():
-    user_home = os.path.expanduser("~")
+    user_home = os.path.join("C:\\Users", os.getlogin())
     launcher_path_1 = reg_search(r"Software\Paradox Interactive\Paradox Launcher v2", "LauncherInstallation")
     launcher_path_2 = reg_search(r"Software\Paradox Interactive\Paradox Launcher v2", "LauncherPathFolder")
 

Libs/LauncherReinstall.py

@@ -24,7 +24,7 @@ class ReinstallThread(QtCore.QThread):
         self.downloaded_launcher_dir = downloaded_launcher_dir
 
     def run(self):
-        user_home = os.path.expanduser("~")
+        user_home = os.path.join("C:\\Users", os.getlogin())
         if self.paradox_folder1 == self.msi_path:
             self.paradox_folder1 = os.path.join(user_home, "AppData", "Local", "Programs", "Paradox Interactive", "launcher")
         latest_file = None
@@ -67,6 +67,7 @@ class ReinstallThread(QtCore.QThread):
         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)
 
             uninstall = Popen(['cmd.exe', '/c', 'msiexec', '/uninstall',

UI_logic/MainWindow.py

@@ -58,7 +58,7 @@ class MainWindow(QMainWindow, ui_main.Ui_MainWindow):
         self.creamapidone = False
 
         self.GITHUB_REPO = "https://api.github.com/repos/seuyh/stellaris-dlc-unlocker/releases/latest"
-        self.current_version = '2.21'
+        self.current_version = '2.22'
         self.version_label.setText(f'Ver. {str(self.current_version)}')
 
         self.copy_files_radio.setVisible(False)
@@ -309,7 +309,7 @@ class MainWindow(QMainWindow, ui_main.Ui_MainWindow):
     def full_reinstall():
         try:
             print(f'Deleting documents folder...')
-            user_home = os.path.expanduser("~")
+            user_home = os.path.join("C:\\Users", os.getlogin())
             rmtree(os.path.join(user_home, "Documents", "Paradox Interactive", "Stellaris"))
         except Exception as e:
             print(f'Cant delete {e}')