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

Ref T172, adjustments for ecosystem

Browse Source 
* stricter equal comparison ("changed" flag)
* set VATSIM server type and ecosystem in VATSIM reader
This commit is contained in:
Klaus Basan
2017-12-28 18:34:33 +01:00
parent 5f90497626
commit 1f9337609a
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/data/vatsimsetup.cpp
View File

@@ -33,8 +33,7 @@ namespace BlackCore
bool CVatsimSetup::setServers(const CServerList &fsdServers, const CServerList &voiceServers)
{
const bool changed = !this->getVoiceServers().equalsByKeys(voiceServers, &CServer::getName, &CServer::getAddress) ||
!this->getFsdServers().equalsByKeys(fsdServers, &CServer::getName, &CServer::getAddress);
const bool changed = (this->getVoiceServers() != voiceServers || this->getFsdServers() != fsdServers);
this->setFsdServers(fsdServers);
this->setVoiceServers(voiceServers);
return changed;

9
src/blackcore/vatsim/vatsimdatafilereader.cpp
View File

@@ -355,7 +355,9 @@ namespace BlackCore
if (fsdServerParts.size() < 5) break;
if (!fsdServerParts.at(4).trimmed().contains('1')) break; // allowed?
const QString description(fsdServerParts.at(2)); // part(3) could be added
const BlackMisc::Network::CServer fsdServer(fsdServerParts.at(0), description, fsdServerParts.at(1), 6809, CUser("id", "real name", "email", "password"));
const CServer fsdServer(fsdServerParts.at(0), description, fsdServerParts.at(1), 6809,
CUser("id", "real name", "email", "password"),
CFsdSetup::vatsimStandard(), CEcosystem(CEcosystem::VATSIM), CServer::FSDServerVatsim);
fsdServers.push_back(fsdServer);
}
break;
@@ -365,7 +367,9 @@ namespace BlackCore
const QStringList voiceServerParts = currentLine.split(':');
if (voiceServerParts.size() < 3) break;
if (!voiceServerParts.at(3).trimmed().contains('1')) break; // allowed?
const BlackMisc::Network::CServer voiceServer(voiceServerParts.at(1), voiceServerParts.at(2), voiceServerParts.at(0), -1, CUser());
const CServer voiceServer(voiceServerParts.at(1), voiceServerParts.at(2), voiceServerParts.at(0), -1,
CUser(),
CFsdSetup(), CEcosystem(CEcosystem::VATSIM), CServer::VoiceServerVatsim);
voiceServers.push_back(voiceServer);
}
break;
@@ -377,7 +381,6 @@ namespace BlackCore
} // for each line
// Setup for VATSIM servers and sorting for comparison
fsdServers.setFsdSetup(CFsdSetup::vatsimStandard());
fsdServers.sortBy(&CServer::getName, &CServer::getDescription);
voiceServers.sortBy(&CServer::getName, &CServer::getDescription);