[VEX-33]: Fixed updater and disabled force epilogue

Author: BitTim

src/VexTrack.py

@@ -20,9 +20,7 @@
 
 windowSize = vars.WINDOW_GEOMETRY.split("x")
 newUpdaterVersion = uCore.checkNewVersion("Updater")
-
-with open(vars.VERSION_PATH, 'r') as f:
-    versionString = json.loads(f.read())[vars.APP_NAME]
+versionString, _ = uCore.getVersionString(vars.APP_NAME)
 
 root = tk.Tk()
 root.title(vars.APP_NAME + " " + versionString)
@@ -352,8 +350,10 @@ def _fixed_map(style, style_name, option):
 history.column(2, anchor="e")
 history.column(3, anchor="e")
 
+history.tag_configure("none", background=vars.NONE_BG_COLOR, foreground=vars.NONE_FG_COLOR)
 history.tag_configure("win", background=vars.WIN_BG_COLOR, foreground=vars.WIN_FG_COLOR)
 history.tag_configure("loss", background=vars.LOSS_BG_COLOR, foreground=vars.LOSS_FG_COLOR)
+history.tag_configure("draw", background=vars.DRAW_BG_COLOR, foreground=vars.DRAW_FG_COLOR)
 history.tag_configure("selected", background=vars.SELECTED_BG_COLOR, foreground=vars.SELECTED_FG_COLOR)
 
 # Create history Scrollbar
@@ -702,7 +702,7 @@ def updateGoals(config, plot, collectedXP):
         goalContainers[i].removeBtn.configure(command=lambda j=i: gcRemoveCallback(j))
         goalContainers[i].editBtn.configure(command=lambda j=i: gcEditCallback(j))
 
-def updateGraph(config, epilogue, plot):
+def updateGraph(config, epilogue, drawEpilogue, plot):
     plot.clear()
     timeAxis = []
 
@@ -796,7 +796,7 @@ def updateGraph(config, epilogue, plot):
         if totalXPCollected >= neededXP: alpha = 0.05
         plot.axhline(neededXP, color="limegreen", alpha=alpha, linestyle="-")
 
-    if epilogue:
+    if epilogue or drawEpilogue:
         for i in range(1, vars.NUM_EPLOGUE_LEVELS + 1, 1):
             alpha = 0.5
             neededXP = core.cumulativeSum(vars.NUM_BPLEVELS, vars.LEVEL2_OFFSET, vars.NUM_XP_PER_LEVEL) + i * vars.NUM_EPLOGUE_XP_PER_LEVEL
@@ -818,6 +818,7 @@ def updateGraph(config, epilogue, plot):
 
 def updateValues():
     config = core.readConfig(vars.CONFIG_PATH)
+    drawEpilogue = False
 
     totalXPProgress, totalXPCollected, totalXPRemaining, totalXPTotal = core.calcTotalValues(config, 0)
 
@@ -827,17 +828,20 @@ def updateValues():
     for g in config["goals"]:
         if g["remaining"] + totalXPCollected > largestGoalRemaining: largestGoalRemaining = g["remaining"] + totalXPCollected
 
-    if config["activeBPLevel"] > 50 or largestGoalRemaining > totalXPTotal:
+    if config["activeBPLevel"] > 50:
         epilogueCheck.config(state=DISABLED)
         epilogueVar.set(1)
     else:
         epilogueCheck.config(state=NORMAL)
+    
+    if largestGoalRemaining > totalXPTotal:
+        drawEpilogue = True
 
     dailyProgress, dailyCollected, dailyRemaining, dailyTotal = core.calcDailyValues(config, epilogueVar.get())
     if(dailyProgress > 100): dailyProgress = 100
     if(dailyRemaining < 0): dailyRemaining = 0
 
-    yAxisYou, yAxisIdeal, yAxisDailyIdeal = updateGraph(config, epilogueVar.get(), graphPlot)
+    yAxisYou, yAxisIdeal, yAxisDailyIdeal = updateGraph(config, epilogueVar.get(), drawEpilogue, graphPlot)
 
     dailyBar["value"] = dailyProgress
     dailyPercentageLabel["text"] = str(dailyProgress) + "%"

src/updaterLib/core.py

@@ -59,11 +59,10 @@ def downloadNewVersion(versionString, softwareName, legacyMode):
 def restartProgram(softwareName):
     os.startfile(softwareName + ".exe")
 
-def checkNewVersion(softwareName):
-    isNewVersion = False
+def getVersionString(softwareName):
     legacyMode = False
+    newVersion = {}
 
-    # Update old version file
     if not os.path.exists(VERSION_PATH):
         if os.path.exists(OLD_VERSION_PATH):
             version = []
@@ -79,6 +78,8 @@ def checkNewVersion(softwareName):
         else:
             newVersion = {GITHUB_REPO: "v1.0", "Updater": "v1.0"}
 
+        print(legacyMode, newVersion)
+
         if not legacyMode:
             with open(VERSION_PATH, 'w') as f:
                 f.write(json.dumps(newVersion, indent = 4, separators=(',', ': ')))
@@ -89,7 +90,14 @@ def checkNewVersion(softwareName):
     else:
         with open(VERSION_PATH, 'r') as f:
             versionString = json.loads(f.read())[softwareName]
+    
+    return versionString, legacyMode
+
+def checkNewVersion(softwareName):
+    isNewVersion = False
+    legacyMode = False
 
+    versionString, legacyMode = getVersionString(softwareName)
     versionNumber = versionString.split("v")[1]
 
     response = requests.get("https://api.github.com/repos/" + GITHUB_USER + "/" + GITHUB_REPO + "/releases", headers={"Authorization": TOKEN})

src/updaterLib/legacy.py

@@ -1,6 +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:
+    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/vars.py

@@ -23,9 +23,13 @@
 LEGACY_LAST_APP = 1.4
 LEGACY_LAST_UPDATER = 1.15
 
+NONE_BG_COLOR = "#939393"
+NONE_FG_COLOR = "#000000"
 WIN_BG_COLOR = "#AFE0D2"
 WIN_FG_COLOR = "#000000"
 LOSS_BG_COLOR = "#F7AAA8"
 LOSS_FG_COLOR = "#000000"
+DRAW_BG_COLOR = "#C3C3C3"
+DRAW_FG_COLOR = "#000000"
 SELECTED_BG_COLOR = "#0078D7"
 SELECTED_FG_COLOR = "#FFFFFF"

src/vextrackLib/core.py

@@ -171,5 +171,6 @@ def getScoreTag(desc):
         scores.append(scoreComponents)
 
     if len(scores) != 1: return "none"
-    if scores[0][0] > scores[0][1]: return "win"
-    if scores[0][0] < scores[0][1]: return "loss"
+    if int(scores[0][0]) > int(scores[0][1]): return "win"
+    if int(scores[0][0]) < int(scores[0][1]): return "loss"
+    if int(scores[0][0]) == int(scores[0][1]): return "draw"

version.json

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