Add Windows ARM64 binary

.github/workflows/build_release.yml

@@ -8,8 +8,18 @@ env:
 
 jobs:
   build_windows:
-    name: Build Windows binary
-    runs-on: windows-2022
+    name: Build Windows binary (${{ matrix.architecture }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - architecture: x64
+            runs-on: windows-2022
+          - architecture: arm64
+            runs-on: windows-11-arm
+
+    runs-on: ${{ matrix.runs-on }}
     timeout-minutes: 15
     steps:
     - uses: actions/checkout@v6
@@ -17,7 +27,7 @@ jobs:
       uses: actions/setup-python@v6
       with:
         python-version: "3.14"
-        architecture: "x64"
+        architecture: ${{ matrix.architecture }}
         cache: pip
         cache-dependency-path: "**/requirements.txt"
     - name: Install Python dependencies
@@ -34,8 +44,8 @@ jobs:
       uses: actions/upload-artifact@v6
       id: upload-unsigned-binary
       with:
-        path: "*-win64-bin.zip"
-        name: Windows standalone binary
+        path: "*-win*-bin.zip"
+        name: Windows standalone binary (${{ matrix.architecture }})
     - name: Sign Windows standalone binary
       uses: signpath/github-action-submit-signing-request@v2
       if: contains(github.ref, 'refs/tags/')
@@ -52,19 +62,21 @@ jobs:
       uses: actions/upload-artifact@v6
       if: contains(github.ref, 'refs/tags/')
       with:
-        name: Windows standalone binary (signed)
+        name: Windows standalone binary (${{ matrix.architecture }}, signed)
         path: "signed"
     - name: Build Windows installer
+      if: matrix.architecture == 'x64'
       run: python builder/package.py installer
     - name: Upload Windows installer
+      if: matrix.architecture == 'x64'
       uses: actions/upload-artifact@v6
       id: upload-unsigned-installer
       with:
         path: "*-win-setup.exe"
-        name: Windows installer
+        name: Windows installer (${{ matrix.architecture }})
     - name: Sign Windows installer
+      if: matrix.architecture == 'x64' && contains(github.ref, 'refs/tags/')
       uses: signpath/github-action-submit-signing-request@v2
-      if: contains(github.ref, 'refs/tags/')
       with:
         api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
         organization-id: ${{ secrets.SIGNPATH_ORG_ID }}
@@ -75,10 +87,10 @@ jobs:
         wait-for-completion: true
         output-artifact-directory: "signed"
     - name: Upload Windows installer (signed)
-      if: contains(github.ref, 'refs/tags/')
+      if: matrix.architecture == 'x64' && contains(github.ref, 'refs/tags/')
       uses: actions/upload-artifact@v6
       with:
-        name: Windows installer (signed)
+        name: Windows installer (${{ matrix.architecture }}, signed)
         path: "signed/*-win-setup.exe"
 
   build_macos:
@@ -167,7 +179,7 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            linux_arch: amd64
+            linux_arch: x64
           - os: ubuntu-24.04-arm
             linux_arch: arm64
 

builder/constants.py

@@ -16,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import os
+import platform
 import re
 
 # Constants
@@ -43,11 +44,17 @@ RELEASE_VERSION_BASE = f"{RELEASE_VERSION_TUPLE[0]}.{RELEASE_VERSION_TUPLE[1]}.{
 RELEASE_NAME = "SABnzbd-%s" % RELEASE_VERSION
 RELEASE_TITLE = "SABnzbd %s" % RELEASE_VERSION
 RELEASE_SRC = RELEASE_NAME + "-src.tar.gz"
-RELEASE_BINARY = RELEASE_NAME + "-win64-bin.zip"
-RELEASE_INSTALLER = RELEASE_NAME + "-win-setup.exe"
+RELEASE_WIN_BIN_X64 = RELEASE_NAME + "-win64-bin.zip"
+RELEASE_WIN_BIN_ARM64 = RELEASE_NAME + "-win-arm64-bin.zip"
+RELEASE_WIN_INSTALLER = RELEASE_NAME + "-win-setup.exe"
 RELEASE_MACOS = RELEASE_NAME + "-macos.dmg"
 RELEASE_README = "README.mkd"
 
+# Detect architecture
+RELEASE_WIN_BIN = RELEASE_WIN_BIN_X64
+if platform.machine() == "ARM64":
+    RELEASE_WIN_BIN = RELEASE_WIN_BIN_ARM64
+
 # Used in package.py and SABnzbd.spec
 EXTRA_FILES = [
     RELEASE_README,

builder/package.py

@@ -35,8 +35,8 @@ from constants import (
     VERSION_FILE,
     RELEASE_README,
     RELEASE_NAME,
-    RELEASE_BINARY,
-    RELEASE_INSTALLER,
+    RELEASE_WIN_BIN,
+    RELEASE_WIN_INSTALLER,
     ON_GITHUB_ACTIONS,
     RELEASE_THIS,
     RELEASE_SRC,
@@ -257,7 +257,7 @@ if __name__ == "__main__":
 
         # Remove any leftovers
         safe_remove(RELEASE_NAME)
-        safe_remove(RELEASE_BINARY)
+        safe_remove(RELEASE_WIN_BIN)
 
         # Run PyInstaller and check output
         shutil.copyfile("builder/SABnzbd.spec", "SABnzbd.spec")
@@ -275,8 +275,8 @@ if __name__ == "__main__":
         test_sab_binary("dist/SABnzbd/SABnzbd.exe")
 
         # Create the archive
-        run_external_command(["win/7zip/7za.exe", "a", RELEASE_BINARY, "SABnzbd"], cwd="dist")
-        shutil.move(f"dist/{RELEASE_BINARY}", RELEASE_BINARY)
+        run_external_command(["win/7zip/7za.exe", "a", RELEASE_WIN_BIN, "SABnzbd"], cwd="dist")
+        shutil.move(f"dist/{RELEASE_WIN_BIN}", RELEASE_WIN_BIN)
 
     if "installer" in sys.argv:
         # Check if we have the dist folder
@@ -284,10 +284,10 @@ if __name__ == "__main__":
             raise FileNotFoundError("SABnzbd executable not found, run binary creation first")
 
         # Check if we have a signed version
-        if os.path.exists(f"signed/{RELEASE_BINARY}"):
+        if os.path.exists(f"signed/{RELEASE_WIN_BIN}"):
             print("Using signed version of SABnzbd binaries")
             safe_remove("dist/SABnzbd")
-            run_external_command(["win/7zip/7za.exe", "x", "-odist", f"signed/{RELEASE_BINARY}"])
+            run_external_command(["win/7zip/7za.exe", "x", "-odist", f"signed/{RELEASE_WIN_BIN}"])
 
             # Make sure it exists
             if not os.path.exists("dist/SABnzbd/SABnzbd.exe"):
@@ -310,7 +310,7 @@ if __name__ == "__main__":
                 "/V3",
                 "/DSAB_VERSION=%s" % RELEASE_VERSION,
                 "/DSAB_VERSIONKEY=%s" % ".".join(map(str, RELEASE_VERSION_TUPLE)),
-                "/DSAB_FILE=%s" % RELEASE_INSTALLER,
+                "/DSAB_FILE=%s" % RELEASE_WIN_INSTALLER,
                 "NSIS_Installer.nsi.tmp",
             ]
         )

builder/release.py

@@ -29,8 +29,9 @@ from constants import (
     RELEASE_VERSION_BASE,
     PRERELEASE,
     RELEASE_SRC,
-    RELEASE_BINARY,
-    RELEASE_INSTALLER,
+    RELEASE_WIN_BIN_X64,
+    RELEASE_WIN_BIN_ARM64,
+    RELEASE_WIN_INSTALLER,
     RELEASE_MACOS,
     RELEASE_README,
     RELEASE_THIS,
@@ -42,8 +43,9 @@ from constants import (
 # Verify we have all assets
 files_to_check = (
     RELEASE_SRC,
-    RELEASE_BINARY,
-    RELEASE_INSTALLER,
+    RELEASE_WIN_BIN_X64,
+    RELEASE_WIN_BIN_ARM64,
+    RELEASE_WIN_INSTALLER,
     RELEASE_MACOS,
     RELEASE_README,
 )

sabnzbd/__init__.py

@@ -32,11 +32,12 @@ from threading import Lock, Condition
 # Determine platform flags
 ##############################################################################
 
-WINDOWS = MACOS = MACOSARM64 = FOUNDATION = False
+WINDOWS = WINDOWSARM64 = MACOS = MACOSARM64 = FOUNDATION = False
 KERNEL32 = LIBC = MACOSLIBC = PLATFORM = None
 
 if os.name == "nt":
     WINDOWS = True
+    WINDOWSARM64 = platform.uname().machine == "ARM64"
 
     if platform.uname().machine not in ["AMD64", "ARM64"]:
         print("SABnzbd only supports 64-bit Windows")

sabnzbd/newsunpack.py

@@ -118,7 +118,14 @@ def find_programs(curdir: str):
         sabnzbd.newsunpack.SEVENZIP_COMMAND = check(curdir, "macos/7zip/7zz")
 
     if sabnzbd.WINDOWS:
-        sabnzbd.newsunpack.PAR2_COMMAND = check(curdir, "win/par2/par2.exe")
+        if sabnzbd.WINDOWSARM64:
+            # ARM64 version of par2
+            sabnzbd.newsunpack.PAR2_COMMAND = check(curdir, "win/par2/arm64/par2.exe")
+        else:
+            # Regular x64 version
+            sabnzbd.newsunpack.PAR2_COMMAND = check(curdir, "win/par2/par2.exe")
+
+        # UnRAR has no arm64 version, so we skip it also for 7zip
         sabnzbd.newsunpack.RAR_COMMAND = check(curdir, "win/unrar/UnRAR.exe")
         sabnzbd.newsunpack.SEVENZIP_COMMAND = check(curdir, "win/7zip/7za.exe")
     else: