flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 06:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove sync of updateinfo

Browse Source 
The update info is already automatically fetched from GitHub instead of
using the distribution.json from the datastore
This commit is contained in:
Lars Toenning
2024-03-09 22:21:12 +01:00
parent 4298d38ee7
commit ad96d38389
5 changed files with 1 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
resources/share/shared/updateinfo/distribution.json
View File

@@ -1,25 +0,0 @@
[
{
"channel": "ALPHA",
"restricted": true,
"url0": "https:\/\/datastore.swift-project.org\/page\/alpha.html",
"url1": null,
"url2": null,
"url3": null,
"url4": null,
"platforms": {
"linux-64": [
"swift-installer-0.7.1-linux-64_2017-01-08_22-17-19.run"
],
"linux-64-vatsim": [
"swift-installer-0.7.3-linux-64_2017-03-13_17-24-46.run"
],
"win-64-vatsim": [
"swift-installer-0.7.3-win-64_2017-03-13_17-25-52.exe"
]
},
"id": 1,
"tsLastUpdated": "2017-03-30 14:15:51",
"tsCreated": "2017-03-25 23:32:52"
}
]

3
resources/share/shared/updateinfo/distribution.json.license
View File

@@ -1,3 +0,0 @@
Copyright (C) swift Project Community / Contributors
SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1

10
scripts/datastore.py
View File

@@ -231,17 +231,8 @@ class DbDataSync(BaseSync):
write_json_to_file(file_path, j, timestamp)
class UpdateInfoSync(BaseSync):
def __init__(self, host, version, target_path):
BaseSync.__init__(self, host, version, target_path)
def sync(self):
self.sync_file('updateinfo', 'distribution.json')
def update_shared(host, version, target_path):
DbDataSync(host, version, target_path).sync()
UpdateInfoSync(host, version, target_path).sync()
def main():
@@ -250,7 +241,6 @@ def main():
target_path = os.path.abspath(os.curdir)
DbDataSync(host, version, target_path).sync()
UpdateInfoSync(host, version, target_path).sync()
if __name__ == '__main__':

8
src/blackcore/data/globalsetup.cpp
View File

@@ -55,11 +55,6 @@ namespace BlackCore::Data
return m_sharedUrls;
}
CUrlList CGlobalSetup::getSwiftUpdateInfoFileUrls() const
{
return getSwiftSharedUrls().withAppendedPath(CGlobalSetup::schemaVersionString() + "/updateinfo/updateinfo.json");
}
CUrl CGlobalSetup::getDbHomePageUrl() const
{
return getDbRootDirectoryUrl().withAppendedPath("/page/index.php");
@@ -184,7 +179,7 @@ namespace BlackCore::Data
QString s =
u"Global setup loaded: " % separator % u"Mapping min.version: " % this->getMappingMinimumVersionString() % separator
% u"Distribution URLs: " % getSwiftUpdateInfoFileUrls().toQString(i18n) % separator % u"Help URLs: " % m_onlineHelpUrls.toQString(i18n) % separator;
% u"Help URLs: " % m_onlineHelpUrls.toQString(i18n) % separator;
s +=
u"DB root directory: " % getDbRootDirectoryUrl().toQString(i18n) % separator % u"ICAO DB reader: " % getDbIcaoReaderUrl().toQString(i18n) % separator % u"Model DB reader: " % getDbModelReaderUrl().toQString(i18n) % separator % u"Airport DB reader: " % getDbAirportReaderUrl().toQString(i18n) % separator % u"DB home page: " % getDbHomePageUrl().toQString(i18n) % separator % u"DB login service: " % getDbLoginServiceUrl().toQString(i18n) % separator % u"DB client ping service: " % getDbClientPingServiceUrl().toQString(i18n);
s +=
@@ -218,7 +213,6 @@ namespace BlackCore::Data
case IndexVatsimServer: return QVariant::fromValue(m_vatsimServerFileUrl);
case IndexVatsimHttpFsd: return QVariant::fromValue(m_vatsimFsdHttpUrl);
case IndexVatsimMetars: return QVariant::fromValue(m_vatsimMetarsUrls);
case IndexUpdateInfoFileUrls: return QVariant::fromValue(this->getSwiftUpdateInfoFileUrls());
case IndexSharedUrls: return QVariant::fromValue(m_sharedUrls);
case IndexOnlineHelpUrls: return QVariant::fromValue(m_onlineHelpUrls);
case IndexCrashReportServerUrl: return QVariant::fromValue(m_crashReportServerUrl);

6
src/blackcore/data/globalsetup.h
View File

@@ -44,8 +44,6 @@ namespace BlackCore::Data
IndexVatsimData,
IndexVatsimServer,
IndexVatsimHttpFsd,
IndexSwiftDbFiles,
IndexUpdateInfoFileUrls,
IndexOnlineHelpUrls,
IndexCrashReportServerUrl,
IndexSharedUrls,
@@ -132,10 +130,6 @@ namespace BlackCore::Data
//! Shared URLs
const BlackMisc::Network::CUrlList &getSwiftSharedUrls() const;
//! Distribution URLs
//! \remark based on getSwiftSharedUrls
BlackMisc::Network::CUrlList getSwiftUpdateInfoFileUrls() const;
//! VATSIM METAR URL
const BlackMisc::Network::CUrlList &getVatsimMetarsUrls() const { return m_vatsimMetarsUrls; }