diff --git a/src/core/interface/gui.py b/src/core/interface/gui.py index 03fc007..0b8f224 100644 --- a/src/core/interface/gui.py +++ b/src/core/interface/gui.py @@ -205,11 +205,9 @@ def _download_update(assets): time.sleep(1) sys.exit(0) - def windowCloseHelper(): QGuiApplication.quit() - class ElidedItemDelegate(QStyledItemDelegate): def __init__(self, get_hovered_row, parent=None): super().__init__(parent) @@ -274,13 +272,13 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): state.version = build_info.get("version") if state.ignore_updates is False and platform.system() == "Windows": - assets = get_updates() + assets, latest = get_updates() if assets != None: msg = QMessageBox() msg.setIcon(QMessageBox.Icon.Information) msg.setWindowTitle("Update Available") - msg.setText("A new version is available.") - msg.setInformativeText("Press Ok to download the update.") + msg.setText(f"A new version is available\n({latest})") + msg.setInformativeText("Press Ok to download.") msg.setStandardButtons(QMessageBox.StandardButton.Ok | QMessageBox.StandardButton.Ignore) response = msg.exec_() if response == QMessageBox.StandardButton.Ok: diff --git a/src/core/utils/network/update_checker.py b/src/core/utils/network/update_checker.py index 700af59..a82c2ce 100644 --- a/src/core/utils/network/update_checker.py +++ b/src/core/utils/network/update_checker.py @@ -4,7 +4,6 @@ from core.utils.logging.logs import consoleLog def get_updates(): url = f"https://api.github.com/repos/KeksPirates/SoftwareManager/releases/latest" - try: response = requests.get(url, timeout=15) except requests.RequestException as e: @@ -33,9 +32,9 @@ def get_updates(): url=asset['browser_download_url'], hash=asset.get('digest') )) - return release_assets + return release_assets, latest_version else: - return None + return None, None else: consoleLog("Already up-to-date.") - return None + return None, None