0.3.2

.github/workflows/build-nuitka.yml

@@ -5,12 +5,30 @@ on:
 
 jobs:
   build:
-    name: Build on ${{ matrix.os }}
+    name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest, macos-15-intel]
+        include:
+          - os: ubuntu-latest
+            name: Linux x64
+            suffix: linux-x64
+          - os: ubuntu-24.04-arm
+            name: Linux arm64
+            suffix: linux-arm64
+          - os: macos-15
+            name: macOS Apple arm64
+            suffix: macos-arm64
+          - os: macos-15-intel
+            name: macOS x64
+            suffix: macos-x64
+          - os: windows-latest
+            name: Windows x64
+            suffix: win-x64
+          - os: windows-11-arm
+            name: Windows arm64
+            suffix: win-arm64
 
     steps:
       - uses: actions/checkout@v4
@@ -27,17 +45,24 @@ jobs:
         if: runner.os == 'Linux'
         run: sudo apt-get update && sudo apt-get install -y gcc patchelf ccache
 
-      - name: Cache Nuitka Build
+      - name: Install CCache (macOS)
+        if: runner.os == 'macOS'
+        run: brew install ccache
+
+      - name: Cache Nuitka & CCache
         uses: actions/cache@v4
         with:
           path: |
-            dist_nuitka/*.build
             ~/.cache/Nuitka
             ~/AppData/Local/Nuitka/Nuitka/Cache
             ~/Library/Caches/Nuitka
-          key: ${{ runner.os }}-nuitka-${{ hashFiles('**/pyproject.toml', '**/uv.lock') }}
+            ~/.cache/ccache
+            ~/Library/Caches/ccache
+            ~/AppData/Local/ccache
+          key: ${{ runner.os }}-${{ matrix.suffix }}-nuitka-${{ hashFiles('**/uv.lock') }}-${{ github.run_id }}
           restore-keys: |
-            ${{ runner.os }}-nuitka-
+            ${{ runner.os }}-${{ matrix.suffix }}-nuitka-${{ hashFiles('**/uv.lock') }}-
+            ${{ runner.os }}-${{ matrix.suffix }}-nuitka-
 
       - name: Install Dependencies
         run: uv sync --extra cli --extra gui
@@ -50,6 +75,19 @@ jobs:
       - name: Build with Nuitka
         run: uv run python build_nuitka.py all
 
+      # -----------------------------------------------------------------------
+      # Determine version (used by all packaging steps)
+      # -----------------------------------------------------------------------
+      - name: Determine version
+        id: version
+        shell: bash
+        run: |
+          VER=$(python -c "exec(open('sessionpreplib/_version.py').read()); print(__version__)")
+          echo "ver=$VER" >> "$GITHUB_OUTPUT"
+
+      # -----------------------------------------------------------------------
+      # Linux packaging
+      # -----------------------------------------------------------------------
       - name: Package Linux Distributions
         if: runner.os == 'Linux'
         shell: bash
@@ -58,9 +96,19 @@ jobs:
             | sudo tee /etc/apt/sources.list.d/goreleaser.list
           sudo apt-get update -q && sudo apt-get install -y nfpm
 
-          export VERSION=$(python -c \
-            "exec(open('sessionpreplib/_version.py').read()); print(__version__)")
-          export DIST_DIR=dist_nuitka
+          VERSION="${{ steps.version.outputs.ver }}"
+          SUFFIX="${{ matrix.suffix }}"
+          # Map matrix suffix to nfpm arch (deb/rpm format)
+          case "$SUFFIX" in
+            linux-x64)   NFPM_ARCH=amd64 ;;
+            linux-arm64) NFPM_ARCH=arm64 ;;
+            *)           NFPM_ARCH=amd64 ;;
+          esac
+          export VERSION SUFFIX NFPM_ARCH DIST_DIR=dist_nuitka
+
+          # Merge GUI dist into CLI dist so we have a single unified distribution directory
+          # This prevents nfpm from throwing "content collision" errors
+          cp -a dist_nuitka/sessionprep-gui.dist/. dist_nuitka/sessionprep.dist/
 
           TMPCONFIG=$(mktemp --suffix=.yaml)
           envsubst < packaging/linux/nfpm.yaml > "$TMPCONFIG"
@@ -69,77 +117,65 @@ jobs:
           rm "$TMPCONFIG"
 
           STAGING=$(mktemp -d)
-          cp dist_nuitka/sessionprep-linux-x64       "$STAGING/sessionprep"
-          cp dist_nuitka/sessionprep-gui-linux-x64   "$STAGING/sessionprep-gui"
+          cp -r dist_nuitka/sessionprep.dist         "$STAGING/sessionprep.dist"
           cp sessionprepgui/res/sessionprep.png      "$STAGING/sessionprep.png"
           cp packaging/linux/sessionprep.desktop     "$STAGING/sessionprep.desktop"
           cp packaging/linux/install-sessionprep.sh  "$STAGING/install-sessionprep.sh"
           chmod +x "$STAGING/install-sessionprep.sh"
-          tar -czf "dist_nuitka/sessionprep-${VERSION}-linux-x64.tar.gz" \
+          tar -czf "dist_nuitka/sessionprep-${VERSION}-${{ matrix.suffix }}.tar.gz" \
             -C "$STAGING" \
-            sessionprep sessionprep-gui sessionprep.png \
+            sessionprep.dist \
+            sessionprep.png \
             sessionprep.desktop install-sessionprep.sh
 
+      # -----------------------------------------------------------------------
+      # Windows packaging
+      # -----------------------------------------------------------------------
       - name: Build InnoSetup Installer
         if: runner.os == 'Windows'
         shell: pwsh
         run: |
-          $ver = (python -c "exec(open('sessionpreplib/_version.py').read()); print(__version__)").Trim()
+          $ver = "${{ steps.version.outputs.ver }}"
           & "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" `
             "/DAPP_VERSION=$ver" `
             "/DDIST_DIR=dist_nuitka" `
+            "/DARCH_SUFFIX=${{ matrix.suffix }}" `
             "packaging\windows\sessionprep.iss"
 
+      # -----------------------------------------------------------------------
+      # macOS packaging
+      # -----------------------------------------------------------------------
       - name: Package macOS .app bundles as DMG
         if: runner.os == 'macOS'
         run: |
           brew install create-dmg
-          SUFFIX=$(python3 -c "from build_conf import get_platform_suffix; print(get_platform_suffix())")
+          VERSION="${{ steps.version.outputs.ver }}"
           for app in dist_nuitka/*.app; do
             [ -d "$app" ] || continue
             name=$(basename "$app" .app)
-            dmg_name="${name}-${SUFFIX}"
-            # create-dmg uses source folder contents as DMG root,
-            # so stage the .app inside a temporary directory
             STAGING=$(mktemp -d)
             cp -R "$app" "$STAGING/"
             create-dmg \
               --volname "$name" \
               --app-drop-link 600 185 \
               --sandbox-safe \
-              "dist_nuitka/${dmg_name}.dmg" \
+              "dist_nuitka/sessionprep-${VERSION}-${{ matrix.suffix }}.dmg" \
               "$STAGING"
             rm -rf "$STAGING"
           done
-          # Clean up temporary read-write DMG files left by create-dmg
           rm -f dist_nuitka/rw.*.dmg
 
-      - name: Upload Artifacts (Windows)
-        if: runner.os == 'Windows'
+      # -----------------------------------------------------------------------
+      # Upload
+      # -----------------------------------------------------------------------
+      - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: sessionprep-${{ matrix.os }}
+          name: sessionprep-${{ matrix.suffix }}
           path: |
-            dist_nuitka/sessionprep-win-x64.exe
-            dist_nuitka/sessionprep-gui-win-x64.exe
-            dist_nuitka/SessionPrep-*-setup.exe
+            dist_nuitka/sessionprep-*.*
+            !dist_nuitka/sessionprep-*.build
+            !dist_nuitka/sessionprep-*.build/**
+            !dist_nuitka/sessionprep-*.dist
+            !dist_nuitka/sessionprep-*.dist/**
           if-no-files-found: error
-
-      - name: Upload Artifacts (macOS)
-        if: runner.os == 'macOS'
-        uses: actions/upload-artifact@v4
-        with:
-          name: sessionprep-${{ matrix.os }}
-          path: dist_nuitka/*.dmg
-          if-no-files-found: error
-
-      - name: Upload Artifacts (Linux)
-        if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v4
-        with:
-          name: sessionprep-${{ matrix.os }}
-          path: |
-            dist_nuitka/*.deb
-            dist_nuitka/*.rpm
-            dist_nuitka/*.tar.gz
-          if-no-files-found: error

.gitignore

@@ -34,6 +34,11 @@ sessionpreplib/daw_processors/ptsl/PTSL_2025.10.md
 sessionpreplib/daw_processors/ptsl/PTSL_2025.10.proto
 sessionpreplib/daw_processors/ptsl/DAWProject-Reference.html
 
+_private/
+_private/*
+
+GEMINI.md
+
 # Temporary build directories
 _dawproject_build/
 _dawproject_build/*

.pylintrc

@@ -0,0 +1,30 @@
+[MASTER]
+ignore=CVS
+ignore-patterns=
+persistent=yes
+load-plugins=
+jobs=1
+unsafe-load-any-extension=no
+extension-pkg-allow-list=PySide6
+
+[MESSAGES CONTROL]
+disable=raw-checker-failed,bad-inline-option,locally-disabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,use-symbolic-message-instead,missing-docstring,too-many-instance-attributes,too-many-public-methods,too-many-statements,too-many-arguments,too-many-locals,too-many-branches,too-many-return-statements,protected-access,duplicate-code,fixme,broad-exception-caught,no-member,invalid-name,import-outside-toplevel,redefined-outer-name,reimported,attribute-defined-outside-init,too-many-nested-blocks,unused-argument,unused-variable,try-except-raise,multiple-statements,unused-import,line-too-long
+
+[REPORTS]
+output-format=text
+reports=no
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+[FORMAT]
+max-line-length=120
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+single-line-if-stmt=no
+max-module-lines=1000
+indent-string='    '
+indent-after-paren=4
+
+[BASIC]
+good-names=i,j,k,ex,Run,_,x,y,fs,ch,db,tc,pt,dp,sz,df,ok,L,tL,pL,ta,pa,tb_,pb2,tr,tg,tb,pr,pg,pb,e,c
+bad-names=foo,bar,baz,toto,tutu,tata
+name-group=
+include-naming-hint=no

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "pylint.args": [
+        "--rcfile=.pylintrc"
+    ],
+    "pylint.importStrategy": "fromEnvironment"
+}

.vscode/tasks.json

@@ -0,0 +1,16 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Pylint: Run Workspace",
+            "type": "shell",
+            "command": "uv run pylint sessionpreplib sessionprepgui sessionprep.py sessionprep-gui.py",
+            "problemMatcher": "$pylint",
+            "presentation": {
+                "reveal": "silent",
+                "panel": "shared",
+                "clear": true
+            }
+        }
+    ]
+}