Rettelsaer

linedance-app/build_windows.spec

@@ -1,23 +1,22 @@
 # -*- mode: python ; coding: utf-8 -*-
+from PyInstaller.utils.hooks import collect_all, collect_submodules
 
 block_cipher = None
 
+# Saml ALT fra PyQt6 inkl. plugins og DLL-filer
+pyqt6_datas, pyqt6_binaries, pyqt6_hiddenimports = collect_all('PyQt6')
+
 a = Analysis(
     ['main.py'],
     pathex=['.'],
-    binaries=[],
-    datas=[
-        ('translations', 'translations'),
-        ('ui', 'ui'),
-        ('local', 'local'),
-        ('player', 'player'),
-    ],
-    hiddenimports=[
+    binaries=pyqt6_binaries,
+    datas=pyqt6_datas,
+    hiddenimports=pyqt6_hiddenimports + [
         'PyQt6.sip',
         'PyQt6.QtCore',
         'PyQt6.QtGui',
         'PyQt6.QtWidgets',
-        'PyQt6.QtNetwork',
+        # UI moduler
         'ui.main_window',
         'ui.playlist_panel',
         'ui.library_panel',
@@ -25,76 +24,30 @@ a = Analysis(
         'ui.themes',
         'ui.vu_meter',
         'ui.scan_worker',
-        'ui.bpm_worker',
         'ui.tag_editor',
         'ui.login_dialog',
         'ui.settings_dialog',
-        'ui.register_dialog',
-        'ui.playlist_browser',
-        'ui.playlist_info_dialog',
-        'ui.dance_info_dialog',
-        'ui.dance_picker_dialog',
+        'ui.playlist_manager',
         'ui.next_up_bar',
+        # Player + local
         'player.player',
         'local.local_db',
         'local.tag_reader',
         'local.file_watcher',
-        'local.scanner',
-        'translations',
-        'translations.da',
-        'translations.en',
-        'mutagen',
-        'mutagen.mp3', 'mutagen.id3', 'mutagen.flac',
+        # Biblioteker
+        'mutagen', 'mutagen.mp3', 'mutagen.id3', 'mutagen.flac',
         'mutagen.mp4', 'mutagen.oggvorbis', 'mutagen.ogg',
         'mutagen.wave', 'mutagen.aiff', 'mutagen.asf',
-        'watchdog',
-        'watchdog.observers',
-        'watchdog.observers.polling',
-        'watchdog.events',
-        'vlc',
-        'sqlite3',
+        'watchdog', 'watchdog.observers', 'watchdog.events',
+        'watchdog.observers.winapi',
+        'vlc', 'sqlite3',
     ],
     hookspath=[],
+    hooksconfig={},
     runtime_hooks=[],
-    excludes=[
-        'tkinter', 'tk', 'tcl',
-        'matplotlib', 'pandas', 'scipy', 'numpy',
-        'IPython', 'jupyter', 'notebook',
-        'PIL', 'Pillow',
-        'cv2', 'sklearn',
-        'PyQt6.QtWebEngineWidgets',
-        'PyQt6.QtWebEngineCore',
-        'PyQt6.QtWebEngine',
-        'PyQt6.QtMultimedia',
-        'PyQt6.QtMultimediaWidgets',
-        'PyQt6.QtBluetooth',
-        'PyQt6.QtNfc',
-        'PyQt6.QtPositioning',
-        'PyQt6.QtLocation',
-        'PyQt6.QtSensors',
-        'PyQt6.QtSerialPort',
-        'PyQt6.QtSql',
-        'PyQt6.QtTest',
-        'PyQt6.QtXml',
-        'PyQt6.QtOpenGL',
-        'PyQt6.QtOpenGLWidgets',
-        'PyQt6.Qt3DCore',
-        'PyQt6.Qt3DRender',
-        'PyQt6.Qt3DInput',
-        'PyQt6.Qt3DLogic',
-        'PyQt6.Qt3DAnimation',
-        'PyQt6.Qt3DExtras',
-        'PyQt6.QtCharts',
-        'PyQt6.QtDataVisualization',
-        'PyQt6.QtQuick',
-        'PyQt6.QtQuickWidgets',
-        'PyQt6.QtQml',
-        'PyQt6.QtRemoteObjects',
-        'PyQt6.QtScxml',
-        'PyQt6.QtStateMachine',
-        'unittest', 'doctest', 'pdb',
-        'pydoc',
-    ],
+    excludes=['tkinter', 'matplotlib', 'pandas', 'scipy', 'IPython'],
+    win_no_prefer_redirects=False,
+    win_private_assemblies=False,
     cipher=block_cipher,
     noarchive=False,
 )
@@ -104,15 +57,18 @@ pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
 exe = EXE(
     pyz,
     a.scripts,
-    [],                      # ← onedir: ingen binaries/datas her
-    exclude_binaries=True,   # ← onedir: binaries samles i COLLECT
+    [],
+    exclude_binaries=True,
     name='LineDancePlayer',
     debug=False,
     bootloader_ignore_signals=False,
     strip=False,
-    upx=True,
-    upx_exclude=['Qt6*.dll', 'python3*.dll', 'vcruntime140.dll'],
-    console=False,
+    upx=False,          # UPX kan give problemer med PyQt6 DLL-filer
+    console=False,      # Ingen konsol-vindue
+    disable_windowed_traceback=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
     icon=None,
 )
 
@@ -122,7 +78,7 @@ coll = COLLECT(
     a.zipfiles,
     a.datas,
     strip=False,
-    upx=True,
-    upx_exclude=['Qt6*.dll', 'python3*.dll', 'vcruntime140.dll'],
+    upx=False,
+    upx_exclude=[],
     name='LineDancePlayer',
 )