Fixed Updater and updated README.md

Author: BitTim

.gitignore

@@ -8,4 +8,5 @@ dist/
 *.html
 *.pkg
 *.exe
-*.bak
+*.bak
+build/

README.md

@@ -1,8 +1,8 @@
 # VexTrack
 
-![Status badge](https://img.shields.io/badge/Status-Beta-yellow?style=for-the-badge "Development Status") [![Language badge](https://img.shields.io/badge/Language-Python_3.8.2-inactive?logo=python&logoColor=ffffff&style=for-the-badge)](https://python.org "Language") 
+![Status badge](https://img.shields.io/badge/Status-Stable-green?style=for-the-badge "Development Status") [![Language badge](https://img.shields.io/badge/Language-Python_3.8.2-inactive?logo=python&logoColor=ffffff&style=for-the-badge)](https://python.org "Language") 
 ![GitHub License](https://img.shields.io/github/license/BitTim/ValorantXPCalc?logo=github&style=for-the-badge "License")
 ![GitHub repo size](https://img.shields.io/github/repo-size/BitTim/ValorantXPCalc?logo=github&style=for-the-badge) ![GitHub contributors](https://img.shields.io/github/contributors/BitTim/ValorantXPCalc?logo=github&style=for-the-badge "Contributors") ![GitHub last commit (branch)](https://img.shields.io/github/last-commit/BitTim/ValorantXPCalc?logo=github&style=for-the-badge "Last commit")
 
 ## Installation
-Download zip from ![Here](https://github.com/BitTim/VexTrack/releases/tag/v1.1) and extract VexTrack.exe in a folder. After opening VexTrack fro the first time, a new folder "dat" will be created in the same folder the exe is in automatically.
+Download zip from ![Here](https://github.com/BitTim/VexTrack/releases/tag/latest) and extract all contents in a folder. After opening VexTrack for the first time, a new folder "dat" will be created in the same folder the exe is in automatically.

main.spec Updater.specmain.spec renamed to Updater.spec

@@ -4,7 +4,7 @@
 block_cipher = None
 
 
-a = Analysis(['src\\main.py'],
+a = Analysis(['src\\Updater.py'],
              pathex=['P:\\VexTrack'],
              binaries=[],
              datas=[],
@@ -24,7 +24,7 @@ exe = EXE(pyz,
           a.zipfiles,
           a.datas,
           [],
-          name='main',
+          name='Updater',
           debug=False,
           bootloader_ignore_signals=False,
           strip=False,

VexTrack.spec

@@ -0,0 +1,34 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+
+a = Analysis(['src\\VexTrack.py'],
+             pathex=['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')

build/main/warn-main.txt

@@ -18,15 +18,6 @@ missing module named org - imported by copy (optional)
 missing module named _frozen_importlib_external - imported by importlib._bootstrap (delayed), importlib (optional), importlib.abc (optional), zipimport (top-level)
 excluded module named _frozen_importlib - imported by importlib (optional), importlib.abc (optional), zipimport (top-level), PyInstaller.loader.pyimod02_archive (delayed)
 missing module named urllib.pathname2url - imported by urllib (conditional), PyInstaller.lib.modulegraph._compat (conditional)
-missing module named urllib.getproxies_environment - imported by urllib (conditional), requests.compat (conditional)
-missing module named urllib.proxy_bypass_environment - imported by urllib (conditional), requests.compat (conditional)
-missing module named urllib.proxy_bypass - imported by urllib (conditional), requests.compat (conditional)
-missing module named urllib.getproxies - imported by urllib (conditional), requests.compat (conditional)
-missing module named urllib.urlencode - imported by urllib (conditional), requests.compat (conditional)
-missing module named urllib.unquote_plus - imported by urllib (conditional), requests.compat (conditional)
-missing module named urllib.quote_plus - imported by urllib (conditional), requests.compat (conditional)
-missing module named urllib.unquote - imported by urllib (conditional), requests.compat (conditional)
-missing module named urllib.quote - imported by urllib (conditional), requests.compat (conditional)
 missing module named _posixsubprocess - imported by subprocess (optional), multiprocessing.util (delayed)
 missing module named _posixshmem - imported by multiprocessing.resource_tracker (conditional), multiprocessing.shared_memory (conditional)
 missing module named multiprocessing.set_start_method - imported by multiprocessing (top-level), multiprocessing.spawn (top-level)
@@ -41,7 +32,7 @@ missing module named multiprocessing.AuthenticationError - imported by multiproc
 missing module named asyncio.DefaultEventLoopPolicy - imported by asyncio (delayed, conditional), asyncio.events (delayed, conditional)
 missing module named vms_lib - imported by platform (delayed, conditional, optional)
 missing module named java - imported by platform (delayed)
-missing module named _winreg - imported by platform (delayed, optional), requests.utils (delayed, conditional, optional), pkg_resources._vendor.appdirs (delayed, conditional)
+missing module named _winreg - imported by platform (delayed, optional), pkg_resources._vendor.appdirs (delayed, conditional)
 missing module named readline - imported by cmd (delayed, conditional, optional), code (delayed, conditional, optional), pdb (delayed, optional)
 missing module named 'org.python' - imported by pickle (optional), xml.sax (delayed, conditional), setuptools.sandbox (conditional)
 missing module named posix - imported by os (conditional, optional), shutil (conditional)
@@ -137,9 +128,9 @@ missing module named ordereddict - imported by pyparsing (optional), pkg_resourc
 runtime module named six.moves - imported by cycler (top-level), dateutil.rrule (top-level), dateutil.tz.tz (top-level), dateutil.tz._factories (top-level), dateutil.tz.win (top-level)
 missing module named six.moves.range - imported by six.moves (top-level), dateutil.rrule (top-level)
 missing module named six.moves.zip - imported by six.moves (top-level), cycler (top-level)
-missing module named StringIO - imported by urllib3.packages.six (conditional), requests.compat (conditional), PyInstaller.lib.modulegraph._compat (conditional), PyInstaller.lib.modulegraph.zipio (conditional), setuptools._vendor.six (conditional), six (conditional), pkg_resources._vendor.six (conditional)
+missing module named StringIO - imported by PyInstaller.lib.modulegraph._compat (conditional), PyInstaller.lib.modulegraph.zipio (conditional), setuptools._vendor.six (conditional), six (conditional), pkg_resources._vendor.six (conditional)
 missing module named dateutil.tz.tzfile - imported by dateutil.tz (top-level), dateutil.zoneinfo (top-level)
-missing module named olefile - imported by PIL.FpxImagePlugin (top-level), PIL.MicImagePlugin (top-level)
+missing module named olefile - imported by PIL.MicImagePlugin (top-level), PIL.FpxImagePlugin (top-level)
 missing module named 'PySide2.QtGui' - imported by PIL.ImageQt (conditional, optional)
 missing module named PySide2 - imported by PIL.ImageQt (conditional, optional), matplotlib.backends.qt_compat (delayed, conditional)
 missing module named 'PySide6.QtGui' - imported by PIL.ImageQt (conditional, optional)
@@ -165,19 +156,3 @@ missing module named matplotlib.axes.Axes - imported by matplotlib.axes (delayed
 missing module named _dummy_threading - imported by dummy_threading (optional)
 missing module named pytest - imported by matplotlib (delayed, optional)
 missing module named 'typing.io' - imported by importlib.resources (top-level)
-missing module named Cookie - imported by requests.compat (conditional)
-missing module named cookielib - imported by requests.compat (conditional)
-missing module named urllib2 - imported by requests.compat (conditional)
-missing module named urlparse - imported by requests.compat (conditional)
-missing module named simplejson - imported by requests.compat (optional)
-missing module named backports - imported by urllib3.packages.ssl_match_hostname (optional)
-missing module named brotli - imported by urllib3.util.request (optional), urllib3.response (optional)
-missing module named Queue - imported by urllib3.util.queue (conditional)
-missing module named "'urllib3.packages.six.moves.urllib'.parse" - imported by urllib3.request (top-level), urllib3.poolmanager (top-level)
-runtime module named urllib3.packages.six.moves - imported by http.client (top-level), urllib3.util.response (top-level), urllib3.connectionpool (top-level), 'urllib3.packages.six.moves.urllib' (top-level), urllib3.util.queue (top-level)
-missing module named socks - imported by urllib3.contrib.socks (optional)
-missing module named cryptography - imported by urllib3.contrib.pyopenssl (top-level), requests (conditional, optional)
-missing module named 'OpenSSL.crypto' - imported by urllib3.contrib.pyopenssl (delayed)
-missing module named 'cryptography.x509' - imported by urllib3.contrib.pyopenssl (delayed, optional)
-missing module named 'cryptography.hazmat' - imported by urllib3.contrib.pyopenssl (top-level)
-missing module named OpenSSL - imported by urllib3.contrib.pyopenssl (top-level)

src/main.py src/VexTrack.pysrc/main.py renamed to src/VexTrack.py

@@ -7,7 +7,6 @@
 from tkinter import *
 from tkinter import ttk, messagebox
 from addDiag import AddDiag
-from updater import *
 
 from datetime import *
 
@@ -19,8 +18,11 @@
 
 windowSize = vars.WINDOW_GEOMETRY.split("x")
 
+with open(vars.VERSION_PATH, 'r') as f:
+        versionString = f.read()
+
 root = tk.Tk()
-root.title(vars.WINDOW_TITLE + " " + vars.VERSION_STRING)
+root.title(vars.WINDOW_TITLE + " " + versionString)
 root.iconbitmap("VexTrack.exe")
 root.geometry(vars.WINDOW_GEOMETRY)
 root.minsize(int(windowSize[0]), int(windowSize[1]))
@@ -564,12 +566,12 @@ def updateValues():
 #  Main Loop
 # ================================
 
-checkNewVersion()
+os.startfile(vars.UPDATER_PATH)
+
 init()
 
 while dailyBar == None:
     continue
 
 updateValues()
-
 root.mainloop()

src/updater.py

@@ -1,29 +1,45 @@
+from tkinter import *
 from tkinter import messagebox
 import os
 import requests
 from vars import *
 
+root = Tk()
+root.withdraw()
+
 def downloadNewVersion(versionString):
+    os.system("taskkill /f /im " + EXE_FILENAME)
+
     url = "https://github.com/" + GITHUB_USER + "/" + GITHUB_REPO + "/releases/download/" + versionString + "/" + EXE_FILENAME
     r = requests.get(url)
 
     with open(EXE_FILENAME, 'wb') as f:
-        f.write(r.content) 
+        f.write(r.content)
+    
+    with open(VERSION_PATH, 'w') as f:
+        f.write(versionString)
 
 def restartProgram():
     os.startfile(EXE_FILENAME)
-    exit()
+    root.destroy()
 
 def checkNewVersion():
     response = requests.get("https://api.github.com/repos/" + GITHUB_USER + "/" + GITHUB_REPO + "/releases/latest")
     latestVersionString = response.json()["tag_name"]
 
-    versionNumber = VERSION_STRING.split("v")[1]
+    with open(VERSION_PATH, 'r') as f:
+        versionString = f.read() 
+
+    versionNumber = versionString.split("v")[1]
     latestVersionNumber = latestVersionString.split("v")[1]
 
     if(versionNumber < latestVersionNumber):
-        res = messagebox.askquestion("Updater", "A new version is available: " + latestVersionString + " Do you want to update?")
+        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()
+    root.destroy()
+
+checkNewVersion()

src/vars.py

@@ -8,11 +8,12 @@
 BUFFER_DAYS = 8
 
 CONFIG_PATH = "dat/config.json"
+UPDATER_PATH = "Updater.exe"
+VERSION_PATH = "version"
 
 WINDOW_TITLE = "Vex Track"
 WINDOW_GEOMETRY = "700x640"
 
 GITHUB_USER = "BitTim"
 GITHUB_REPO = "VexTrack"
-EXE_FILENAME = "VexTrack.exe"
-VERSION_STRING = "v1.2"
+EXE_FILENAME = "VexTrack.exe"

version

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