Merge branch 'master' of https://notabug.org/RemixDev/deemix-pyweb

.gitignore

@@ -3,7 +3,10 @@ __pycache__
 
 .DS_Store
 node_modules
+
+# pyinstaller build dirs
 /dist
+/build
 
 # local env files
 /env/

README.md

@@ -4,7 +4,7 @@ This is a pywebview wrapper for deemix-webui
 ## How to use this
 NOTE: Python 3 is required for this app. Make sure you tick the option to add Python to PATH when installing.<br>
 NOTE: If `python3` is "not a recognized command" try using `python` instead.<br>
-NOTE: If you're on windows you'll need to install cefpython and pythonnet as well: `python3 -m pip install cefpython pythonnet`<br>
+NOTE: If you're on windows you'll need to install cefpython as well: `python3 -m pip install cefpython3 --user`<br>
 After installing Python open a terminal/command prompt and install the dependencies using `python3 -m pip install -r requirements.txt --user`<br>
 If you're using git to get this repo you should use `git submodule update --init --recursive` as well. If you're just downloading the archive.zip, make sure you download and extract [deemix-webui](https://notabug.org/RemixDev/deemix-webui) into the webui folder.
 Run `python3 server.py` to start the server and then connect to `127.0.0.1:9666`. The GUI should show up.<br>

deemix_gui.spec

@@ -1,11 +1,14 @@
 # -*- mode: python ; coding: utf-8 -*-
+import deemix
+from os.path import dirname
+from sys import platform
 
 block_cipher = None
 
 
 a = Analysis(['deemix_gui.py'],
              binaries=[],
-             datas=[('public', 'public'), ('deemix/app/default.json','deemix/app'), ('./icon.ico', '.')],
+             datas=[('webui/public', 'webui/public'), (f'{dirname(deemix.__file__)}/app/default.json','deemix/app')],
              hiddenimports=['engineio.async_drivers.threading', 'pkg_resources.py2_warn'],
              hookspath=[],
              runtime_hooks=[],
@@ -25,7 +28,7 @@ exe = EXE(pyz,
           bootloader_ignore_signals=False,
           strip=False,
           upx=True,
-          console=True, icon='icon.ico' )
+          console=True, icon=f"icon.{'icns' if platform.startswith('darwin') else 'ico'}" )
 coll = COLLECT(exe,
                a.binaries,
                a.zipfiles,

server.spec

@@ -1,11 +1,12 @@
 # -*- mode: python ; coding: utf-8 -*-
+import deemix
+from os.path import dirname
 
 block_cipher = None
 
-
 a = Analysis(['server.py'],
              binaries=[],
-             datas=[('public', 'public'), ('deemix/app/default.json','deemix/app')],
+             datas=[('webui/public', 'webui/public'), (f'{dirname(deemix.__file__)}/app/default.json','deemix/app')],
              hiddenimports=['engineio.async_drivers.threading', 'pkg_resources.py2_warn'],
              hookspath=[],
              runtime_hooks=[],

webui

@@ -1 +1 @@
-Subproject commit 06868b3d454b9587d2b32afb5f10a28a10863278
+Subproject commit 7695632a6701c1d860af3d2447ea13e9e515d18b