imported some fixes to pyinstaller

Commited fixes suggested in original PR, namely:
- Updated dependencies to make this work on current MacOS.
- Added call to freeze_support() as mentioned in
https://pyinstaller.org/en/stable/common-issues-and-pitfalls.html#multi-processing
- Added missing backslash in comment

Author: edevil

.github/workflows/main.yml

@@ -19,9 +19,8 @@ jobs:
       run: |
         apt-get update
         apt-get install -y lsb-release libusb-1.0-0-dev libudev-dev ruby ruby-dev rubygems build-essential desktop-file-utils wget unzip zlib1g-dev liblzma-dev libssl-dev git imagemagick file libfuse2
-        wget -c $(wget -q https://api.github.com/repos/AppImageCommunity/pkg2appimage/releases -O - | grep "pkg2appimage-.*-x86_64.AppImage" | grep browser_download_url | head -n 1 | cut -d '"' -f 4)
-        chmod +x ./pkg2appimage-*.AppImage
-        gem install --no-document fpm
+        wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+        chmod +x ./appimagetool-x86_64.AppImage
 
     - uses: actions/setup-python@v5
       with:
@@ -41,8 +40,7 @@ jobs:
         cp src/main/icons/linux/1024.png dist/Vial/Vial.png
         cp misc/Vial.desktop dist/Vial/
         cp misc/AppRun dist/Vial/
-        ./pkg2appimage-*.AppImage --appdir dist/Vial --output appimage
-        mv Vial-*-x86_64.AppImage Vial-x86_64.AppImage
+        ./appimagetool-x86_64.AppImage dist/Vial
 
     - uses: actions/upload-artifact@v4
       with:
@@ -71,7 +69,7 @@ jobs:
       run: |
         . venv/bin/activate
         pyinstaller misc/Vial.spec
-        hdiutil create -volname Vial -srcfolder "target/Vial.app" -ov -format UDZO vial-mac.dmg
+        hdiutil create -volname Vial -srcfolder "dist/Vial.app" -ov -format UDZO vial-mac.dmg
 
     - uses: actions/upload-artifact@v4
       with:
@@ -119,4 +117,4 @@ jobs:
     - uses: actions/upload-artifact@v4
       with:
         name: vial-win-installer
-        path: target\VialSetup.exe
+        path: VialSetup.exe

misc/README.pyinstaller.md

@@ -12,7 +12,7 @@ pyi-makespec \
     --add-data="../src/build/settings/mac.json:resources/settings" \
     --windowed \
     --noupx \
-    --icon="../src/main/icons/Icon.ico"
+    --icon="../src/main/icons/Icon.ico" \
     --argv-emulation \
     ./src/main/python/main.py
 ```

misc/Vial.spec

@@ -25,7 +25,7 @@ exe = EXE(
     bootloader_ignore_signals=False,
     strip=False,
     upx=False,
-    console=True,
+    console=False,
     disable_windowed_traceback=False,
     argv_emulation=True,
     target_arch=None,
@@ -42,3 +42,9 @@ coll = COLLECT(
     upx_exclude=[],
     name='Vial',
 )
+app = BUNDLE(
+    coll,
+    name='Vial.app',
+    icon='../src/main/icons/Icon.ico',
+    bundle_identifier=None
+)

requirements.txt

@@ -1,16 +1,16 @@
 altgraph==0.17.4
 certifi==2024.2.2
 future==1.0.0
-hidapi==0.14.0
+hidapi==0.14.0.post4
 keyboard==0.13.5
 macholib==1.14
 packaging==24.0
 pefile==2023.2.7
-pyinstaller==6.5.0
-pyinstaller-hooks-contrib==2024.3
-PyQt5==5.15.7
-PyQt5-Qt5==5.15.2
-PyQt5-sip==12.13.0
+pillow==11.1.0
+pyinstaller==6.12.0
+pyinstaller-hooks-contrib==2025.1
+PyQt5==5.15.11
+PyQt5-sip==12.17.0
 pywin32==306; sys_platform == 'win32'
 pywin32-ctypes==0.2.2
 setuptools==69.2.0

src/installer/windows/Installer.nsi

@@ -1,6 +1,9 @@
 !include MUI2.nsh
 !include FileFunc.nsh
 
+!define app_name "Vial"
+!define author "Vial KB"
+
 ;--------------------------------
 ;Perform Machine-level install, if possible
 
@@ -31,7 +34,7 @@ FunctionEnd
 ;General
 
   Name "${app_name}"
-  OutFile "..\${installer}"
+  OutFile "..\..\..\VialSetup.exe"
 
 ;--------------------------------
 ;Interface Settings
@@ -49,7 +52,7 @@ FunctionEnd
     !define MUI_FINISHPAGE_RUN
     !define MUI_FINISHPAGE_RUN_CHECKED
     !define MUI_FINISHPAGE_RUN_TEXT "Run ${app_name}"
-    !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
+    !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchAsNonAdmin"
   !insertmacro MUI_PAGE_FINISH
 
   !insertmacro MUI_UNPAGE_CONFIRM
@@ -67,7 +70,7 @@ FunctionEnd
   "Software\Microsoft\Windows\CurrentVersion\Uninstall\${app_name}"
 Section
   SetOutPath "$InstDir"
-  File /r "..\${app_name}\*"
+  File /r "..\..\..\dist\${app_name}\*"
   WriteRegStr SHCTX "Software\${app_name}" "" $InstDir
   WriteUninstaller "$InstDir\uninstall.exe"
   CreateShortCut "$SMPROGRAMS\${app_name}.lnk" "$InstDir\${app_name}.exe"
@@ -99,7 +102,6 @@ Section "Uninstall"
 
 SectionEnd
 
-Function LaunchLink
-  !addplugindir "."
-  ShellExecAsUser::ShellExecAsUser "open" "$SMPROGRAMS\${app_name}.lnk"
+Function LaunchAsNonAdmin
+  Exec '"$WINDIR\explorer.exe" "$InstDir\${app_name}.exe"'
 FunctionEnd

src/main/python/main.py

@@ -2,6 +2,7 @@
 from functools import cached_property
 from glob import glob
 import json
+from multiprocessing import freeze_support
 import os
 from os import path
 import ssl
@@ -107,6 +108,9 @@ def get_resource(self, file_name):
 
 
 if __name__ == '__main__':
+    # https://pyinstaller.org/en/stable/common-issues-and-pitfalls.html#multi-processing
+    freeze_support()
+
     if len(sys.argv) == 2 and sys.argv[1] == "--linux-recorder":
         from linux_keystroke_recorder import linux_keystroke_recorder