Merge branch 'VEX-13_Uv1.2' into main

Author: BitTim

Updater.spec

@@ -4,7 +4,7 @@
 block_cipher = None
 
 
-a = Analysis(['src\\Updater.py'],
+a = Analysis(['src\\Updater\\main.py'],
              pathex=['P:\\VexTrack'],
              binaries=[],
              datas=[],

src/Updater/changelogDiag.py

@@ -0,0 +1,27 @@
+from tkinter import * 
+from tkinter import simpledialog, messagebox, ttk
+
+class ChangelogDiag(simpledialog.Dialog):
+    def __init__(self, parent, title, changelog):
+        self.changelog = changelog
+        super().__init__(parent, title)
+
+    def body(self, frame):
+        self.iconbitmap("Updater.exe")
+
+        ttk.Label(frame, text="Here is what's new:").grid(padx=8, pady=4, column=0, row=0, sticky="w")
+
+        self.changelogBox = Listbox(frame, width=64)
+        self.changelogBox.grid(padx=8, pady=2, column=0, row=1, sticky="nswe")
+        for i in range(0, len(self.changelog)):
+            self.changelogBox.insert(i, self.changelog[i])
+
+        scrollbar = ttk.Scrollbar(frame, orient="vertical", command=self.changelogBox.yview)
+        scrollbar.grid(column=1, row=1, sticky="nswe")
+
+        return frame
+
+    def buttonbox(self):
+        self.okButton = ttk.Button(self, text='OK', command=lambda: self.destroy())
+        self.okButton.pack(padx=8, pady=8, side=RIGHT)
+        self.bind("<Return>", lambda event: self.destroy())

src/Updater/core.py

@@ -0,0 +1,125 @@
+from sys import version
+from tkinter import *
+from tkinter import messagebox
+import os
+import requests
+from Updater import changelogDiag, downloadDiag, legacy
+from vars import *
+from tokenString import *
+import json
+import time
+
+root = Tk()
+root.withdraw()
+
+def downloadNewVersion(versionString, softwareName, legacyMode):
+    os.system("taskkill /f /im " + softwareName + ".exe")
+
+    url = "https://github.com/" + GITHUB_USER + "/" + GITHUB_REPO + "/releases/download/" + versionString + "/" + softwareName + ".exe"
+    r = requests.get(url, stream=True)
+
+    downDiag = downloadDiag.DownloadDiag(root, "Downloading " + softwareName + " " + versionString)
+    while downDiag == None: pass
+
+    with open(softwareName + ".exe", 'wb') as f:
+        startTime = time.mktime(time.localtime())
+        downloaded = 0
+        total = int(r.headers.get('content-length'))
+
+        for chunk in r.iter_content(chunk_size=max(int(total/1000), 1024*1024)):
+            if chunk:
+                downloaded += len(chunk)
+                f.write(chunk)
+                cTime = time.mktime(time.localtime())
+
+                downDiag.updateValues(downloaded, total, 0 if cTime == startTime else round(downloaded / (cTime - startTime), 2))
+    
+    downDiag.destroy()
+    
+    if not legacyMode:
+        content = []
+        with open(VERSION_PATH, 'r') as f:
+            content = json.loads(f.read())
+        
+        content[softwareName] = versionString
+        with open(VERSION_PATH, 'w') as f:
+            f.write(json.dumps(content, indent = 4, separators=(',', ': ')))
+    else:
+        content = []
+        with open(OLD_VERSION_PATH, 'r') as f:
+            content = f.readlines()
+        
+        content[LEGACY_VERSIONS.index(softwareName)] = versionString
+        for i in range(0, len(content)):
+            if i != len(content) - 1: content[i] += "\n"
+
+        with open(OLD_VERSION_PATH, 'w') as f:
+            f.writelines(content)
+
+def restartProgram(softwareName):
+    os.startfile(softwareName + ".exe")
+
+def checkNewVersion(softwareName):
+    isNewVersion = False
+    legacyMode = False
+
+    # Update old version file
+    if not os.path.exists(VERSION_PATH):
+        if os.path.exists(OLD_VERSION_PATH):
+            version = []
+            with open(OLD_VERSION_PATH, 'r') as f:
+                version = f.readlines()
+            
+            for i in range(0, len(version)): version[i] = version[i].strip()
+            legacyMode = legacy.checkLegacy(version)
+
+            if not legacyMode:
+                newVersion = {GITHUB_REPO: version[0], "Updater": version[1]}
+                os.remove(OLD_VERSION_PATH)
+        else:
+            newVersion = {GITHUB_REPO: "v1.0", "Updater": "v1.0"}
+        
+        if not legacyMode:
+            with open(VERSION_PATH, 'w') as f:
+                f.write(json.dumps(newVersion, indent = 4, separators=(',', ': ')))
+
+    if legacyMode:
+        with open(OLD_VERSION_PATH, 'r') as f:
+            versionString = f.readlines()[LEGACY_VERSIONS.index(softwareName)]
+    else:
+        with open(VERSION_PATH, 'r') as f:
+            versionString = json.loads(f.read())[softwareName]
+
+    versionNumber = versionString.split("v")[1]
+    
+    response = requests.get("https://api.github.com/repos/" + GITHUB_USER + "/" + GITHUB_REPO + "/releases", headers={"Authorization": TOKEN})
+    releases = response.json()
+
+    for r in releases:
+        tokenized = r["name"].split()
+        if tokenized[0] == softwareName:
+            latestVersionString = tokenized[1]
+            latestVersionNumber = latestVersionString.split("v")[1]
+
+            if versionNumber > latestVersionNumber:
+                break
+
+            if versionNumber < latestVersionNumber:
+                res = messagebox.askquestion("Updater", "A new version of " + softwareName + " is available: " + latestVersionString + "\nDo you want to update?")
+                if res == "yes":
+                    downloadNewVersion(latestVersionString, softwareName, legacyMode)
+
+                    changelogRaw = r["body"].split("##")[1].split("\r\n")
+                    changelog = []
+                    for c in changelogRaw[1:]:
+                        if c != "": changelog.append(c)
+
+                    changelogDiag.ChangelogDiag(root, "Changelog", changelog)
+        
+                    isNewVersion = True
+        
+                    restartProgram(softwareName)
+                break
+    
+    root.destroy()
+    return isNewVersion

src/Updater/downloadDiag.py

@@ -0,0 +1,60 @@
+from tkinter import *  
+from tkinter import ttk, messagebox
+
+class DownloadDiag(Toplevel):
+    def close(self):
+        pass
+
+    def __init__(self, parent, title):
+        super().__init__(parent)
+        self.title(title)
+        self.transient()
+        self.iconbitmap("Updater.exe")
+        self.resizable(False, False)
+
+        ttk.Label(self, text="Download progress", font=('TkDefaultFont', 9,'bold')).grid(padx=8, pady=4, column=0, row=0, columnspan=7, sticky="w")
+
+        self.progressBar = ttk.Progressbar(self, length=64, orient="horizontal", mode="determinate")
+        self.progressBar.grid(padx=8, pady=2, columnspan=6, column=0, row=1, sticky="we")
+        
+        self.percentageLabel = ttk.Label(self, text="0 %")
+        self.percentageLabel.grid(padx=8, pady=4, column=6, row=1, sticky="w")
+
+        ttk.Label(self, text="Downloaded:", font=('TkDefaultFont', 9,'bold')).grid(padx=8, pady=4, column=0, row=2, sticky="w")
+        ttk.Label(self, text="File Size:", font=('TkDefaultFont', 9,'bold')).grid(padx=8, pady=4, column=2, row=2, sticky="w")
+        ttk.Label(self, text="Speed:", font=('TkDefaultFont', 9,'bold')).grid(padx=8, pady=4, column=4, row=2, sticky="w")
+
+        self.downloadedLabel = ttk.Label(self, text="0 B")
+        self.downloadedLabel.grid(padx=8, pady=4, column=1, row=2, sticky="w")
+
+        self.fileSizeLabel = ttk.Label(self, text="0 B")
+        self.fileSizeLabel.grid(padx=8, pady=4, column=3, row=2, sticky="w")
+
+        self.speedLabel = ttk.Label(self, text="0 b/s")
+        self.speedLabel.grid(padx=8, pady=4, column=5, row=2, sticky="w")
+
+        self.protocol("WM_DELETE_WINDOW", self.close)
+
+    def formatSize(self, value, suffix):
+        amount = 0
+        while value > 1024:
+            value /= 1024
+            amount += 1
+        
+        value = round(value, 2)
+        valueStr = f'{value:.2f}'
+
+        if amount >= 3: return valueStr + " G" + suffix
+        if amount >= 2: return valueStr + " M" + suffix
+        if amount >= 1: return valueStr + " K" + suffix
+        return valueStr + " " + suffix
+
+    def updateValues(self, downloaded, size, speed):
+        progress = round(downloaded / size * 100, 2)
+        
+        self.progressBar["value"] = progress
+        self.percentageLabel["text"] = f'{progress:.2f}' + " %"
+        self.downloadedLabel["text"] = self.formatSize(downloaded, "B")
+        self.fileSizeLabel["text"] = self.formatSize(size, "B")
+        self.speedLabel["text"] = self.formatSize(speed, "b/s")
+        self.update()

src/Updater/legacy.py

@@ -0,0 +1,6 @@
+from vars import *
+
+def checkLegacy(version):
+    if float(version[LEGACY_VERSIONS.index(APP_NAME)].split("v")[1]) <= LEGACY_LAST_APP or float(version[LEGACY_VERSIONS.index("Updater")].split("v")[1]) >= LEGACY_LAST_UPDATER:
+        return True
+    return False  

src/Updater/main.py

@@ -0,0 +1,7 @@
+import os, sys
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from Updater import core
+from vars import *
+
+core.checkNewVersion(APP_NAME)