Merge branch 'Uv1.35' into main

Author: BitTim

src/VexTrack.py

@@ -507,6 +507,12 @@ def _fixed_map(style, style_name, option):
 ignoreInactiveDaysSettingCheck.grid(padx=8, pady=2, columnspan=2, column=2, row=7, sticky="we")
 ignoreInactiveDaysSettingVar.set(settings["ignoreInactiveDays"])
 
+ignorePrereleasesSettingVar = IntVar()
+ttk.Label(settingsContainer, text="Ignore pre-releases:").grid(padx=8, pady=2, columnspan=2, column=0, row=8, sticky="we")
+ignorePrereleasesSettingCheck = ttk.Checkbutton(settingsContainer, onvalue=1, offvalue=0, variable=ignorePrereleasesSettingVar)
+ignorePrereleasesSettingCheck.grid(padx=8, pady=2, columnspan=2, column=2, row=8, sticky="we")
+ignorePrereleasesSettingVar.set(settings["ignorePrereleases"])
+
 settingsBtnContainer = tk.Frame(settingsTab)
 settingsBtnContainer.pack(fill="x")
 
@@ -706,6 +712,7 @@ def updateSettings():
 
     settings["useHistoryColors"] = enableColorsSettingVar.get()
     settings["ignoreInactiveDays"] = ignoreInactiveDaysSettingVar.get()
+    settings["ignorePrereleases"] = ignorePrereleasesSettingVar.get()
 
     settings["winBackground"] = winBackgroundSettingBtn.color
     settings["winForeground"] = winForegroundSettingBtn.color
@@ -1072,6 +1079,7 @@ def updateSettingsUI(updateBufferDays):
         bufferDaysSettingEntry.insert(0, settings["bufferDays"])
     enableColorsSettingVar.set(settings["useHistoryColors"])
     ignoreInactiveDaysSettingVar.set(settings["ignoreInactiveDays"])
+    ignorePrereleasesSettingVar.set(settings["ignorePrereleases"])
 
     winBackgroundSettingBtn.setValues(color=settings["winBackground"])
     winForegroundSettingBtn.setValues(color=settings["winForeground"])
@@ -1203,6 +1211,7 @@ def updateValues(updateBufferDays=True):
 bufferDaysSettingVar.trace("w", lambda a, b, c: updateSettings())
 enableColorsSettingCheck.configure(command=lambda: updateSettings())
 ignoreInactiveDaysSettingCheck.configure(command=lambda: updateSettings())
+ignorePrereleasesSettingCheck.configure(command=lambda: updateSettings())
 
 winBackgroundSettingBtn.setValues(command=lambda: updateSettings())
 winForegroundSettingBtn.setValues(command=lambda: updateSettings())

src/updaterLib/core.py

@@ -8,6 +8,7 @@
 from tokenString import *
 import json
 import time
+from vextrackLib import settings
 
 root = Tk()
 root.withdraw()
@@ -139,16 +140,22 @@ def checkNewVersion(softwareName):
     isNewVersion = False
     legacyMode = False
 
+    setts = settings.loadSettings()
+
     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})
+    response = requests.get("https://api.github.com/repos/" + GITHUB_USER + "/" + GITHUB_REPO + "/releases")
     releases = response.json()
 
     if "message" in releases:
-        messagebox.showerror("Ratelimit reached", "Updater could not fetch new version of " + softwareName + ":\nYou have reached your rate limit. Try again later")
-        root.destroy()
-        return False
+        response = requests.get("https://api.github.com/repos/" + GITHUB_USER + "/" + GITHUB_REPO + "/releases", headers={"Authorization": TOKEN})
+        releases = response.json()
+
+        if "message" in releases:
+            messagebox.showerror("Ratelimit reached", "Updater could not fetch new version of " + softwareName + ":\nYou have reached your rate limit. Try again later")
+            root.destroy()
+            return False
 
     for r in releases:
         tokenized = r["name"].split()
@@ -160,6 +167,8 @@ def checkNewVersion(softwareName):
             if versionNumber > latestVersionNumber: break
 
             if versionNumber < latestVersionNumber:
+                if r["prerelease"] and setts["ignorePrereleases"] == 1: continue
+
                 res = messagebox.askquestion("Updater", "A new version of " + softwareName + " is available: " + latestVersionString + "\nDo you want to update?")
 
                 if res == "yes":
@@ -178,10 +187,11 @@ def checkNewVersion(softwareName):
 
                     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
+                    if len(warnings) != 0:
+                        warningDiagInstance = warningDiag.WarningDiag(root, "Warnings", warnings)
+                        if warningDiagInstance.response == "no":
+                            ignoreVersion(latestVersionString, softwareName, legacyMode)
+                            break
 
                     downloadNewVersion(latestVersionString, softwareName, legacyMode, r["tag_name"])
                     changelogDiag.ChangelogDiag(root, "Changelog", changelog)

src/vars.py

@@ -32,6 +32,7 @@
 DEFAULT_BUFFER_DAYS = 8
 DEFAULT_USE_HISTORY_COLORS = 1
 DEFAULT_IGNORE_INACTIVE_DAYS = 0
+DEFAULT_IGNORE_PRERELEASES = 1
 
 DEFAULT_NONE_BG_COLOR = "#939393"
 DEFAULT_WIN_BG_COLOR = "#AFE0D2"

src/vextrackLib/settings.py

@@ -7,6 +7,7 @@
     "bufferDays": DEFAULT_BUFFER_DAYS,
     "useHistoryColors": DEFAULT_USE_HISTORY_COLORS,
     "ignoreInactiveDays": DEFAULT_IGNORE_INACTIVE_DAYS,
+    "ignorePrereleases": DEFAULT_IGNORE_PRERELEASES,
     "winBackground": DEFAULT_WIN_BG_COLOR,
     "winForeground": DEFAULT_WIN_FG_COLOR,
     "lossBackground": DEFAULT_LOSS_BG_COLOR,

version.json

@@ -1,4 +1,4 @@
 {
     "VexTrack": "v1.6",
-    "Updater": "v1.3"
+    "Updater": "v1.35"
 }