Switch to one-directory PyInstaller build, and update application version to 2.0.3.

Author: function-store

BUILD.bat

@@ -2,17 +2,17 @@
 @echo off
 setlocal
 
-set PYTHON_EXECUTABLE=.\py\python.exe
+set PYTHON_EXECUTABLE=.\venv\Scripts\python.exe
 
 echo Cleaning previous build...
-if exist "dist\td_launcher_plus.exe" del /f "dist\td_launcher_plus.exe"
+if exist "dist\td_launcher_plus" rmdir /s /q "dist\td_launcher_plus"
 if exist "build\td_launcher_plus" rmdir /s /q "build\td_launcher_plus"
 
 echo Installing dependencies...
 %PYTHON_EXECUTABLE% -m pip install -r requirements.txt
 
-%PYTHON_EXECUTABLE% .\py\Scripts\pyinstaller.exe --noconfirm --log-level=WARN ^
---onefile --nowindow ^
+%PYTHON_EXECUTABLE% -m PyInstaller --noconfirm --log-level=WARN ^
+--onedir ^
 --windowed ^
 --name="td_launcher_plus" ^
 --icon="td_launcher_plus.ico" ^

TD Launcher Plus.spec

@@ -79,8 +79,8 @@ app = BUNDLE(
         ],
         'CFBundleDisplayName': 'TD Launcher Plus',
         'CFBundleGetInfoString': 'TD Launcher Plus - TouchDesigner Project Launcher',
-        'CFBundleShortVersionString': '2.0.2',
-        'CFBundleVersion': '2.0.2',
+        'CFBundleShortVersionString': '2.0.3',
+        'CFBundleVersion': '2.0.3',
         'NSHighResolutionCapable': True,
         'LSMinimumSystemVersion': '10.9.0'
     }

inno/TD_Launcher_Inno_Compiler.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "TD Launcher Plus"
-#define MyAppVersion "2.0.2"
+#define MyAppVersion "2.0.3"
 #define MyAppPublisher "Dan Molnar ( Function Store )"
 #define MyAppURL "https://www.functionstore.xyz/link-in-bio"
 #define MyAppExeName "td_launcher_plus.exe"
@@ -39,10 +39,11 @@ WizardStyle=modern
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: checkedonce
 
 [Files]
-Source: "..\dist\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\dist\td_launcher_plus\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\dist\td_launcher_plus\_internal\*"; DestDir: "{app}\_internal"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Registry]

td_launcher.py

@@ -32,7 +32,7 @@
 )
 
 # Version
-APP_VERSION = "2.0.2"
+APP_VERSION = "2.0.3"
 
 # Sentinel for the "Default" template entry (launch TD without a file)
 DEFAULT_TEMPLATE = "__default__"
@@ -2052,12 +2052,21 @@ def _on_key_press(self, sender, app_data):
                 self._move_picker_selection(1)
             return
 
-        # Enter - launch
-        if key_code in (
-            getattr(dpg, 'mvKey_Enter', None),
+        # Enter - launch (use Windows API fallback for packaged builds)
+        _enter_codes = (
             getattr(dpg, 'mvKey_Return', None),
-            getattr(dpg, 'mvKey_KeyPadEnter', None),
-        ):
+            getattr(dpg, 'mvKey_NumPadEnter', None),
+            257,  # GLFW_KEY_ENTER
+            335,  # GLFW_KEY_KP_ENTER
+        )
+        enter_pressed = key_code in _enter_codes
+        if not enter_pressed and platform.system() == 'Windows':
+            try:
+                # VK_RETURN = 0x0D covers both Enter and NumPad Enter
+                enter_pressed = bool(ctypes.windll.user32.GetAsyncKeyState(0x0D) & 0x8000)
+            except Exception:
+                pass
+        if enter_pressed:
             if self.selected_file:
                 self._on_launch(sender, app_data)
             return

td_launcher_plus.spec

@@ -1,9 +1,6 @@
 # -*- mode: python ; coding: utf-8 -*-
 
 
-block_cipher = None
-
-
 a = Analysis(
     ['td_launcher.py'],
     pathex=[],
@@ -14,32 +11,35 @@ a = Analysis(
     hooksconfig={},
     runtime_hooks=[],
     excludes=[],
-    win_no_prefer_redirects=False,
-    win_private_assemblies=False,
-    cipher=block_cipher,
     noarchive=False,
+    optimize=0,
 )
-pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
+pyz = PYZ(a.pure)
 
 exe = EXE(
     pyz,
     a.scripts,
-    a.binaries,
-    a.zipfiles,
-    a.datas,
     [],
+    exclude_binaries=True,
     name='td_launcher_plus',
     debug=False,
     bootloader_ignore_signals=False,
     strip=False,
     upx=True,
-    upx_exclude=[],
-    runtime_tmpdir=None,
     console=False,
     disable_windowed_traceback=False,
     argv_emulation=False,
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
-    icon='td_launcher_plus.ico',
+    icon=['td_launcher_plus.ico'],
+)
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='td_launcher_plus',
 )