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

Check in readers "for shutdown"

Browse Source 
* myself pattern
* use read as function name
This commit is contained in:
Klaus Basan
2019-02-15 14:17:03 +01:00
committed by Mat Sutcliffe
parent a340167493
commit f2b0417942
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackcore/vatsim/vatsimmetarreader.cpp
View File

@@ -42,12 +42,17 @@ namespace BlackCore
CThreadedReader(owner, "CVatsimMetarReader"),
CEcosystemAware(CEcosystemAware::providerIfPossible(owner))
{
reloadSettings();
this->reloadSettings();
}
void CVatsimMetarReader::readInBackgroundThread()
{
QTimer::singleShot(0, this, &CVatsimMetarReader::readMetars);
QPointer<CVatsimMetarReader> myself(this);
QTimer::singleShot(0, this, [ = ]
{
if (!myself) { return; }
myself->read();
});
}
CMetarList CVatsimMetarReader::getMetars() const
@@ -70,10 +75,10 @@ namespace BlackCore
void CVatsimMetarReader::doWorkImpl()
{
readMetars();
this->read();
}
void CVatsimMetarReader::readMetars()
void CVatsimMetarReader::read()
{
this->threadAssertCheck();
if (!this->doWorkCheck()) { return; }
@@ -122,7 +127,7 @@ namespace BlackCore
{
if (!this->doWorkCheck()) { return; }
const QString line = lineReader.readLine();
CMetar metar = m_metarDecoder.decode(line);
const CMetar metar = m_metarDecoder.decode(line);
if (metar != CMetar()) { metars.push_back(metar); }
else { invalidLines++; }
}
@@ -142,7 +147,7 @@ namespace BlackCore
// network error
CLogMessage(this).warning(u"Reading METARs failed '%1' for '%2'") << nwReply->errorString() << nwReply->url().toString();
nwReply->abort();
emit dataRead(CEntityFlags::MetarEntity, CEntityFlags::ReadFailed, 0);
emit this->dataRead(CEntityFlags::MetarEntity, CEntityFlags::ReadFailed, 0);
}
} // method

2
src/blackcore/vatsim/vatsimmetarreader.h
View File

@@ -74,7 +74,7 @@ namespace BlackCore
void decodeMetars(QNetworkReply *nwReply);
//! Do reading
void readMetars();
void read();
//! Reload settings
void reloadSettings();

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

@@ -47,9 +47,12 @@ namespace BlackCore
void CVatsimStatusFileReader::readInBackgroundThread()
{
const bool s = QMetaObject::invokeMethod(this, &CVatsimStatusFileReader::read);
Q_ASSERT_X(s, Q_FUNC_INFO, "Invoke failed");
Q_UNUSED(s);
QPointer<CVatsimStatusFileReader> myself(this);
QTimer::singleShot(0, this, [ = ]
{
if (!myself) { return; }
myself->read();
});
}
CUrlList CVatsimStatusFileReader::getMetarFileUrls() const