trigger workflow

installer.iss

@@ -27,24 +27,30 @@
 AppId={{8F2E4B6A-1C3D-4E5F-9A7B-0D8E6F2C4A1B}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
+AppVerName={#MyAppName} {#MyAppVersion}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}/issues
+AppUpdatesURL={#MyAppURL}/releases
 DefaultDirName={autopf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
+LicenseFile=LICENSE
 OutputDir={#MyOutputDir}
 OutputBaseFilename={#MyOutputFilename}
 Compression=lzma2
 SolidCompression=yes
 WizardStyle=modern
+DisableWelcomePage=no
 PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=dialog
 UninstallDisplayIcon={app}\{#MyAppExeName}
+UninstallDisplayName={#MyAppName}
 ArchitecturesAllowed=x64compatible
 ArchitecturesInstallIn64BitMode=x64compatible
 CloseApplications=yes
 RestartApplications=yes
+ShowLanguageDialog=auto
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -62,3 +68,4 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+Filename: "{app}\{#MyAppExeName}"; Flags: nowait skipifnotsilent

src/core/interface/dialogs/settings.py

@@ -121,24 +121,24 @@ def settings_dialog(self):
         # IMAGE PATH #
         ###############
 
-        image_path_container = QWidget()
-        image_path_layout = QHBoxLayout()
+        # image_path_container = QWidget()
+        # image_path_layout = QHBoxLayout()
 
-        image_path = QLineEdit()
-        image_path_layout.addWidget(QLabel("Image Path (requires restart):"))
-        image_path_layout.addWidget(image_path)
-        image_path_container.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
-        image_path_container.setLayout(image_path_layout)
-        image_path.setText(state.image_path)
+        # image_path = QLineEdit()
+        # image_path_layout.addWidget(QLabel("Image Path (requires restart):"))
+        # image_path_layout.addWidget(image_path)
+        # image_path_container.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
+        # image_path_container.setLayout(image_path_layout)
+        # image_path.setText(state.image_path)
 
-        def browse_image_path():
-            file_path = QFileDialog.getOpenFileName(dialog, "Select Image File", state.image_path, "Image Files (*.png *.jpg)")[0]
-            if file_path:
-                image_path.setText(file_path)
+        # def browse_image_path():
+        #     file_path = QFileDialog.getOpenFileName(dialog, "Select Image File", state.image_path, "Image Files (*.png *.jpg)")[0]
+        #     if file_path:
+        #         image_path.setText(file_path)
 
-        browse_button = QPushButton("📁")
-        image_path_layout.addWidget(browse_button)
-        browse_button.clicked.connect(browse_image_path)
+        # browse_button = QPushButton("📁")
+        # image_path_layout.addWidget(browse_button)
+        # browse_button.clicked.connect(browse_image_path)
 
         ##################
         # SPEED LIMITING #
@@ -246,7 +246,7 @@ def settings_dialog(self):
             download_path.text(), 
             down_speed_limit.value(), 
             up_speed_limit.value(), 
-            image_path.text(), 
+            # image_path.text(), 
             autoresume_checkbox.isChecked(), 
             max_connections.value(), 
             max_downloads.value(), 
@@ -258,7 +258,7 @@ def settings_dialog(self):
 
         self.tabs = QTabWidget()
         self.tab1 = general_tab("General", autoresume_container, update_checkbox_container, transparent_window_container, self.tabs)
-        self.tab2 = paths_tab("Paths", download_path_container, image_path_container, self.tabs)
+        self.tab2 = paths_tab("Paths", download_path_container, self.tabs)
         self.tab3 = network_tab("Network", interface_container, max_connections_container, max_downloads_container, up_speed_limit_container, down_speed_limit_container, api_url_container, self.tabs)
 
         dialog.layout().addWidget(self.tabs)

src/core/interface/gui.py

@@ -27,10 +27,10 @@ import requests as r
 import os
 import subprocess
 import libtorrent as lt
-import time
 import sys
 import json
 import base64
+import winreg
 from core.utils.logging.logs import consoleLog, remove_download_log, flush_log_buffer
 from core.utils.general.wrappers import run_thread
 from core.utils.data.state import state
@@ -134,27 +134,71 @@ SVG_PAUSE = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><rect x
 SVG_FOLDER = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M2 6c0-1.1.9-2 2-2h5l2 2h7c1.1 0 2 .9 2 2v10c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6z" fill="{color}"/></svg>'
 
 
+def _find_install_path():
+    uninstall_key = r"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
+    for hive in (winreg.HKEY_CURRENT_USER, winreg.HKEY_LOCAL_MACHINE):
+        try:
+            with winreg.OpenKey(hive, uninstall_key) as key:
+                for i in range(winreg.QueryInfoKey(key)[0]):
+                    with winreg.OpenKey(key, winreg.EnumKey(key, i)) as subkey:
+                        try:
+                            name = winreg.QueryValueEx(subkey, "DisplayName")[0]
+                            if "SoftwareManager" in name:
+                                return winreg.QueryValueEx(subkey, "InstallLocation")[0]
+                        except OSError:
+                            continue
+        except OSError:
+            continue
+    return None
+
+
 def download_update(latest_version):
+    import tempfile
+    import time
+
     new_filename = f"SoftwareManager-dev-{latest_version.replace('-dev', '')}-windows-setup.exe"
     url = f"https://github.com/KeksPirates/SoftwareManager/releases/latest/download/SoftwareManager-dev-{latest_version.replace('-dev', '')}-windows-setup.exe"
+    installer_path = os.path.join(tempfile.gettempdir(), new_filename)
 
-    print("Downloading update...", True)
-    response = r.get(url, allow_redirects=True)
-    with open(new_filename, "wb") as f:
-        f.write(response.content)
-    if not os.path.exists(new_filename):
+    progress = QtWidgets.QProgressDialog("Downloading installer...", None, 0, 0)
+    progress.setWindowTitle("Updating")
+    progress.setWindowModality(Qt.WindowModality.ApplicationModal)
+    progress.setCancelButton(None)
+    progress.setMinimumDuration(0)
+    progress.setAutoClose(False)
+    progress.setAutoReset(False)
+    progress.setRange(0, 100)
+    progress.setValue(0)
+    progress.show()
+    QtWidgets.QApplication.processEvents()
+
+    response = r.get(url, allow_redirects=True, stream=True)
+    total = int(response.headers.get("content-length", 0))
+    downloaded = 0
+    chunks = []
+    for chunk in response.iter_content(chunk_size=65536):
+        chunks.append(chunk)
+        downloaded += len(chunk)
+        if total > 0:
+            progress.setValue(int(downloaded * 100 / total))
+        QtWidgets.QApplication.processEvents()
+
+    with open(installer_path, "wb") as f:
+        for chunk in chunks:
+            f.write(chunk)
+
+    if not os.path.exists(installer_path):
+        progress.close()
         raise FileNotFoundError("Executable not found")
-    subprocess.run([new_filename, "/SILENT", "/SUPPRESSMSGBOXES", "/NORESTART", "/RESTARTAPPLICATIONS", "/SP-"])
-    subprocess.Popen(["SoftwareManager.exe"])
-    time.sleep(0.5)
 
-    msg = QMessageBox()
-    msg.setIcon(QMessageBox.Icon.Information)
-    msg.setWindowTitle("New Version")
-    msg.setText("New version installed.")
-    msg.setInformativeText("Please remove the old exe.")
-    msg.setStandardButtons(QMessageBox.StandardButton.Ok)
+    progress.setLabelText("Installing update...")
+    progress.setValue(100)
+    QtWidgets.QApplication.processEvents()
 
+    # Launch installer and exit — the installer will close this process,
+    # install the update, and relaunch the app via its [Run] section.
+    subprocess.Popen([installer_path, "/VERYSILENT", "/SUPPRESSMSGBOXES", "/SP-", "/CLOSEAPPLICATIONS"])
+    time.sleep(1)
     sys.exit(0)
 
 
@@ -163,11 +207,13 @@ def windowCloseHelper():
     
 class MainWindow(QtWidgets.QMainWindow, QWidget):
     log_signal = Signal(str)  # Thread-safe signal for logging
+    search_finished_signal = Signal()  # Thread-safe signal for search completion
     
     def __init__(self):
         super().__init__()
         MainWindow._instance = self
         self.log_signal.connect(self._on_log_signal)
+        self.search_finished_signal.connect(self._on_search_finished)
 
         pixmap = QPixmap()
         image_data = base64.b64decode(logo_base64)
@@ -217,7 +263,16 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.searchbar.setPlaceholderText("Search for software...")
         self.searchbar.setClearButtonEnabled(True)
         self.searchbar.setMinimumHeight(30)
-        self.searchbar.returnPressed.connect(lambda: run_thread(threading.Thread(target=return_pressed, args=(self,)))) # Triggers data function thread on enter
+        self.searchbar.returnPressed.connect(self._start_search)
+
+        self._spinner_label = QLabel()
+        self._spinner_label.setFixedSize(20, 20)
+        self._spinner_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        self._spinner_label.hide()
+        self._spinner_angle = 0
+        self._spinner_timer = QTimer()
+        self._spinner_timer.setInterval(80)
+        self._spinner_timer.timeout.connect(self._update_spinner)
 
         self.dlbutton = QtWidgets.QPushButton("Download")
         self.dlbutton.setCursor(Qt.CursorShape.PointingHandCursor)
@@ -300,7 +355,11 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
         container = QWidget()
         containerLayout = QVBoxLayout()
-        containerLayout.addWidget(self.searchbar)
+
+        search_row = QHBoxLayout()
+        search_row.addWidget(self.searchbar)
+        search_row.addWidget(self._spinner_label)
+        containerLayout.addLayout(search_row)
         containerLayout.addWidget(state.tracker_list[state.tracker])
 
         class DownloadModel(QAbstractTableModel):
@@ -663,6 +722,32 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.context_menu.addAction("Cancel Download", self.cancelDownloadAction)
         self.context_menu.addAction("Delete File", self.deleteFileAction)
 
+    def _start_search(self):
+        self._spinner_label.show()
+        self._spinner_angle = 0
+        self._spinner_timer.start()
+        self._update_spinner()
+        self.searchbar.setEnabled(False)
+        def _search_thread():
+            try:
+                return_pressed(self)
+            finally:
+                self.search_finished_signal.emit()
+        run_thread(threading.Thread(target=_search_thread))
+
+    def _on_search_finished(self):
+        self._spinner_timer.stop()
+        self._spinner_label.hide()
+        self.searchbar.setEnabled(True)
+        self.searchbar.setFocus()
+
+    def _update_spinner(self):
+        frames = ["◐", "◓", "◑", "◒"]
+        idx = (self._spinner_angle // 1) % len(frames)
+        self._spinner_label.setText(frames[idx])
+        self._spinner_label.setStyleSheet("font-size: 16px; color: gray;")
+        self._spinner_angle += 1
+
     @staticmethod
     def add_log(text):
         if MainWindow._instance:

src/core/interface/utils/tabhelper.py

@@ -30,11 +30,11 @@ def general_tab(title, autoresume, update_checkbox, transparent_window, tabs):
     tabs.addTab(tab, title)
     return tab
 
-def paths_tab(title, download_path, image_path, tabs):
+def paths_tab(title, download_path, tabs):
     tab = QWidget()
     layout = QVBoxLayout()
     layout.addWidget(download_path)
-    layout.addWidget(image_path)
+    # layout.addWidget(image_path)
     layout.addStretch()
     tab.setLayout(layout)
     tabs.addTab(tab, title)