Merge branch 'v1.5' into main

Author: BitTim

VexTrack.spec

@@ -0,0 +1,34 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+
+a = Analysis(['src\\VexTrack.py'],
+             pathex=['./src', 'P:\\VexTrack'],
+             binaries=[],
+             datas=[],
+             hiddenimports=[],
+             hookspath=[],
+             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='VexTrack',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=True,
+          upx_exclude=[],
+          runtime_tmpdir=None,
+          console=False , icon='VexTrack.ico')

src/VexTrack.py

@@ -315,10 +315,28 @@
 #  History
 # --------------------------------
 
+def historySelect(event):
+    elements = history.get_children()
+
+    for e in elements:
+        tags = history.item(e, "tags")
+
+        if "selected" in tags:
+            tag = core.getScoreTag(history.item(e, "values")[0])
+            history.item(e, tags=(tag))
+            break
+
+    currElementFocus = history.focus()
+    history.item(currElementFocus, tags=("selected"))
+
+def _fixed_map(style, style_name, option):
+    return [elm for elm in style.map(style_name, query_opt=option) if elm[:2] != ('!disabled', '!selected')]
+
 historyListContainer = tk.Frame(historyTab)
 historyListContainer.pack(fill="both", expand=True)
 
 historyStyle = ttk.Style()
+historyStyle.map("history.Treeview", foreground=_fixed_map(historyStyle, "history.Treeview", "foreground"), background=_fixed_map(historyStyle, "history.Treeview", "background"))
 historyStyle.configure("history.Treeview", highlightthickness=0, bd=0, font=('TkDefaultFont', 10))
 historyStyle.configure("history.Treeview.Heading", font=('TkDefaultFont', 10,'bold'))
 historyStyle.layout("history.Treeview", [('history.Treeview.treearea', {'sticky': 'nswe'})])
@@ -334,11 +352,16 @@
 history.column(2, anchor="e")
 history.column(3, anchor="e")
 
+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("selected", background=vars.SELECTED_BG_COLOR, foreground=vars.SELECTED_FG_COLOR)
+
 # Create history Scrollbar
 historyScrollbar = Scrollbar(historyListContainer, orient=VERTICAL, command=history.yview)
 historyScrollbar.pack(side=tk.LEFT, fill="y")
 
 history.configure(yscrollcommand=historyScrollbar.set)
+history.bind("<<TreeviewSelect>>", historySelect)
 
 historyBtnContainer = tk.Frame(historyTab)
 historyBtnContainer.pack(fill="x")
@@ -672,7 +695,10 @@ def updateGoals(config, plot, collectedXP):
 
         totalInGoal = collectedInGoal + config["goals"][i]["remaining"]
 
-        goalContainers[i].setValues(round(collectedInGoal / totalInGoal * 100), collectedInGoal, config["goals"][i]["remaining"], totalInGoal)
+        goalProgress = round(collectedInGoal / totalInGoal * 100)
+        if goalProgress > 100: goalProgress = 100
+
+        goalContainers[i].setValues(goalProgress, collectedInGoal, config["goals"][i]["remaining"] if config["goals"][i]["remaining"] > 0 else 0, totalInGoal)
         goalContainers[i].removeBtn.configure(command=lambda j=i: gcRemoveCallback(j))
         goalContainers[i].editBtn.configure(command=lambda j=i: gcEditCallback(j))
 
@@ -723,7 +749,8 @@ def updateGraph(config, epilogue, plot):
             yAxisYou.append(int(h["amount"]) + prevValue)
             index += 1
 
-    if prevDate != date.today(): yAxisYou.append(yAxisYou[len(yAxisYou) - 1])
+    deltaDate = date.today() - prevDate
+    for i in range(0, deltaDate.days): yAxisYou.append(yAxisYou[len(yAxisYou) - 1])
 
     yAxisDailyIdeal = []
 
@@ -752,18 +779,31 @@ def updateGraph(config, epilogue, plot):
     plot.grid(axis="x", color="lightgray", which="both", linestyle=":")
 
     # --------------------------------
-    # Draw lines for significant unlocks
+    # Draw lines for battlepass unlocks
     # --------------------------------
 
     for i in range(0, vars.NUM_BPLEVELS + 1, 1):
-        plot.axhline(core.cumulativeSum(i, vars.LEVEL2_OFFSET, vars.NUM_XP_PER_LEVEL), color="gray", alpha=0.05, linestyle="-")
+        alpha = 0.5
+        neededXP = core.cumulativeSum(i, vars.LEVEL2_OFFSET, vars.NUM_XP_PER_LEVEL)
+
+        if totalXPCollected >= neededXP: alpha = 0.05
+        plot.axhline(neededXP, color="lightgray", alpha=alpha, linestyle="-")
 
     for i in range(0, vars.NUM_BPLEVELS + 1, 5):
-        plot.axhline(core.cumulativeSum(i, vars.LEVEL2_OFFSET, vars.NUM_XP_PER_LEVEL), color="green", alpha=0.15, linestyle="-")
+        alpha = 0.5
+        neededXP = core.cumulativeSum(i, vars.LEVEL2_OFFSET, vars.NUM_XP_PER_LEVEL)
+
+        if totalXPCollected >= neededXP: alpha = 0.05
+        plot.axhline(neededXP, color="limegreen", alpha=alpha, linestyle="-")
 
     if epilogue:
         for i in range(1, vars.NUM_EPLOGUE_LEVELS + 1, 1):
-            plot.axhline(core.cumulativeSum(vars.NUM_BPLEVELS, vars.LEVEL2_OFFSET, vars.NUM_XP_PER_LEVEL) + i * vars.NUM_EPLOGUE_XP_PER_LEVEL, color="green", alpha=0.15, linestyle="-")
+            alpha = 0.5
+            neededXP = core.cumulativeSum(vars.NUM_BPLEVELS, vars.LEVEL2_OFFSET, vars.NUM_XP_PER_LEVEL) + i * vars.NUM_EPLOGUE_XP_PER_LEVEL
+
+            if totalXPCollected >= neededXP: alpha = 0.05
+
+            plot.axhline(neededXP, color="orange", alpha=alpha, linestyle="-")
 
     updateGoals(config, plot, totalXPCollected)
 
@@ -839,7 +879,10 @@ def updateValues():
 
     history.delete(*history.get_children())
     for i in range(len(config["history"]) - 1, -1, -1):
-        history.insert("", "end", values=(config["history"][i]["description"], str(config["history"][i]["amount"]) + " XP", datetime.fromtimestamp(config["history"][i]["time"]).strftime("%d.%m.%Y %H:%M")))
+        desc = config["history"][i]["description"]
+        tag = core.getScoreTag(desc)
+        
+        history.insert("", "end", values=(desc, str(config["history"][i]["amount"]) + " XP", datetime.fromtimestamp(config["history"][i]["time"]).strftime("%d.%m.%Y %H:%M")), tags=(tag))
 
 # ================================
 #  Buttons

src/updaterLib/core.py

@@ -95,6 +95,11 @@ def checkNewVersion(softwareName):
     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()
         if tokenized[0] == softwareName:

src/vars.py

@@ -21,4 +21,11 @@
 
 LEGACY_VERSIONS = [APP_NAME, "Updater"]
 LEGACY_LAST_APP = 1.4
-LEGACY_LAST_UPDATER = 1.15
+LEGACY_LAST_UPDATER = 1.15
+
+WIN_BG_COLOR = "#AFE0D2"
+WIN_FG_COLOR = "#000000"
+LOSS_BG_COLOR = "#F7AAA8"
+LOSS_FG_COLOR = "#000000"
+SELECTED_BG_COLOR = "#0078D7"
+SELECTED_FG_COLOR = "#FFFFFF"

src/vextrackLib/core.py

@@ -148,3 +148,28 @@ def recalcXP(config):
 
     config["cXP"] = collectedXP
     return config
+
+def getScoreTag(desc):
+    splitDesc = desc.split()
+    scoreCandidates = []
+
+    for s in splitDesc:
+        if "-" in s:
+            scoreCandidates.append(s)
+    
+    scores = []
+    for c in scoreCandidates:
+        scoreComponents = c.split("-")
+        if len(scoreComponents) != 2: continue
+
+        noNumeric = False
+        for comp in scoreComponents:
+            if not comp.isnumeric(): noNumeric = True
+        
+        if noNumeric: continue
+
+        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"

version

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