Merge pull request #158 from dlyongemallo/pyinstaller_executable

Add zxlive.spec file for creating an executable using pyinstaller.

.gitignore

@@ -1,5 +1,6 @@
 __pycache__
 build
+dist
 *.egg-info
 .vs
 *.tikz
@@ -11,4 +12,4 @@ build
 *.zxp
 *.qasm
 .env
-*.zxr
+*.zxr

zxlive.py

@@ -0,0 +1,4 @@
+from zxlive import app
+
+if __name__ == '__main__':
+    app.main()

zxlive.spec

@@ -0,0 +1,46 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+# To create executable, run:
+#     pyinstaller zxlive.spec
+# This will create a directory called "dist" containing the executable for the host OS.
+
+
+a = Analysis(
+    ['zxlive.py'],
+    pathex=[],
+    binaries=[],
+    datas=[('zxlive/icons/magic-wand.svg', 'zxlive/icons'),
+           ('zxlive/icons/tikzit-tool-edge.svg', 'zxlive/icons'),
+           ('zxlive/icons/tikzit-tool-node.svg', 'zxlive/icons'),
+           ('zxlive/icons/tikzit-tool-select.svg', 'zxlive/icons'),
+           ('zxlive/icons/undo.svg', 'zxlive/icons'),
+           ('zxlive/icons/redo.svg', 'zxlive/icons')],
+    hiddenimports=[],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=[],
+    noarchive=False,
+)
+pyz = PYZ(a.pure)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.datas,
+    [],
+    name='zxlive',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    runtime_tmpdir=None,
+    console=True,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+)

zxlive/common.py

@@ -6,8 +6,10 @@
 
 _ROOT = os.path.abspath(os.path.dirname(__file__))
 
+
 def get_data(path: str) -> str:
-    return os.path.join(_ROOT, path)
+    return os.path.join(os.environ.get("_MEIPASS", _ROOT), path)
+
 
 CUSTOM_RULES_PATH: Final = "lemmas/"
 

zxlive/dialogs.py

@@ -118,7 +118,11 @@ def import_diagram_from_file(file_path: str, selected_filter: str = FileFormat.A
     selected_format = next(f for f in FileFormat if f.filter == selected_filter)
     if selected_format == FileFormat.All:
         ext = file_path.split(".")[-1]
-        selected_format = next(f for f in FileFormat if f.extension == ext)
+        try:
+            selected_format = next(f for f in FileFormat if f.extension == ext)
+        except StopIteration:
+            show_error_msg("Failed to import file", f"Couldn't determine filetype: {file_path}.")
+            return None
 
     # TODO: This would be nicer with match statements (requires python 3.10 though)...
     try: