Merge branch 'VEX-1_v1.3' into main

Author: BitTim

src/VexTrack.py

@@ -8,6 +8,7 @@
 from tkinter import ttk, messagebox
 from addDiag import AddDiag
 
+from updaterUpdate import *
 from datetime import *
 
 import matplotlib
@@ -17,9 +18,10 @@
 from matplotlib.patches import Rectangle
 
 windowSize = vars.WINDOW_GEOMETRY.split("x")
+checkNewUpdaterVersion()
 
 with open(vars.VERSION_PATH, 'r') as f:
-        versionString = f.read()
+    versionString = f.readlines()[0]
 
 root = tk.Tk()
 root.title(vars.WINDOW_TITLE + " " + versionString)
@@ -244,12 +246,15 @@
 #  History
 # --------------------------------
 
+historyListContainer = tk.Frame(historyTab)
+historyListContainer.pack(fill="both", expand=True)
+
 historyStyle = ttk.Style()
 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'})])
 
-history = ttk.Treeview(historyTab, columns=(1, 2, 3), show="headings", height="16", style="history.Treeview")
+history = ttk.Treeview(historyListContainer, columns=(1, 2, 3), show="headings", height="16", style="history.Treeview")
 history.pack(side=tk.LEFT, fill="both", expand=True)
 
 history.heading(1, text="Description", anchor="w")
@@ -261,11 +266,14 @@
 history.column(3, anchor="e")
 
 # Create history Scrollbar
-historyScrollbar = Scrollbar(historyTab, orient=VERTICAL, command=history.yview)
+historyScrollbar = Scrollbar(historyListContainer, orient=VERTICAL, command=history.yview)
 historyScrollbar.pack(side=tk.LEFT, fill="y")
 
 history.configure(yscrollcommand=historyScrollbar.set)
 
+historyBtnContainer = tk.Frame(historyTab)
+historyBtnContainer.pack(fill="x")
+
 # ================================
 #  Daily XP Container
 # ================================
@@ -353,6 +361,30 @@ def resetCallback():
         return
     return
 
+def editElementCallback():
+    currElementFocus = history.focus()
+    currElement = history.item(currElementFocus)
+    currElementID = history.index(currElementFocus)
+
+    if len(currElement["values"]) == 0:
+        return
+
+    editDiag = AddDiag(root, "Edit Element", currElement["values"][0], currElement["values"][1].strip(" XP"))
+    if editDiag.description != currElement["values"][0] or editDiag.xpAmount != currElement["values"][1].strip(" XP"):
+        editElement(currElementID, editDiag.description, int(editDiag.xpAmount))
+
+def deleteElementCallback():
+    currElementFocus = history.focus()
+    currElement = history.item(currElementFocus)
+    currElementID = history.index(currElementFocus)
+
+    if len(currElement["values"]) == 0:
+        return
+
+    res = messagebox.askquestion("Delete Element", "Are you sure, that you want to delete the selected element?\nDescription: " + currElement["values"][0] + "\nAmount: " + currElement["values"][1])
+    if res == "yes":
+        deleteElement(currElementID)
+
 # --------------------------------
 #  Init
 # --------------------------------
@@ -407,6 +439,51 @@ def addXP(description, amount):
 
     writeConfig(vars.CONFIG_PATH, config)
 
+def editElement(index, description, amount):
+    config = readConfig(vars.CONFIG_PATH)
+    historyLen = len(config["history"])
+
+    prevBPLevel = config["activeBPLevel"]
+
+    index = historyLen - 1 - index
+    config["history"][index]["description"] = description
+    config["history"][index]["amount"] = amount
+
+    config = recalcXP(config)
+    deltaBP = prevBPLevel - config["activeBPLevel"]
+    
+    if deltaBP > 0:
+        for i in range(0, deltaBP, 1):
+            messagebox.showinfo("Sorry", "You have lost Battlepass Level " + str(prevBPLevel - i - 1))
+    elif deltaBP < 0:
+        for i in range(0, deltaBP, -1):
+            messagebox.showinfo("Congratulations", "Congratulations! You have unlocked Battlepass Level " + str(-1 * i + prevBPLevel))
+
+    writeConfig(vars.CONFIG_PATH, config)
+    updateValues()
+
+def deleteElement(index):
+    config = readConfig(vars.CONFIG_PATH)
+    historyLen = len(config["history"])
+
+    prevBPLevel = config["activeBPLevel"]
+
+    index = historyLen - 1 - index
+    config["history"].pop(index)
+
+    config = recalcXP(config)
+    deltaBP = prevBPLevel - config["activeBPLevel"]
+    
+    if deltaBP > 0:
+        for i in range(0, deltaBP, 1):
+            messagebox.showinfo("Sorry", "You have lost Battlepass Level " + str(prevBPLevel - i - 1))
+    elif deltaBP < 0:
+        for i in range(0, deltaBP, -1):
+            messagebox.showinfo("Congratulations", "Congratulations! You have unlocked Battlepass Level " + str(-1 * i + prevBPLevel))
+
+    writeConfig(vars.CONFIG_PATH, config)
+    updateValues()
+
 def updateGraph(config, epilogue, plot):
     plot.clear()
     timeAxis = []
@@ -463,10 +540,13 @@ def updateGraph(config, epilogue, plot):
     remainingDays = dateDelta.days
     dayDelta = duration - remainingDays
 
-    dailyProgress, dailyCollected, dailyRemaining, dailyTotal = calcDailyValues(config, epilogue)
+    if date.fromtimestamp(config["history"][len(config["history"]) - 1]["time"]) == date.today(): offset = 1
+    else: offset = 0
+
     totalXPProgress, totalXPCollected, totalXPRemaining, totalXPTotal = calcTotalValues(config, epilogue)
+    dailyTotal = round((totalXPTotal - yAxisYou[index - offset]) / (remainingDays - vars.BUFFER_DAYS))
 
-    yAxisDailyIdeal.append(totalXPCollected)
+    yAxisDailyIdeal.append(yAxisYou[index - offset])
 
     for i in range(1, remainingDays + 1):
         yAxisDailyIdeal.append(yAxisDailyIdeal[i - 1] + dailyTotal)
@@ -562,12 +642,17 @@ def updateValues():
 epilogueCheck = ttk.Checkbutton(buttonContainer, text="Epilogue", onvalue=1, offvalue=0, variable=epilogueVar, command=updateValues)
 epilogueCheck.pack(padx=8, pady=0, side=tk.RIGHT)
 
+editBTN = ttk.Button(historyBtnContainer, text="Edit Element", command=editElementCallback)
+editBTN.pack(side=tk.RIGHT, fill="both", expand=True)
+
+delBTN = ttk.Button(historyBtnContainer, text="Delete Element", command=deleteElementCallback)
+delBTN.pack(side=tk.LEFT, fill="both", expand=True)
+
 # ================================
 #  Main Loop
 # ================================
 
 os.startfile(vars.UPDATER_PATH)
-
 init()
 
 while dailyBar == None:

src/addDiag.py

@@ -2,9 +2,9 @@
 from tkinter import simpledialog, messagebox
 
 class AddDiag(simpledialog.Dialog):
-    def __init__(self, parent, title):
-        self.xpAmount = None
-        self.description = None
+    def __init__(self, parent, title, description=None, amount=None):
+        self.xpAmount = amount
+        self.description = description
         super().__init__(parent, title)
 
     def body(self, frame):
@@ -17,13 +17,17 @@ def body(self, frame):
         self.descriptionBox = Entry(self.descriptionContainer, width=32)
         self.descriptionBox.pack(padx=8, pady=0, side=LEFT)
 
+        if self.description != None: self.descriptionBox.insert(0, self.description)
+
         self.xpAmountContainer = Frame(frame)
         self.xpAmountContainer.pack(padx=8, pady=8)
 
         Label(self.xpAmountContainer, text="XP Amount").pack(padx=8, pady=0, side=LEFT)
         self.xpAmountBox = Entry(self.xpAmountContainer, width=32)
         self.xpAmountBox.pack(padx=8, pady=0, side=LEFT)
 
+        if self.xpAmount != None: self.xpAmountBox.insert(0, self.xpAmount)
+
         return frame
 
     def ok_pressed(self):

src/core.py

@@ -78,4 +78,29 @@ def calcLevelValues(config, epilogue):
     levelRemaining = levelTotal - levelCollected
     levelProgress = round(levelCollected / levelTotal * 100)
 
-    return levelProgress, levelCollected, levelRemaining, levelTotal
+    return levelProgress, levelCollected, levelRemaining, levelTotal
+
+def recalcXP(config):
+    collectedXP = 0
+
+    for i in range(0, len(config["history"])):
+        collectedXP += int(config["history"][i]["amount"])
+    
+    iteration = 2
+    while collectedXP > 0:
+        if iteration < vars.NUM_BPLEVELS:
+            collectedXP -= vars.LEVEL2_OFFSET + iteration * vars.NUM_XP_PER_LEVEL
+        elif iteration < vars.NUM_BPLEVELS + vars.NUM_EPLOGUE_LEVELS:
+            collectedXP -= vars.NUM_EPLOGUE_XP_PER_LEVEL
+        iteration += 1
+
+    iteration -= 1
+    config["activeBPLevel"] = iteration
+
+    if iteration < vars.NUM_BPLEVELS:
+        collectedXP += vars.LEVEL2_OFFSET + iteration * vars.NUM_XP_PER_LEVEL
+    elif iteration < vars.NUM_BPLEVELS + vars.NUM_EPLOGUE_LEVELS:
+        collectedXP += vars.NUM_EPLOGUE_XP_PER_LEVEL
+    
+    config["cXP"] = collectedXP
+    return config

src/updater.py

@@ -16,29 +16,46 @@ def downloadNewVersion(versionString):
     with open(EXE_FILENAME, 'wb') as f:
         f.write(r.content)
 
+    content = []
+    with open(VERSION_PATH, 'r') as f:
+        content = f.readlines()
+    
+    content[0] = versionString
+    for i in range(0, len(content)):
+        if i != len(content) - 1: content[i] += "\n"
+    
     with open(VERSION_PATH, 'w') as f:
-        f.write(versionString)
+        f.writelines(content)
 
 def restartProgram():
     os.startfile(EXE_FILENAME)
 
 def checkNewVersion():
-    response = requests.get("https://api.github.com/repos/" + GITHUB_USER + "/" + GITHUB_REPO + "/releases/latest")
-    latestVersionString = response.json()["tag_name"]
-
     with open(VERSION_PATH, 'r') as f:
-        versionString = f.read() 
+        versionString = f.readlines()[0] 
 
     versionNumber = versionString.split("v")[1]
-    latestVersionNumber = latestVersionString.split("v")[1]
-
-    if(versionNumber < latestVersionNumber):
-        res = messagebox.askquestion("Updater", "A new version is available: " + latestVersionString + "\nDo you want to update?")
-        if res == "yes":
-            downloadNewVersion(latestVersionString)
-            messagebox.showinfo("Updater", "Update complete, program will restart now")
+    
+    response = requests.get("https://api.github.com/repos/" + GITHUB_USER + "/" + GITHUB_REPO + "/releases")
+    releases = response.json()
+
+    for r in releases:
+        tokenized = r["name"].split()
+        if tokenized[0] == GITHUB_REPO:
+            latestVersionString = tokenized[1]
+            latestVersionNumber = latestVersionString.split("v")[1]
+
+            if versionNumber > latestVersionNumber:
+                break
+
+            if versionNumber < latestVersionNumber:
+                res = messagebox.askquestion("Updater", "A new version is available: " + latestVersionString + "\nDo you want to update?")
+                if res == "yes":
+                    downloadNewVersion(latestVersionString)
+                    messagebox.showinfo("Updater", "Update complete, program will restart now")
 
-            restartProgram()
+                    restartProgram()
+                    break
     root.destroy()
 
 checkNewVersion()

src/updaterUpdate.py

@@ -0,0 +1,55 @@
+from tkinter import *
+from tkinter import messagebox
+import os
+import requests
+from vars import *
+
+root = Tk()
+root.withdraw()
+
+def downloadNewUpdaterVersion(versionString):
+    os.system("taskkill /f /im " + "Updater.exe")
+
+    url = "https://github.com/" + GITHUB_USER + "/" + GITHUB_REPO + "/releases/download/" + versionString + "/" + "Updater.exe"
+    r = requests.get(url)
+
+    with open("Updater.exe", 'wb') as f:
+        f.write(r.content)
+    
+    content = []
+    with open(VERSION_PATH, 'r') as f:
+        content = f.readlines()
+    
+    content[1] = versionString
+    for i in range(0, len(content)):
+        if i != len(content) - 1: content[i] += "\n"
+    
+    with open(VERSION_PATH, 'w') as f:
+        f.writelines(content)
+
+def restartUpdater():
+    os.startfile("Updater.exe")
+
+def checkNewUpdaterVersion():
+    with open(VERSION_PATH, 'r') as f:
+        versionString = f.readlines()[1] 
+
+    versionNumber = versionString.split("v")[1]
+    response = requests.get("https://api.github.com/repos/" + GITHUB_USER + "/" + GITHUB_REPO + "/releases")
+    releases = response.json()
+
+    for r in releases:
+        tokenized = r["name"].split()
+        if tokenized[0] == "Updater":
+            latestVersionString = tokenized[1]
+            latestVersionNumber = latestVersionString.split("v")[1]        
+
+            if versionNumber > latestVersionNumber:
+                break
+
+            if versionNumber < latestVersionNumber:
+                downloadNewUpdaterVersion(latestVersionString)
+                restartUpdater()
+                break
+    
+    root.destroy()

version

@@ -1 +1,2 @@
-v1.2
+v1.3
+v1.1