Merge pull request #18 from LeithMerrifield/Updater

Updater

Author: LeithMerrifield

Autoscanner.spec

@@ -8,7 +8,7 @@ a = Analysis(
     ['Main.py'],
     pathex=[],
     binaries=[],
-    datas=[('src/kv/','./src/kv/'),('src/images/','src/images/'),('src/settings.json','src/')],
+    datas=[('src/kv/','./src/kv/'),('src/images/','src/images/'),('src/settings.json','src/'),('src/versions.json','src/versions.json')],
     hiddenimports=[],
     hookspath=[],
     hooksconfig={},

Updater.py

@@ -0,0 +1,159 @@
+import subprocess
+from urllib.request import urlretrieve
+import src.CheckDriver as CheckDriver
+import json
+import shutil
+import os
+import tempfile
+from time import sleep
+from zipfile import ZipFile
+
+LATEST_APP_VERSION = "curl https://leithmerrifield.github.io/Autoscanner/LATESTVERSION"
+DOWNLOAD_LIST = "curl https://leithmerrifield.github.io/Autoscanner/downloads.json"
+
+
+def get_app_download_link(target_version):
+    downloads = CheckDriver.get_webpage_content(DOWNLOAD_LIST)
+
+    downloads_json = json.loads(downloads)
+    for version in downloads_json:
+        if version["Version"] == target_version:
+            return version["Link"]
+
+
+def delete_contents():
+    keep = ["Updater.exe", "database.json", "src", "userdata", "app.zip"]
+    for root, dir, files in os.walk("./Scanner"):
+        for name in files:
+            if name not in keep:
+                try:
+                    os.remove(os.path.join(root, name))
+                    # print(os.path.join(root, name))
+                except:
+                    pass
+        for name in dir:
+            if name not in keep and "userdata" not in root:
+                shutil.rmtree(os.path.join(root, name))
+
+
+def move_from_temp():
+    temp_destination = tempfile.gettempdir()
+    shutil.copytree(
+        temp_destination + "/Autoscanner",
+        "./Scanner",
+        dirs_exist_ok=True,
+    )
+
+
+def check_scanner_folder():
+    if not os.path.isdir("./Scanner"):
+        os.mkdir("./Scanner")
+    return
+
+
+def create_shortcut():
+    ps = subprocess.check_output(
+        "powershell.exe" + " [System.Environment]::GetFolderPath('Desktop')",
+        stderr=subprocess.STDOUT,
+        shell=True,
+    )
+    desktop = ps.decode("UTF-8")[:-2]
+    items = os.listdir(desktop)
+    for item in items:
+        if "Autoscanner" in item:
+            os.remove(desktop + "/" + item)
+
+    current_dir = os.path.abspath(os.getcwd() + "/Scanner/Autoscanner.exe")
+    current_dir = current_dir.split("\\")
+    current_dir = "/".join(current_dir)
+    # fmt: off
+    command = '''param(
+[string]$path
+)
+
+$ScriptObj = New-Object -ComObject ("WScript.shell")
+$destination = [System.Environment]::GetFolderPath("Desktop") + "/Autoscanner.lnk"
+$shortcut = $ScriptObj.CreateShortcut($destination)
+
+
+$shortcut.TargetPath = $path
+$separator = "/"
+$workingdir = $path -split $separator
+$workingdir = $workingdir[0..($workingdir.Length - 2)] -join "/"
+$shortcut.WorkingDirectory = $workingdir
+$shortcut.Save()
+    
+    '''
+    # fmt: on
+    with open("./shortcut.ps1", "w") as openfile:
+        openfile.write(command)
+    sleep(2)
+    subprocess.Popen(
+        [
+            "powershell.exe",
+            "-Command",
+            "&{Set-ExecutionPolicy Bypass -scope CurrentUser -Force}",
+        ],
+    )
+    sleep(1)
+    subprocess.run(
+        [
+            "powershell.exe",
+            f"./shortcut.ps1 {current_dir}",
+        ],
+    )
+    sleep(1)
+    subprocess.Popen(
+        [
+            "powershell.exe",
+            "-Command",
+            "&{Set-ExecutionPolicy Restricted -scope CurrentUser -Force}",
+        ],
+    )
+    return
+
+
+def clean():
+    os.remove("./shortcut.ps1")
+    return
+
+
+def update():
+    # compare versions
+    check_scanner_folder()
+    local_version = CheckDriver.get_local_version(
+        "App_Version", filepath="./Scanner/src/versions.json"
+    )
+    remote_version = CheckDriver.get_webpage_content(LATEST_APP_VERSION)
+
+    if local_version == remote_version:
+        return
+
+    # get download link of newest version
+    # get zip
+    temp_destination = tempfile.gettempdir()
+    CheckDriver.get_remote_zip(
+        get_app_download_link(remote_version), temp_destination + "/app.zip"
+    )
+    delete_contents()
+    CheckDriver.unpack_zip(temp_destination + "/app.zip", temp_destination)
+    sleep(2)
+    move_from_temp()
+    CheckDriver.check_file(filepath="./Scanner/src/versions.json")
+    CheckDriver.update_version(
+        remote_version, "App_Version", filepath="./Scanner/src/versions.json"
+    )
+
+    sleep(2)
+    create_shortcut()
+    sleep(2)
+    clean()
+
+
+try:
+    update()
+    # delete_contents()
+    # os.unlink("./python3.dll")
+except Exception as e:
+    with open("./log.txt", "w") as openfile:
+        openfile.write(str(e))

Updater.spec

@@ -0,0 +1,44 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+
+a = Analysis(
+    ['Updater.py'],
+    pathex=[],
+    binaries=[],
+    datas=[],
+    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='Updater',
+    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,
+)

build.ps1

@@ -0,0 +1,6 @@
+./venv/Scripts/Activate
+python.exe -m PyInstaller ./Updater.spec
+python.exe -m PyInstaller ./Autoscanner.spec
+
+python.exe ./build.py
+

build.py

@@ -0,0 +1,4 @@
+import shutil
+
+shutil.copytree("./dist/Autoscanner/", "./dist/release/Scanner")
+shutil.make_archive("./dist/Autoscanner", "zip", "./dist/release")

src/CheckDriver.py

@@ -5,10 +5,13 @@
 from zipfile import ZipFile
 from urllib.request import urlretrieve
 
+LATEST_RELEASE_STABLE = (
+    "curl https://googlechromelabs.github.io/chrome-for-testing/LATEST_RELEASE_STABLE"
+)
 
-def get_driver_version():
-    ps = "curl https://googlechromelabs.github.io/chrome-for-testing/LATEST_RELEASE_STABLE"
-    return subprocess.check_output(ps, shell=True).decode("utf-8")
+
+def get_webpage_content(url):
+    return subprocess.check_output(url, shell=True).decode("utf-8")
 
 
 def get_download_link(version_number):
@@ -29,34 +32,39 @@ def get_download_link(version_number):
     return link
 
 
-def check_file():
-    if exists("./src/driver_version.json"):
+def check_file(filepath="./src/versions.json"):
+    if exists("./src/versions.json"):
         return
     else:
-        with open("./src/driver_version.json", "w", encoding="utf-8") as openfile:
-            template = {"Chrome_Driver_Version": ""}
+        with open(filepath, "w", encoding="utf-8") as openfile:
+            template = {"Chrome_Driver_Version": "", "App_Version": ""}
             json.dump(template, openfile, indent=4)
     return
 
 
-def get_local_driver_version():
+def unpack_zip(filepath, destination):
+    with ZipFile(filepath, "r") as zipObj:
+        zipObj.extractall(destination)
+
+
+def get_local_version(version_type, filepath="./src/versions.json"):
     version = None
     try:
-        with open("./src/driver_version.json", "r", encoding="utf-8") as openfile:
+        with open(filepath, "r", encoding="utf-8") as openfile:
             json_object = json.load(openfile)
-            version = json_object["Chrome_Driver_Version"]
-    except KeyError:
+            version = json_object[version_type]
+    except:
         version = ""
     return version
 
 
-def update_version(version):
+def update_version(version, version_type, filepath="./src/versions.json"):
     json_object = None
-    with open("./src/driver_version.json", "r", encoding="utf-8") as openfile:
+    with open(filepath, "r", encoding="utf-8") as openfile:
         json_object = json.load(openfile)
 
-    with open("./src/driver_version.json", "w", encoding="utf-8") as openfile:
-        json_object["Chrome_Driver_Version"] = version
+    with open(filepath, "w", encoding="utf-8") as openfile:
+        json_object[version_type] = version
         json.dump(json_object, openfile, indent=4)
 
 
@@ -65,20 +73,25 @@ def clean():
     return
 
 
+def get_remote_zip(url, filename):
+    urlretrieve(url, filename)
+    return
+
+
 def compare_and_download():
     check_file()
-    local_version = get_local_driver_version()
-    remote_version = get_driver_version()
+    local_version = get_local_version("Chrome_Driver_Version")
+    remote_version = get_webpage_content(LATEST_RELEASE_STABLE)
 
     if local_version.split(".")[0] == remote_version.split(".")[0]:
         print("chrome driver up to date")
         return
 
     remote_download_link = get_download_link(remote_version)
 
-    urlretrieve(remote_download_link, "./driver.zip")
+    get_remote_zip(remote_download_link, "./driver.zip")
+
+    unpack_zip("./driver.zip", "./")
 
-    with ZipFile("./driver.zip", "r") as zipObj:
-        zipObj.extractall()
-    update_version(remote_version)
+    update_version(remote_version, "Chrome_Driver_Version")
     clean()

src/versions.json

@@ -0,0 +1,4 @@
+{
+    "Chrome_Driver_Version": "",
+    "App_Version" : "v1.4"
+}