Refactor dev.yml to use bash for build steps

Updated the workflow to use bash for injecting commit hash and building executables on Windows and Unix. (done with claude)

.github/workflows/dev.yml

@@ -81,14 +81,14 @@ jobs:
           echo "short_sha=$SHORT_SHA" >> $GITHUB_OUTPUT
           echo "Generated version: $VERSION"
 
-      - name: Inject commit hash into code (Windows)
-        if: runner.os == 'Windows'
-        shell: pwsh
+      - name: Inject commit hash into code
+        shell: bash
         run: |
-          $json = '{
-            "version": "' + $env:VERSION + '"
-          }'
-          $json | Out-File -Encoding utf8 build_info.json
+          cat > build_info.json << EOF
+          {
+            "version": "${{ env.VERSION }}"
+          }
+          EOF
 
       - name: Download aria2c (Windows)
         if: runner.os == 'Windows'
@@ -99,11 +99,24 @@ jobs:
 
       - name: Build executable with PyInstaller (Windows)
         if: runner.os == 'Windows'
-        run: pyinstaller --onefile --windowed --add-data "build_info.json:." --add-data "deps/aria2c.exe:." --name ${{ env.APP_NAME }} main.py
+        shell: bash
+        run: |
+          pyinstaller --onefile --windowed \
+            --add-data "build_info.json;." \
+            --add-data "deps/aria2c.exe;." \
+            --add-data "core/interface/assets;core/interface/assets" \
+            --name ${{ env.APP_NAME }} \
+            main.py
 
       - name: Build executable with PyInstaller (Unix)
         if: runner.os != 'Windows'
-        run: pyinstaller --onefile --windowed --name ${{ env.APP_NAME }} main.py
+        shell: bash
+        run: |
+          pyinstaller --onefile --windowed \
+            --add-data "build_info.json:." \
+            --add-data "core/interface/assets:core/interface/assets" \
+            --name ${{ env.APP_NAME }} \
+            main.py
 
       - name: Make executable (Unix)
         if: runner.os != 'Windows'

build_info.json

@@ -0,0 +1,3 @@
+{
+  "Version": "dev"
+}

core/interface/gui.py

@@ -40,13 +40,10 @@ from core.network.aria2_integration import dlprogress
 
 
 def download_update(latest_version):
-    old_filename = f"SoftwareManager-dev-{state.version.replace('-dev', '')}-windows.exe"
     new_filename = f"SoftwareManager-dev-{latest_version.replace('-dev', '')}-windows.exe"
     url = f"https://github.com/KeksPirates/SoftwareManager/releases/latest/download/SoftwareManager-dev-{latest_version.replace('-dev', '')}-windows.exe"
 
     print("Downloading update...")
-    if os.path.exists(old_filename):
-        os.remove(old_filename)
     response = r.get(url, allow_redirects=True)
     with open(new_filename, "wb") as f:
         f.write(response.content)
@@ -54,6 +51,14 @@ def download_update(latest_version):
         raise FileNotFoundError("Executable not found")
     subprocess.Popen([new_filename], shell=True)
     time.sleep(0.5)
+
+    msg = QMessageBox()
+    msg.setIcon(QMessageBox.Information)
+    msg.setWindowTitle("New Version")
+    msg.setText("New version installed.")
+    msg.setInformativeText("Please remove the old exe.")
+    msg.setStandardButtons(QMessageBox.Ok)
+
     sys.exit(0)
 
 
@@ -71,6 +76,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         if state.ignore_updates is False:
             if platform.system() == "Windows":
                 result = check_for_updates()
+                if result != (None, None):
                     assets, latest_version = result
 
                     if assets:
@@ -78,7 +84,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                         msg.setIcon(QMessageBox.Information)
                         msg.setWindowTitle("Update Available")
                         msg.setText("A new version is available.")
-                    msg.setInformativeText("Please visit the GitHub releases page to download the latest version.")
+                        msg.setInformativeText("Press Ok to download the update.")
                         msg.setStandardButtons(QMessageBox.Ok | QMessageBox.Ignore)
 
                         response = msg.exec_()
@@ -110,13 +116,20 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.emptyLibrary = QLabel("No items in library.")
         self.emptyDownload = QLabel("No items in downloads.")
         self.progressbar = QProgressBar()
+
+        # Table Widget for Item List
         self.qtablewidget = QTableWidget()
 
         self.qtablewidget.setColumnCount(2)
         self.qtablewidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
         self.qtablewidget.verticalHeader().setVisible(False)
         self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])
-        self.qtablewidget.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch)
+
+        header = self.qtablewidget.horizontalHeader()
+        header.setSectionResizeMode(0, QHeaderView.Stretch) 
+        header.setSectionResizeMode(1, QHeaderView.Fixed)   
+        header.setStretchLastSection(False)
+
         self.qtablewidget.setAttribute(Qt.WA_TranslucentBackground)
         self.qtablewidget.viewport().setAttribute(Qt.WA_TranslucentBackground)
 
@@ -217,8 +230,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.tracker_list.activated.connect(self.set_tracker)
 
         if darkdetect.isDark():
-            settings_action = QAction(QIcon("core/interface/assets/settings_white.png"), "Settings", self)
             settings_action = QAction(QIcon("core/interface/assets/settings_black.png"), "Settings", self)
+            settings_action = QAction(QIcon("core/interface/assets/settings_white.png"), "Settings", self)
 
         settings_action.triggered.connect(lambda: settings_dialog(self))
         toolbar.addAction(settings_action)
@@ -267,3 +280,10 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         else:
             self.emptyResults.hide()
             self.qtablewidget.show()
+
+
+    # thank you claude
+    def resizeEvent(self, event):
+        super().resizeEvent(event)
+        table_width = self.qtablewidget.viewport().width()
+        self.qtablewidget.setColumnWidth(1, int(table_width * 0.3))

core/utils/data/state.py

@@ -12,7 +12,7 @@ class AppState(QObject):
         self.post_urls: List[str] = []
         self.post_author: List[str] = []
         self.downloads: List[str] = []
-        self.version: str
+        self.version: str = "dev"
         self._image_path: str = ""
         self.ignore_updates: bool = False
         self.debug: bool = False

core/utils/network/update_checker.py

@@ -30,6 +30,8 @@ def check_for_updates():
                 for asset in assets:
                     print(f" - {asset['name']}: {asset['browser_download_url']}")
             return assets, latest_version
+        else: 
+            return None, None
     else:
         if state.debug:
             print("Already up-to-date.")