flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #921, changed setup/reader to distribution URL

Browse Source
This commit is contained in:
Klaus Basan
2017-03-30 17:58:44 +02:00
committed by Mathew Sutcliffe
parent 10c8f7c50a
commit 9faad01c8b
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,10 +155,10 @@ namespace BlackCore
return setup;
}
CUrlList CGlobalSetup::getUpdateInfoFileUrls() const
CUrlList CGlobalSetup::getDistributionUrls() const
{
const CUrlList urls(m_sharedUrls);
return urls.appendPath(CGlobalSetup::versionString() + "/updateinfo/updateinfo.json");
return urls.appendPath(CGlobalSetup::versionString() + "/updateinfo/distribution.json");
}
CUrlList CGlobalSetup::getSwiftDbDataFileLocationUrls() const
@@ -194,8 +194,8 @@ namespace BlackCore
s.append(boolToYesNo(isDevelopment()));
s.append(separator);
s.append("Update info URLs: ");
s.append(getUpdateInfoFileUrls().toQString(i18n));
s.append("Distribution URLs: ");
s.append(getDistributionUrls().toQString(i18n));
s.append(separator);
s.append("Bootstrap URLs: ");
s.append(getBootstrapFileUrls().toQString(i18n));
@@ -270,7 +270,7 @@ namespace BlackCore
case IndexVatsimMetars:
return CVariant::fromValue(this->m_vatsimMetarsUrls);
case IndexUpdateInfo:
return CVariant::fromValue(this->getUpdateInfoFileUrls());
return CVariant::fromValue(this->getDistributionUrls());
case IndexBootstrapFileUrls:
return CVariant::fromValue(this->getBootstrapFileUrls());
case IndexSwiftDbFiles:

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

@@ -132,7 +132,7 @@ namespace BlackCore
BlackMisc::Network::CUrlList getBootstrapFileUrls() const;
//! Version and download locations
BlackMisc::Network::CUrlList getUpdateInfoFileUrls() const;
BlackMisc::Network::CUrlList getDistributionUrls() const;
//! Alternative locations of swift DB data files
BlackMisc::Network::CUrlList getSwiftDbDataFileLocationUrls() const;