Merge branch 'Uv1.3' into main

Author: BitTim

src/VexTrack.py

@@ -20,7 +20,7 @@
 
 windowSize = vars.WINDOW_GEOMETRY.split("x")
 newUpdaterVersion = uCore.checkNewVersion("Updater")
-versionString, _ = uCore.getVersionString(vars.APP_NAME)
+versionString, _, _ = uCore.getVersionString(vars.APP_NAME)
 
 root = tk.Tk()
 root.title(vars.APP_NAME + " " + versionString)

src/updaterLib/core.py

@@ -3,7 +3,7 @@
 from tkinter import messagebox
 import os
 import requests
-from . import changelogDiag, downloadDiag, legacy
+from . import changelogDiag, downloadDiag, warningDiag, legacy
 from vars import *
 from tokenString import *
 import json
@@ -15,6 +15,12 @@
 def downloadNewVersion(versionString, softwareName, legacyMode):
     os.system("taskkill /f /im " + softwareName + ".exe")
 
+    with open(softwareName + ".exe", 'rb') as f:
+        oldExec = f.read()
+    
+    with open(softwareName + ".exe.bak", 'wb') as f:
+        f.write(oldExec)
+
     url = "https://github.com/" + GITHUB_USER + "/" + GITHUB_REPO + "/releases/download/" + versionString + "/" + softwareName + ".exe"
     r = requests.get(url, stream=True)
 
@@ -34,8 +40,25 @@ def downloadNewVersion(versionString, softwareName, legacyMode):
 
                 downDiag.updateValues(downloaded, total, 0 if cTime == startTime else round(downloaded / (cTime - startTime), 2))
 
-    downDiag.destroy()
+    failed = False
+    with open(softwareName + ".exe", 'r') as f:
+        if f.read() == "Not Found": failed = True
+
+    if failed:
+        messagebox.showerror("Update Failed", "Update of " + softwareName + " failed. Reverting to previous version")
+
+        with open(softwareName + ".exe.bak", "rb") as f:
+            oldExec = f.read()
+        
+        with open(softwareName + ".exe", "wb") as f:
+            f.write(oldExec)
+        
+        ignoreVersion(versionString, softwareName, legacyMode)
 
+    downDiag.destroy()
+    os.remove(softwareName + ".exe.bak")
+    if failed: return
+
     if not legacyMode:
         content = []
         with open(VERSION_PATH, 'r') as f:
@@ -62,6 +85,7 @@ def restartProgram(softwareName):
 def getVersionString(softwareName):
     legacyMode = False
     newVersion = {}
+    ignoredVersions = []
 
     if not os.path.exists(VERSION_PATH):
         if os.path.exists(OLD_VERSION_PATH):
@@ -76,7 +100,7 @@ def getVersionString(softwareName):
                 newVersion = {GITHUB_REPO: version[0], "Updater": version[1]}
                 os.remove(OLD_VERSION_PATH)
         else:
-            newVersion = {GITHUB_REPO: "v1.0", "Updater": "v1.0"}
+            newVersion = {APP_NAME: "v1.0", "Updater": "v1.0"}
 
         print(legacyMode, newVersion)
 
@@ -89,15 +113,33 @@ def getVersionString(softwareName):
             versionString = f.readlines()[LEGACY_VERSIONS.index(softwareName)]
     else:
         with open(VERSION_PATH, 'r') as f:
-            versionString = json.loads(f.read())[softwareName]
+            versionFile = json.loads(f.read())
+            versionString = versionFile[softwareName]
+            
+            if "ignored" in versionFile: ignoredVersions = versionFile["ignored"][softwareName]
+    
+    return versionString, legacyMode, ignoredVersions
+
+def ignoreVersion(versionString, softwareName, legacyMode):
+    if legacyMode: return
+
+    versionFile = None
+    with open(VERSION_PATH, 'r') as f:
+        versionFile = json.loads(f.read())
 
-    return versionString, legacyMode
+    if not "ignored" in versionFile:
+        versionFile["ignored"] = {APP_NAME: [], "Updater": []}
+    
+    versionFile["ignored"][softwareName].append(versionString)
+
+    with open(VERSION_PATH, 'w') as f:
+        f.write(json.dumps(versionFile, indent = 4, separators=(',', ': ')))
 
 def checkNewVersion(softwareName):
     isNewVersion = False
     legacyMode = False
 
-    versionString, legacyMode = getVersionString(softwareName)
+    versionString, legacyMode, ignoredVersions = getVersionString(softwareName)
     versionNumber = versionString.split("v")[1]
 
     response = requests.get("https://api.github.com/repos/" + GITHUB_USER + "/" + GITHUB_REPO + "/releases", headers={"Authorization": TOKEN})
@@ -114,24 +156,38 @@ def checkNewVersion(softwareName):
             latestVersionString = tokenized[1]
             latestVersionNumber = latestVersionString.split("v")[1]
 
-            if versionNumber > latestVersionNumber:
-                break
+            if latestVersionString in ignoredVersions: break
+            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")
+                if res == "yes":
+                    warnings = []
                     changelog = []
-                    for c in changelogRaw[1:]:
-                        if c != "": changelog.append(c)
 
+                    descRaw = r["body"].split("##")
+                    for d in descRaw:
+                        splitDRaw = d.split("\r\n")
+                        splitD = [x for x in splitDRaw if x != ""]
+
+                        if len(splitD) < 2: continue
+
+                        if "Changelog" in splitD[0]: changelog = splitD[1:]
+                        if "Warning" in splitD[0]: warnings = splitD[1:]
+                    
+                    if r["prerelease"]: warnings.append("- This release is a pre-release")
+
+                    warningDiagInstance = warningDiag.WarningDiag(root, "Warnings", warnings)
+                    if warningDiagInstance.response == "no":
+                        ignoreVersion(latestVersionString, softwareName, legacyMode)
+                        break
+
+                    downloadNewVersion(latestVersionString, softwareName, legacyMode)
                     changelogDiag.ChangelogDiag(root, "Changelog", changelog)
-        
                     isNewVersion = True
-        
                     restartProgram(softwareName)
+                else: ignoreVersion(latestVersionString, softwareName, legacyMode)
                 break
 
     root.destroy()

src/updaterLib/warningDiag.py

@@ -0,0 +1,37 @@
+from tkinter import * 
+from tkinter import simpledialog, messagebox, ttk
+
+class WarningDiag(simpledialog.Dialog):
+    def __init__(self, parent, title, warnings):
+        self.warnings = warnings
+        self.response = "no"
+        super().__init__(parent, title)
+
+    def body(self, frame):
+        self.iconbitmap("Updater.exe")
+
+        ttk.Label(frame, text="This update has the following warnings:").grid(padx=8, pady=4, column=0, row=0, sticky="w")
+
+        self.warningsBox = Listbox(frame, width=64)
+        self.warningsBox.grid(padx=8, pady=2, column=0, row=1, sticky="nswe")
+        for i in range(0, len(self.warnings)):
+            self.warningsBox.insert(i, self.warnings[i])
+
+        ttk.Label(frame, text="Are you sure you want to update?").grid(padx=8, pady=4, column=0, row=2, sticky="w")
+
+        scrollbar = ttk.Scrollbar(frame, orient="vertical", command=self.warningsBox.yview)
+        scrollbar.grid(column=1, row=1, sticky="nswe")
+
+        return frame
+
+    def giveResponse(self, response):
+        self.response = response
+        self.destroy()
+
+    def buttonbox(self):
+        self.noButton = ttk.Button(self, text='No', command=lambda: self.giveResponse("no"))
+        self.noButton.pack(padx=8, pady=8, side=RIGHT)
+        self.yesButton = ttk.Button(self, text='Yes', command=lambda: self.giveResponse("yes"))
+        self.yesButton.pack(padx=8, pady=8, side=RIGHT)
+        self.bind("<Return>", lambda event: self.giveResponse("yes"))
+        self.bind("<Escape>", lambda event: self.giveResponse("no"))

version.json

@@ -1,4 +1,4 @@
 {
     "VexTrack": "v1.5",
-    "Updater": "v1.21"
+    "Updater": "v1.3"
 }