From e0a4bd6a5d804c3439ca75696d39fb67e75d2ecf Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Sun, 31 Dec 2023 00:03:30 -0600 Subject: [PATCH] Core: Update information will be retrieved from GitHub repo only --- src/application.py | 3 +-- src/update/updater.py | 11 ++++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/application.py b/src/application.py index 0d277c50..dc0b82bc 100644 --- a/src/application.py +++ b/src/application.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- name = 'TWBlue' short_name='twblue' -update_url = 'https://twblue.es/updates/updates.php' -mirror_update_url = 'https://raw.githubusercontent.com/mcv-software/TWBlue/next-gen/updates/updates.json' +update_url = 'https://raw.githubusercontent.com/mcv-software/TWBlue/next-gen/updates/updates.json' authors = ["Manuel Cortéz", "José Manuel Delicado"] authorEmail = "manuel@manuelcortez.net" copyright = "Copyright (C) 2013-2023, MCV Software." diff --git a/src/update/updater.py b/src/update/updater.py index 99fedd19..473b20a3 100644 --- a/src/update/updater.py +++ b/src/update/updater.py @@ -13,11 +13,8 @@ def do_update(endpoint=application.update_url): return False try: result = update.perform_update(endpoint=endpoint, current_version=application.version, app_name=application.name, update_available_callback=available_update_dialog, progress_callback=progress_callback, update_complete_callback=update_finished) + return result except: - if endpoint == application.update_url: - logger.error("Update failed! Using mirror URL...") - return do_update(endpoint=application.mirror_update_url) - else: - logger.exception("Update failed.") - output.speak("An exception occurred while attempting to update " + application.name + ". If this message persists, contact the " + application.name + " developers. More information about the exception has been written to the error log.",True) - return result + logger.exception("Update failed.") + output.speak("An exception occurred while attempting to update " + application.name + ". If this message persists, contact the " + application.name + " developers. More information about the exception has been written to the error log.",True) + return None