added changes from review, fixed pyinstaller

OpenAdapt.spec

@@ -0,0 +1,51 @@
+# -*- mode: python ; coding: utf-8 -*-
+import sys ; sys.setrecursionlimit(sys.getrecursionlimit() * 5)
+
+block_cipher = None
+
+
+a = Analysis(
+    ['/Users/aaron/Documents/GitHub/OpenAdapt/openadapt/app/main.py'],
+    pathex=[],
+    binaries=[],
+    datas=[('/Users/aaron/Documents/GitHub/OpenAdapt/.venv/lib/python3.10/site-packages/nicegui', 'nicegui')],
+    hiddenimports=[],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=[],
+    win_no_prefer_redirects=False,
+    win_private_assemblies=False,
+    cipher=block_cipher,
+    noarchive=False,
+)
+pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    [],
+    name='OpenAdapt',
+    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=['/Users/aaron/Documents/GitHub/OpenAdapt/openadapt/app/assets/logo.ico'],
+)
+app = BUNDLE(
+    exe,
+    name='OpenAdapt.app',
+    icon='/Users/aaron/Documents/GitHub/OpenAdapt/openadapt/app/assets/logo.ico',
+    bundle_identifier=None,
+)

openadapt/app/build.py

@@ -4,12 +4,10 @@
 
 import nicegui
 
-cmd = [
-    "python",
-    "-m",
-    "PyInstaller",
-    "openadapt/app/main.py",  # main file with ui.run()
-    "--icon=assets/logo.ico",
+spec = [
+    "pyi-makespec",
+    f"{Path(__file__).parent}/main.py",
+    f"--icon={Path(__file__).parent}/assets/logo.ico",
     "--name",
     "OpenAdapt",  # name
     # "--onefile", # trade startup speed for smaller file size
@@ -18,4 +16,15 @@
     "--add-data",
     f"{Path(nicegui.__file__).parent}{os.pathsep}nicegui",
 ]
-subprocess.call(cmd)
+
+subprocess.call(spec)
+
+# add import sys ; sys.setrecursionlimit(sys.getrecursionlimit() * 5) to line 2 of OpenAdapt.spec
+with open("OpenAdapt.spec", "r+") as f:
+    lines = f.readlines()
+    lines[1] = "import sys ; sys.setrecursionlimit(sys.getrecursionlimit() * 5)\n"
+    f.seek(0)
+    f.truncate()
+    f.writelines(lines)
+
+subprocess.call(["pyinstaller", "OpenAdapt.spec"])

openadapt/app/main.py

@@ -1,4 +1,6 @@
 import threading
+import base64
+import os
 
 from nicegui import app, ui
 
@@ -7,10 +9,11 @@
 from openadapt.app.objects.console import Console
 from openadapt.app.util import clear_db, on_export, on_import
 
+SERVER = "127.0.0.1:8000/upload"
 
-def run_app():
-    SERVER = "127.0.0.1:8000/upload"
 
+def run_app():
+    file = os.path.dirname(__file__)
     app.native.window_args["resizable"] = False
     app.native.start_args["debug"] = True
     dark = ui.dark_mode()
@@ -20,11 +23,14 @@ def run_app():
     with ui.row().classes("w-full justify-right"):
         # settings
 
+        # alignment trick
         with ui.avatar(color="white" if dark else "black", size=128):
-            # TODO: remove base64 and add dark mode version of icon
-            ui.image(
-                "data:image/png;base64,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",
+            logo_base64 = base64.b64encode(open(f"{file}/assets/logo.png", "rb").read())
+            img = bytes(
+                f"data:image/png;base64,{(logo_base64.decode('utf-8'))}",
+                encoding="utf-8",
             )
+            ui.image(img.decode("utf-8"))
         ui.icon("settings").tooltip("Settings").on("click", lambda: settings(dark))
         ui.icon("share").tooltip("Share").on(
             "click", lambda: (_ for _ in ()).throw(Exception(NotImplementedError))
@@ -37,7 +43,6 @@ def run_app():
     # Record button + popup
 
     options = ["test"]
-    result = ""
     logger = None
 
     # Add buttons and log text element in a row container | split ui for console