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

refs #649, refs #656, using caches in ICAO data reader

Browse Source 
* access to info data reader (get DB metadata)
* adjusted database base class to support caches, info objects
* moved classes to subdir
This commit is contained in:
Klaus Basan
2016-05-24 00:36:06 +02:00
parent 6b7e05077c
commit 954ddfb2e7
10 changed files with 1171 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/blackcore/webdataservices.h
View File

@@ -14,6 +14,7 @@
#include "blackcore/blackcoreexport.h"
#include "blackcore/webreaderflags.h"
#include "blackcore/db/databasereader.h"
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/aircrafticaocodelist.h"
#include "blackmisc/aviation/airlineicaocode.h"
@@ -48,6 +49,8 @@
namespace BlackMisc
{
class CLogCategoryList;
template <typename T> class Restricted;
namespace Aviation { class CCallsign; }
namespace Simulation { class CSimulatedAircraft; }
}
@@ -55,14 +58,19 @@ namespace BlackMisc
namespace BlackCore
{
class CApplication;
class CDatabaseWriter;
class CIcaoDataReader;
class CModelDataReader;
class CVatsimBookingReader;
class CVatsimDataFileReader;
class CVatsimMetarReader;
class CVatsimStatusFileReader;
namespace Db
{
class CDatabaseWriter;
class CIcaoDataReader;
class CModelDataReader;
class CInfoDataReader;
}
/*!
* Encapsulates reading data from web sources
*/
@@ -76,7 +84,7 @@ namespace BlackCore
static const BlackMisc::CLogCategoryList &getLogCategories();
//! Constructor, only allowed from BlackCore::CApplication
CWebDataServices(CWebReaderFlags::WebReader readerFlags, CWebReaderFlags:: DbReaderHint hint, BlackMisc::Restricted<CApplication>, QObject *parent = nullptr);
CWebDataServices(CWebReaderFlags::WebReader readerFlags, const BlackCore::Db::CDatabaseReaderConfigList &dbReaderConfig, BlackMisc::Restricted<CApplication>, QObject *parent = nullptr);
//! Shutdown
void gracefulShutdown();
@@ -93,15 +101,15 @@ namespace BlackCore
//! Metar reader
CVatsimMetarReader *getMetarReader() const { return m_vatsimMetarReader; }
//! Info data reader
Db::CInfoDataReader *getInfoDataReader() const { return m_infoDataReader; }
//! DB writer class
CDatabaseWriter *getDatabaseWriter() const { return m_databaseWriter; }
Db::CDatabaseWriter *getDatabaseWriter() const { return m_databaseWriter; }
//! Reader flags
CWebReaderFlags::WebReader getReaderFlags() const { return m_readerFlags; }
//! Reader flags
CWebReaderFlags::DbReaderHint getDbHint() const { return m_dbHint; }
//! FSD servers
//! \threadsafe
BlackMisc::Network::CServerList getVatsimFsdServers() const;
@@ -295,7 +303,7 @@ namespace BlackCore
//! Data file has been read
void ps_dataFileRead(int lines);
//! Read from model reader
//! Read finished from reader
void ps_readFromSwiftDb(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number);
//! Setup changed
@@ -308,20 +316,25 @@ namespace BlackCore
//! Init the writers
void initWriters();
CWebReaderFlags::WebReader m_readerFlags = CWebReaderFlags::WebReaderFlag::None; //!< which readers are available
CWebReaderFlags::DbReaderHint m_dbHint = CWebReaderFlags::NoHint; //!< how to read DB data
bool m_initialRead = false; //!< Initial read conducted
//! Call CWebDataServices::readInBackground by single shot
void singleShotReadInBackground(BlackMisc::Network::CEntityFlags::Entity entities, int delayMs);
CWebReaderFlags::WebReader m_readerFlags = CWebReaderFlags::WebReaderFlag::None; //!< which readers are available
BlackCore::Db::CDatabaseReaderConfigList m_dbReaderConfig; //!< how to read DB data
bool m_initialRead = false; //!< Initial read started
int m_infoObjectTrials = 0; //!< Tried to read info objects
// for reading XML and VATSIM data files
CVatsimStatusFileReader *m_vatsimStatusReader = nullptr;
CVatsimBookingReader *m_vatsimBookingReader = nullptr;
CVatsimDataFileReader *m_vatsimDataFileReader = nullptr;
CVatsimMetarReader *m_vatsimMetarReader = nullptr;
CIcaoDataReader *m_icaoDataReader = nullptr;
CModelDataReader *m_modelDataReader = nullptr;
Db::CIcaoDataReader *m_icaoDataReader = nullptr;
Db::CModelDataReader *m_modelDataReader = nullptr;
Db::CInfoDataReader *m_infoDataReader = nullptr;
// writing objects directly into DB
CDatabaseWriter *m_databaseWriter = nullptr;
Db::CDatabaseWriter *m_databaseWriter = nullptr;
};
} // namespace