1
0
mirror of https://github.com/Escartem/AnimeWwise.git synced 2026-06-12 21:00:26 +08:00

fix updates

This commit is contained in:
Escartem
2025-02-20 14:34:07 +01:00
parent 3ee2692e43
commit d5607d5aa1
3 changed files with 27 additions and 29 deletions

18
app.py
View File

@@ -85,8 +85,8 @@ class UpdaterWorker(QObject):
self.progress.emit([0, "Fetching index..."]) self.progress.emit([0, "Fetching index..."])
ver = lambda s: int(s.replace(".", "")) ver = lambda s: int(s.replace(".", ""))
index = open("maps/index.json", "r") index = open("version.json", "r")
currentMaps = json.loads(index.read()) currentMaps = json.loads(index.read())["maps"]
index.close() index.close()
latestMaps = get("https://raw.githubusercontent.com/Escartem/AnimeWwise/master/maps/index.json") latestMaps = get("https://raw.githubusercontent.com/Escartem/AnimeWwise/master/maps/index.json")
@@ -116,15 +116,12 @@ class UpdaterWorker(QObject):
currentMaps["maps"][i]["version"] = latest["version"] currentMaps["maps"][i]["version"] = latest["version"]
# save new index # save new index
index = open("maps/index.json", "w+")
index.write(json.dumps(currentMaps, indent=4))
index.close()
index_sum = sum([ver(e["version"]) for e in currentMaps["maps"]]) index_sum = sum([ver(e["version"]) for e in currentMaps["maps"]])
with open("version.json", "r+") as f: with open("version.json", "r+") as f:
data = json.loads(f.read()) data = json.loads(f.read())
data["mapsVersion"] = index_sum data["mapsVersion"] = index_sum
data["maps"] = currentMaps
f.seek(0) f.seek(0)
f.write(json.dumps(data, indent=4)) f.write(json.dumps(data, indent=4))
f.truncate() f.truncate()
@@ -181,8 +178,10 @@ class AnimeWwise(QMainWindow):
def __init__(self): def __init__(self):
super(AnimeWwise, self).__init__() super(AnimeWwise, self).__init__()
uic.loadUi("gui.ui", self) uic.loadUi("gui.ui", self)
self.maps = self.getJson("maps/index") self.versions = self.getJson("version")
self.setWindowTitle(f'AnimeWwise | v{".".join(list(str(self.getJson("version")["version"])))}') self.version = self.versions["version"]
self.maps = self.version["maps"]
self.setWindowTitle(f'AnimeWwise | v{".".join(list(str(self.version)))}')
self.folders = { self.folders = {
"input": "", "input": "",
"output": "", "output": "",
@@ -203,7 +202,7 @@ class AnimeWwise(QMainWindow):
def checkUpdates(self): def checkUpdates(self):
print("Checking for updates...") print("Checking for updates...")
try: try:
currentVersion = self.getJson("version") currentVersion = self.versions
latestVersionReq = get("https://raw.githubusercontent.com/Escartem/AnimeWwise/master/version.json") latestVersionReq = get("https://raw.githubusercontent.com/Escartem/AnimeWwise/master/version.json")
if latestVersionReq.status_code == 200: if latestVersionReq.status_code == 200:
@@ -217,6 +216,7 @@ class AnimeWwise(QMainWindow):
QMessageBox.information(None, "Info", "Newer version of the mappings are availble, the program will update them now.", QMessageBox.Ok) QMessageBox.information(None, "Info", "Newer version of the mappings are availble, the program will update them now.", QMessageBox.Ok)
self.updaterWindow = Updater() self.updaterWindow = Updater()
self.updaterWindow.exec_() self.updaterWindow.exec_()
self.maps = latestVersion["maps"]
else: else:
print("No updates") print("No updates")
except: except:

View File

@@ -1,19 +0,0 @@
{
"maps": [
{
"name": "hk4e.map",
"game": "Genshin Impact",
"version": "5.3"
},
{
"name": "hkrpg.map",
"game": "Honkai: Star Rail",
"version": "3.0"
},
{
"name": "nap.map",
"game": "Zenless Zone Zero",
"version": "1.4"
}
]
}

View File

@@ -1,4 +1,21 @@
{ {
"version": 220, "version": 220,
"mapsVersion": 97 "mapsVersion": 97,
"maps": [
{
"name": "hk4e.map",
"game": "Genshin Impact",
"version": "5.3"
},
{
"name": "hkrpg.map",
"game": "Honkai: Star Rail",
"version": "3.0"
},
{
"name": "nap.map",
"game": "Zenless Zone Zero",
"version": "1.4"
}
]
} }