fix: extract tkinter from Python installer via 7z, fix NSIS icon path

- Replace nuget approach (doesn't contain tkinter) with extracting
  from the official Python amd64.exe installer using 7z
- Remove MUI_ICON/MUI_UNICON (no .ico file available, use NSIS default)
- Add p7zip-full to CI dependencies

.gitea/workflows/release.yml

@@ -63,37 +63,50 @@ jobs:
       - name: Install system dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y --no-install-recommends zip libportaudio2
+          sudo apt-get install -y --no-install-recommends zip libportaudio2 nsis p7zip-full
 
       - name: Cross-build Windows distribution
         run: |
           chmod +x build-dist-windows.sh
           ./build-dist-windows.sh "${{ gitea.ref_name }}"
 
-      - name: Upload build artifact
+      - name: Upload build artifacts
         uses: actions/upload-artifact@v3
         with:
           name: LedGrab-${{ gitea.ref_name }}-win-x64
-          path: build/LedGrab-*.zip
+          path: |
+            build/LedGrab-*.zip
+            build/LedGrab-*-setup.exe
           retention-days: 90
 
-      - name: Attach ZIP to release
+      - name: Attach assets to release
         env:
           GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
         run: |
-          TAG="${{ gitea.ref_name }}"
           RELEASE_ID="${{ needs.create-release.outputs.release_id }}"
           BASE_URL="${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}"
-          ZIP_FILE=$(ls build/LedGrab-*.zip | head -1)
-          ZIP_NAME=$(basename "$ZIP_FILE")
 
+          # Upload ZIP
+          ZIP_FILE=$(ls build/LedGrab-*.zip | head -1)
+          if [ -f "$ZIP_FILE" ]; then
             curl -s -X POST \
-            "$BASE_URL/releases/$RELEASE_ID/assets?name=$ZIP_NAME" \
+              "$BASE_URL/releases/$RELEASE_ID/assets?name=$(basename "$ZIP_FILE")" \
               -H "Authorization: token $GITEA_TOKEN" \
               -H "Content-Type: application/octet-stream" \
               --data-binary "@$ZIP_FILE"
+            echo "Uploaded: $(basename "$ZIP_FILE")"
+          fi
 
-          echo "Uploaded: $ZIP_NAME"
+          # Upload installer
+          SETUP_FILE=$(ls build/LedGrab-*-setup.exe 2>/dev/null | head -1)
+          if [ -f "$SETUP_FILE" ]; then
+            curl -s -X POST \
+              "$BASE_URL/releases/$RELEASE_ID/assets?name=$(basename "$SETUP_FILE")" \
+              -H "Authorization: token $GITEA_TOKEN" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary "@$SETUP_FILE"
+            echo "Uploaded: $(basename "$SETUP_FILE")"
+          fi
 
   # ── Linux tarball ──────────────────────────────────────────
   build-linux:
@@ -165,17 +178,19 @@ jobs:
         run: |
           TAG="${{ gitea.ref_name }}"
           VERSION="${TAG#v}"
-          REGISTRY="${{ gitea.server_url }}/${{ gitea.repository }}"
+          # Strip protocol and lowercase for Docker registry path
-          # Lowercase the registry path (Docker requires it)
+          SERVER_HOST=$(echo "${{ gitea.server_url }}" | sed -E 's|https?://||')
-          REGISTRY=$(echo "$REGISTRY" | tr '[:upper:]' '[:lower:]' | sed 's|https\?://||')
+          REPO=$(echo "${{ gitea.repository }}" | tr '[:upper:]' '[:lower:]')
+          REGISTRY="${SERVER_HOST}/${REPO}"
 
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
           echo "registry=$REGISTRY" >> "$GITHUB_OUTPUT"
+          echo "server_host=$SERVER_HOST" >> "$GITHUB_OUTPUT"
 
       - name: Login to Gitea Container Registry
         run: |
           echo "${{ secrets.GITEA_TOKEN }}" | docker login \
-            "$(echo '${{ gitea.server_url }}' | sed 's|https\?://||')" \
+            "${{ steps.meta.outputs.server_host }}" \
             -u "${{ gitea.actor }}" --password-stdin
 
       - name: Build Docker image

build-dist-windows.sh

@@ -86,72 +86,87 @@ fi
 echo "  Patched $(basename "$PTH_FILE")"
 
 # ── Bundle tkinter into embedded Python ───────────────────────
-# Embedded Python doesn't include tkinter. We download it from the
+# Embedded Python doesn't include tkinter. We extract it from the
-# official Windows Python nuget package (same version) which contains
+# official Windows installer (amd64.exe) which contains all components
-# the _tkinter.pyd, tkinter/ package, and Tcl/Tk DLLs.
+# as MSI cab files.
 
 echo "[3b/8] Bundling tkinter for screen overlay support..."
 
-# Python minor version for nuget package (e.g., 3.11.9 -> 3.11)
+# Download the Windows installer (not the embed zip — the full one)
-PYTHON_MINOR="${PYTHON_VERSION%.*}"
+INSTALLER_URL="https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-amd64.exe"
-
+INSTALLER_PATH="$BUILD_DIR/python-installer.exe"
-# Download the full Python nuget package (contains all stdlib + DLLs)
+if [ ! -f "$INSTALLER_PATH" ]; then
-NUGET_URL="https://www.nuget.org/api/v2/package/python/${PYTHON_VERSION}"
+    curl -sL "$INSTALLER_URL" -o "$INSTALLER_PATH"
-NUGET_PKG="$BUILD_DIR/python-nuget.zip"
-if [ ! -f "$NUGET_PKG" ]; then
-    curl -sL "$NUGET_URL" -o "$NUGET_PKG"
 fi
 
-NUGET_DIR="$BUILD_DIR/python-nuget"
+# The installer is a bundle of MSI/CAB files. We can extract with 7z or
-rm -rf "$NUGET_DIR"
+# msiextract. The tkinter components are in the 'tcltk' feature.
-mkdir -p "$NUGET_DIR"
+TK_EXTRACT="$BUILD_DIR/tk-extract"
-unzip -qo "$NUGET_PKG" -d "$NUGET_DIR"
+rm -rf "$TK_EXTRACT"
+mkdir -p "$TK_EXTRACT"
 
-# Copy _tkinter.pyd (the C extension)
+if command -v 7z &>/dev/null; then
-TKINTER_PYD=$(find "$NUGET_DIR" -name "_tkinter.pyd" | head -1)
+    # Extract all cab files from the installer
-if [ -n "$TKINTER_PYD" ]; then
+    7z x -o"$TK_EXTRACT/installer" "$INSTALLER_PATH" -y >/dev/null 2>&1 || true
-    cp "$TKINTER_PYD" "$PYTHON_DIR/"
+
+    # Find and extract the tcltk cab
+    for cab in "$TK_EXTRACT/installer"/tcltk*.msi "$TK_EXTRACT/installer"/tcltk*; do
+        [ -f "$cab" ] || continue
+        7z x -o"$TK_EXTRACT/tcltk" "$cab" -y >/dev/null 2>&1 || true
+    done
+
+    # Find and extract the lib cab (contains tkinter Python package)
+    for cab in "$TK_EXTRACT/installer"/lib*.msi "$TK_EXTRACT/installer"/lib*; do
+        [ -f "$cab" ] || continue
+        7z x -o"$TK_EXTRACT/lib" "$cab" -y >/dev/null 2>&1 || true
+    done
+
+    # Copy _tkinter.pyd
+    TKINTER_PYD=$(find "$TK_EXTRACT" -name "_tkinter.pyd" 2>/dev/null | head -1)
+    if [ -n "$TKINTER_PYD" ]; then
+        cp "$TKINTER_PYD" "$PYTHON_DIR/DLLs/" 2>/dev/null || cp "$TKINTER_PYD" "$PYTHON_DIR/"
         echo "  Copied _tkinter.pyd"
-else
+    else
-    echo "  WARNING: _tkinter.pyd not found in nuget package"
+        echo "  WARNING: _tkinter.pyd not found"
-fi
+    fi
 
-# Copy tkinter Python package from the stdlib zip or Lib/
+    # Copy Tcl/Tk DLLs
-# The nuget package has Lib/tkinter/
+    for dll in tcl86t.dll tk86t.dll zlib1.dll; do
-TKINTER_PKG=$(find "$NUGET_DIR" -type d -name "tkinter" | head -1)
+        DLL_PATH=$(find "$TK_EXTRACT" -name "$dll" 2>/dev/null | head -1)
-if [ -n "$TKINTER_PKG" ]; then
-    mkdir -p "$PYTHON_DIR/Lib"
-    cp -r "$TKINTER_PKG" "$PYTHON_DIR/Lib/tkinter"
-    echo "  Copied tkinter/ package"
-else
-    echo "  WARNING: tkinter package not found in nuget package"
-fi
-
-# Copy Tcl/Tk DLLs (tcl86t.dll, tk86t.dll, etc.)
-for dll in tcl86t.dll tk86t.dll; do
-    DLL_PATH=$(find "$NUGET_DIR" -name "$dll" | head -1)
         if [ -n "$DLL_PATH" ]; then
             cp "$DLL_PATH" "$PYTHON_DIR/"
             echo "  Copied $dll"
         fi
-done
+    done
 
-# Copy Tcl/Tk data directories (tcl8.6, tk8.6)
+    # Copy tkinter Python package
-for tcldir in tcl8.6 tk8.6; do
+    TKINTER_PKG=$(find "$TK_EXTRACT" -type d -name "tkinter" 2>/dev/null | head -1)
-    TCL_PATH=$(find "$NUGET_DIR" -type d -name "$tcldir" | head -1)
+    if [ -n "$TKINTER_PKG" ]; then
+        mkdir -p "$PYTHON_DIR/Lib"
+        cp -r "$TKINTER_PKG" "$PYTHON_DIR/Lib/tkinter"
+        echo "  Copied tkinter/ package"
+    fi
+
+    # Copy tcl/tk data directories
+    for tcldir in tcl8.6 tk8.6; do
+        TCL_PATH=$(find "$TK_EXTRACT" -type d -name "$tcldir" 2>/dev/null | head -1)
         if [ -n "$TCL_PATH" ]; then
             cp -r "$TCL_PATH" "$PYTHON_DIR/$tcldir"
             echo "  Copied $tcldir/"
         fi
-done
+    done
+
+    echo "  tkinter bundled successfully"
+else
+    echo "  WARNING: 7z not found — skipping tkinter bundling (install p7zip-full)"
+fi
 
 # Add Lib to ._pth so tkinter package is importable
 if ! grep -q '^Lib$' "$PTH_FILE"; then
     echo 'Lib' >> "$PTH_FILE"
 fi
 
-rm -rf "$NUGET_DIR"
+rm -rf "$TK_EXTRACT"
-echo "  tkinter bundled successfully"
 
 # ── Download pip and install into embedded Python ────────────
 
@@ -390,8 +405,29 @@ rm -f "$ZIP_PATH"
 (cd "$BUILD_DIR" && zip -rq "$ZIP_NAME" "$DIST_NAME")
 
 ZIP_SIZE=$(du -h "$ZIP_PATH" | cut -f1)
+
+# ── Build NSIS installer (if makensis is available) ──────────
+
+SETUP_NAME="LedGrab-v${VERSION_CLEAN}-win-x64-setup.exe"
+SETUP_PATH="$BUILD_DIR/$SETUP_NAME"
+
+if command -v makensis &>/dev/null; then
+    echo "[9/8] Building NSIS installer..."
+    makensis -DVERSION="${VERSION_CLEAN}" "$SCRIPT_DIR/installer.nsi" >/dev/null 2>&1
+    if [ -f "$SETUP_PATH" ]; then
+        SETUP_SIZE=$(du -h "$SETUP_PATH" | cut -f1)
+        echo "  Installer: $SETUP_PATH ($SETUP_SIZE)"
+    else
+        echo "  WARNING: makensis ran but installer not found at $SETUP_PATH"
+    fi
+else
+    echo "[9/8] Skipping installer (makensis not found — install nsis to enable)"
+fi
+
 echo ""
 echo "=== Build complete ==="
-echo "  Archive: $ZIP_PATH"
+echo "  ZIP: $ZIP_PATH ($ZIP_SIZE)"
-echo "  Size: $ZIP_SIZE"
+if [ -f "$SETUP_PATH" ]; then
+    echo "  Installer: $SETUP_PATH ($SETUP_SIZE)"
+fi
 echo ""

installer.nsi

@@ -0,0 +1,146 @@
+; LedGrab NSIS Installer Script
+; Cross-compilable on Linux: apt install nsis && makensis installer.nsi
+;
+; Expects the portable build to already exist at build/LedGrab/
+; (run build-dist-windows.sh first)
+
+!include "MUI2.nsh"
+!include "FileFunc.nsh"
+
+; ── Metadata ────────────────────────────────────────────────
+
+!define APPNAME "LedGrab"
+!define DESCRIPTION "Ambient lighting system — captures screen content and drives LED strips in real time"
+!define VERSIONMAJOR 0
+!define VERSIONMINOR 1
+!define VERSIONBUILD 0
+
+; Set from command line: makensis -DVERSION=0.1.0 installer.nsi
+!ifndef VERSION
+  !define VERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}"
+!endif
+
+Name "${APPNAME} v${VERSION}"
+OutFile "build\${APPNAME}-v${VERSION}-win-x64-setup.exe"
+InstallDir "$LOCALAPPDATA\${APPNAME}"
+InstallDirRegKey HKCU "Software\${APPNAME}" "InstallDir"
+RequestExecutionLevel user
+SetCompressor /SOLID lzma
+
+; ── Modern UI Configuration ─────────────────────────────────
+
+!define MUI_ABORTWARNING
+
+; ── Pages ───────────────────────────────────────────────────
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English"
+
+; ── Installer Sections ──────────────────────────────────────
+
+Section "!${APPNAME} (required)" SecCore
+  SectionIn RO
+
+  SetOutPath "$INSTDIR"
+
+  ; Copy the entire portable build
+  File /r "build\LedGrab\python"
+  File /r "build\LedGrab\app"
+  File "build\LedGrab\LedGrab.bat"
+
+  ; Create data and logs directories
+  CreateDirectory "$INSTDIR\data"
+  CreateDirectory "$INSTDIR\logs"
+
+  ; Create uninstaller
+  WriteUninstaller "$INSTDIR\uninstall.exe"
+
+  ; Start Menu shortcuts
+  CreateDirectory "$SMPROGRAMS\${APPNAME}"
+  CreateShortcut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\LedGrab.bat" \
+    "" "" "" SW_SHOWMINIMIZED "" "${DESCRIPTION}"
+  CreateShortcut "$SMPROGRAMS\${APPNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+
+  ; Registry: install location + Add/Remove Programs entry
+  WriteRegStr HKCU "Software\${APPNAME}" "InstallDir" "$INSTDIR"
+  WriteRegStr HKCU "Software\${APPNAME}" "Version" "${VERSION}"
+
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" \
+    "DisplayName" "${APPNAME}"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" \
+    "DisplayVersion" "${VERSION}"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" \
+    "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" \
+    "InstallLocation" "$INSTDIR"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" \
+    "Publisher" "Alexei Dolgolyov"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" \
+    "URLInfoAbout" "https://git.dolgolyov-family.by/alexei.dolgolyov/wled-screen-controller-mixed"
+  WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" \
+    "NoModify" 1
+  WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" \
+    "NoRepair" 1
+
+  ; Calculate installed size for Add/Remove Programs
+  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+  IntFmt $0 "0x%08X" $0
+  WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" \
+    "EstimatedSize" "$0"
+SectionEnd
+
+Section "Desktop shortcut" SecDesktop
+  CreateShortcut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\LedGrab.bat" \
+    "" "" "" SW_SHOWMINIMIZED "" "${DESCRIPTION}"
+SectionEnd
+
+Section "Start with Windows" SecAutostart
+  CreateShortcut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\LedGrab.bat" \
+    "" "" "" SW_SHOWMINIMIZED "" "${DESCRIPTION}"
+SectionEnd
+
+; ── Section Descriptions ────────────────────────────────────
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} \
+    "Install ${APPNAME} server and all required files."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} \
+    "Create a shortcut on your desktop."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecAutostart} \
+    "Start ${APPNAME} automatically when you log in."
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+; ── Uninstaller ─────────────────────────────────────────────
+
+Section "Uninstall"
+  ; Remove shortcuts
+  Delete "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk"
+  Delete "$SMPROGRAMS\${APPNAME}\Uninstall.lnk"
+  RMDir "$SMPROGRAMS\${APPNAME}"
+  Delete "$DESKTOP\${APPNAME}.lnk"
+  Delete "$SMSTARTUP\${APPNAME}.lnk"
+
+  ; Remove application files (but NOT data/ — preserve user config)
+  RMDir /r "$INSTDIR\python"
+  RMDir /r "$INSTDIR\app"
+  Delete "$INSTDIR\LedGrab.bat"
+  Delete "$INSTDIR\uninstall.exe"
+
+  ; Remove logs (but keep data/)
+  RMDir /r "$INSTDIR\logs"
+
+  ; Try to remove install dir (only succeeds if empty — data/ may remain)
+  RMDir "$INSTDIR"
+
+  ; Remove registry keys
+  DeleteRegKey HKCU "Software\${APPNAME}"
+  DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"
+SectionEnd