Changed to a dual install/launch exe

Author: r2dev2

Makefile

@@ -2,10 +2,13 @@ py = python3
 cc := ${py} -m PyInstaller
 
 
-all: build
+all: init build
 
 .PHONY: build
 
+init:
+	$(py) -m pip install pyinstaller requests
+
 build:
 	$(cc) launch.spec
 

launch.py

@@ -1,31 +1,34 @@
 import os
-import shutil
-import sys
+import requests
+import zipfile
 from pathlib import Path
 
 
-# From https://stackoverflow.com/questions/26577574/python-pyinstaller-onefile-executable
-def resource(relative_path):
-    if getattr(sys, 'frozen', False):
-        return os.path.join(sys._MEIPASS, relative_path)
+chromedir = Path.home() / ".pogify" / "GoogleChromePortable"
 
-    return os.path.join(os.path.abspath('.'), relative_path)
 
-chrome = resource("GoogleChromePortable") # "GoogleChromePortable.exe"))
-newpath = Path.home() / ".pogify" / "GoogleChromePortable"
-
-print("Relocating chrome executable")
+def unzip(filepath: str, resultpath: str) -> None:
+    with zipfile.ZipFile(filepath, "r") as zip_ref:
+        zip_ref.extractall(resultpath)
 
 try:
     os.mkdir(Path.home() / ".pogify")
-except FileExistsError:
-    pass
+    zippath = Path.home() / ".pogify" / "chrome.zip"
+
+    with open(zippath, 'wb+') as fout:
+        fout.write(
+            requests.get(
+                "https://github.com/Pogify/pogify-client"
+                "/releases/latest/download/GoogleChromePortable.zip"
+            ).content)
+
+    unzip(str(zippath), Path.home() / ".pogify")
+    os.remove(str(zippath))
 
-try:
-    shutil.copytree(chrome, newpath)
 except FileExistsError:
     pass
 
+
 os.system(
-    f"start {newpath / 'GoogleChromePortable.exe'} --app=http://pogify.net/"
+    f"start {chromedir / 'GoogleChromePortable.exe'} --app=http://pogify.net/"
 )

launch.spec

@@ -6,7 +6,7 @@ block_cipher = None
 a = Analysis(['launch.py'],
              pathex=[''],
              binaries=[],
-             datas=[('GoogleChromePortable', 'GoogleChromePortable')],
+             datas=[],
              hiddenimports=[],
              hookspath=[],
              runtime_hooks=[],
@@ -30,4 +30,4 @@ exe = EXE(pyz,
           upx=False,
           upx_exclude=[],
           runtime_tmpdir=None,
-          console=True , icon='favicon.ico')
+          console=False , icon='favicon.ico')