Fix updater return type bug
This commit is contained in:
@@ -841,25 +841,6 @@ class App(ctk.CTk):
|
|||||||
if not IS_MACOS:
|
if not IS_MACOS:
|
||||||
w.after(200, lambda: w.grab_set())
|
w.after(200, lambda: w.grab_set())
|
||||||
|
|
||||||
def check_updates(self, manual=False):
|
|
||||||
import threading
|
|
||||||
|
|
||||||
def _do_check():
|
|
||||||
try:
|
|
||||||
has_upd, ver, url = check_for_updates()
|
|
||||||
if has_upd:
|
|
||||||
self.after(0, lambda: self._prompt_update(ver, url))
|
|
||||||
elif manual:
|
|
||||||
self.after(0, lambda: messagebox.showinfo("Updates", "Du bist auf der neuesten Version!"))
|
|
||||||
except Exception as e:
|
|
||||||
if manual:
|
|
||||||
self.after(0, lambda: messagebox.showerror("Fehler", f"Fehler bei Update-Prüfung:\n{e}"))
|
|
||||||
|
|
||||||
if manual:
|
|
||||||
self.after(30, self._activate)
|
|
||||||
|
|
||||||
threading.Thread(target=_do_check, daemon=True).start()
|
|
||||||
|
|
||||||
def _save_s(self, wg, win):
|
def _save_s(self, wg, win):
|
||||||
try:
|
try:
|
||||||
th = int(wg["threads"].get())
|
th = int(wg["threads"].get())
|
||||||
|
|||||||
@@ -51,11 +51,11 @@ def _parse_version(v: str) -> list[int]:
|
|||||||
return parts
|
return parts
|
||||||
|
|
||||||
|
|
||||||
def check_for_updates() -> tuple[bool, str, str]:
|
def check_for_updates() -> dict | None:
|
||||||
"""Prüft, ob auf Gitea ein neues Release (nach SemVer) vorliegt.
|
"""Prüft, ob auf Gitea ein neues Release (nach SemVer) vorliegt.
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
(has_update, new_version_string, asset_download_url)
|
Das Release-Dict (von Gitea) wenn ein Update verfügbar ist, sonst None.
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
req = Request(RELEASES_URL, headers={'User-Agent': 'fcco-Updater/1.0'})
|
req = Request(RELEASES_URL, headers={'User-Agent': 'fcco-Updater/1.0'})
|
||||||
@@ -63,7 +63,7 @@ def check_for_updates() -> tuple[bool, str, str]:
|
|||||||
data = json.loads(resp.read().decode('utf-8'))
|
data = json.loads(resp.read().decode('utf-8'))
|
||||||
|
|
||||||
if not data:
|
if not data:
|
||||||
return False, "", ""
|
return None
|
||||||
|
|
||||||
# Gitea gibt Releases sortiert zurück, 0 = neuestes
|
# Gitea gibt Releases sortiert zurück, 0 = neuestes
|
||||||
release_info = data[0]
|
release_info = data[0]
|
||||||
@@ -74,18 +74,12 @@ def check_for_updates() -> tuple[bool, str, str]:
|
|||||||
|
|
||||||
# Intelligenter Versions-Vergleich
|
# Intelligenter Versions-Vergleich
|
||||||
if _parse_version(latest_version) > _parse_version(CURRENT_VERSION):
|
if _parse_version(latest_version) > _parse_version(CURRENT_VERSION):
|
||||||
# Finde die passende Zip-Datei
|
return release_info
|
||||||
expected_asset = _get_platform_asset_name()
|
|
||||||
for asset in release_info.get("assets", []):
|
|
||||||
if asset.get("name") == expected_asset:
|
|
||||||
return True, latest_version, asset.get("browser_download_url", "")
|
|
||||||
|
|
||||||
return False, "", ""
|
return None
|
||||||
|
|
||||||
return False, "", ""
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Update Check Error: {e}")
|
print(f"Update Check Error: {e}")
|
||||||
return False, "", ""
|
return None
|
||||||
|
|
||||||
|
|
||||||
def _get_platform_asset_name() -> str:
|
def _get_platform_asset_name() -> str:
|
||||||
|
|||||||
Reference in New Issue
Block a user