From 2a70e42a593760af928913a2b0757dd2752d3939 Mon Sep 17 00:00:00 2001 From: Marco Dalla Tiezza Date: Thu, 30 May 2024 12:48:29 +0200 Subject: [PATCH] Changed to GitHub hosted latest software and db version manifest --- artemis/ui/spaceweather.py | 2 +- artemis/utils/constants.py | 4 ++-- artemis/utils/network_utils.py | 2 +- config/release-info.json | 17 +++++++++++++++++ 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 config/release-info.json diff --git a/artemis/ui/spaceweather.py b/artemis/ui/spaceweather.py index 521db71..bee8164 100644 --- a/artemis/ui/spaceweather.py +++ b/artemis/ui/spaceweather.py @@ -50,7 +50,7 @@ class UIspaceweather(QObject): network_manager = self._parent.network_manager network_manager.show_popup = True poseidon_data = network_manager.fetch_remote_json( - Constants.POSEIDON_REPORT + Constants.POSEIDON_REPORT_URL ) if poseidon_data: self.load_poseidon_report.emit(poseidon_data) diff --git a/artemis/utils/constants.py b/artemis/utils/constants.py index f76b6a7..d3d47ec 100644 --- a/artemis/utils/constants.py +++ b/artemis/utils/constants.py @@ -23,8 +23,8 @@ class Constants(): SQL_NAME = 'data.sqlite' - DB_LATEST_VERSION = 'https://www.aresvalley.com/artemis/v4/latest.json' - POSEIDON_REPORT = 'https://www.aresvalley.com/poseidon_engine/data.json' + LATEST_VERSION_URL = 'https://raw.githubusercontent.com/AresValley/Artemis/master/config/release-info.json' + POSEIDON_REPORT_URL = 'https://www.aresvalley.com/poseidon_engine/data.json' DEFAULT_ENCODING = 'utf-8' SYSTEM_LANGUAGE = 'en_US' # locale.getdefaultlocale()[0] diff --git a/artemis/utils/network_utils.py b/artemis/utils/network_utils.py index 083cc2b..7612168 100644 --- a/artemis/utils/network_utils.py +++ b/artemis/utils/network_utils.py @@ -37,7 +37,7 @@ class NetworkManager: popup (bool, optional): Suppress the "already up-to-date" message on startup. Defaults to False. """ - latest_json = self.fetch_remote_json(Constants.DB_LATEST_VERSION) + latest_json = self.fetch_remote_json(Constants.LATEST_VERSION_URL) if latest_json: local_db = self.load_local_db() remote_db = latest_json['sigID_DB'] diff --git a/config/release-info.json b/config/release-info.json new file mode 100644 index 0000000..cf88b28 --- /dev/null +++ b/config/release-info.json @@ -0,0 +1,17 @@ +{ + "sigID_DB": { + "version": 60, + "url": "https://github.com/AresValley/Artemis-DB/releases/download/v60/v60.tar", + "sha256_hash": "78a2c2e5fc00ef4e6c3c975436177eb726fe38ad05463e5cc84b16797225b803", + "total_bytes": 244070400 + }, + "windows": { + "version": "4.0.0" + }, + "linux": { + "version": "4.0.0" + }, + "mac": { + "version": "4.0.0" + } +} \ No newline at end of file