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 #930, use compression enabled functions in specialized readers

Browse Source
This commit is contained in:
Klaus Basan
2017-04-06 03:06:25 +02:00
committed by Mathew Sutcliffe
parent de80053c7c
commit 976af53516
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/db/airportdatareader.cpp
View File

@@ -8,6 +8,7 @@
*/
#include "airportdatareader.h"
#include "blackcore/db/databaseutils.h"
#include "blackcore/application.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/network/networkutils.h"
@@ -67,7 +68,7 @@ namespace BlackCore
int c = 0;
CEntityFlags::Entity reallyRead = CEntityFlags::NoEntity;
const QString airportsJson(CFileUtils::readFileToString(fileName));
const QJsonObject airportsJson(CDatabaseUtils::readQJsonObjectFromDatabaseFile(fileName));
if (!airportsJson.isEmpty())
{
try

13
src/blackcore/db/icaodatareader.cpp
View File

@@ -10,6 +10,7 @@
#include "blackcore/application.h"
#include "blackcore/data/globalsetup.h"
#include "blackcore/db/icaodatareader.h"
#include "blackcore/db/databaseutils.h"
#include "blackmisc/fileutils.h"
#include "blackmisc/json.h"
#include "blackmisc/logmessage.h"
@@ -323,7 +324,7 @@ namespace BlackCore
if (whatToRead.testFlag(CEntityFlags::CountryEntity))
{
const QString fileName = CFileUtils::appendFilePaths(directory.absolutePath(), "countries.json");
const QString countriesJson(CFileUtils::readFileToString(fileName));
const QJsonObject countriesJson(CDatabaseUtils::readQJsonObjectFromDatabaseFile(fileName));
if (countriesJson.isEmpty())
{
msgs.push_back(CStatusMessage(this).error("Failed to read from file/empty file '%1'") << fileName);
@@ -333,7 +334,7 @@ namespace BlackCore
try
{
CCountryList countries;
countries.convertFromJson(Json::jsonObjectFromString(countriesJson));
countries.convertFromJson(countriesJson);
const int c = countries.size();
this->m_countryCache.set(countries);
reallyRead |= CEntityFlags::CountryEntity;
@@ -350,7 +351,7 @@ namespace BlackCore
if (whatToRead.testFlag(CEntityFlags::AircraftIcaoEntity))
{
const QString fileName = CFileUtils::appendFilePaths(directory.absolutePath(), "aircrafticao.json");
const QString aircraftJson(fileName);
const QJsonObject aircraftJson(CDatabaseUtils::readQJsonObjectFromDatabaseFile(fileName));
if (aircraftJson.isEmpty())
{
msgs.push_back(CStatusMessage(this).error("Failed to read from file/empty file '%1'") << fileName);
@@ -360,7 +361,7 @@ namespace BlackCore
try
{
CAircraftIcaoCodeList aircraftIcaos;
aircraftIcaos.convertFromJson(Json::jsonObjectFromString(aircraftJson));
aircraftIcaos.convertFromJson(aircraftJson);
const int c = aircraftIcaos.size();
this->m_aircraftIcaoCache.set(aircraftIcaos);
reallyRead |= CEntityFlags::AircraftIcaoEntity;
@@ -377,7 +378,7 @@ namespace BlackCore
if (whatToRead.testFlag(CEntityFlags::AirlineIcaoEntity))
{
const QString fileName = CFileUtils::appendFilePaths(directory.absolutePath(), "airlineicao.json");
const QString airlineJson(fileName);
const QJsonObject airlineJson(CDatabaseUtils::readQJsonObjectFromDatabaseFile(fileName));
if (airlineJson.isEmpty())
{
msgs.push_back(CStatusMessage(this).error("Failed to read from file/empty file '%1'") << fileName);
@@ -387,7 +388,7 @@ namespace BlackCore
try
{
CAirlineIcaoCodeList airlineIcaos;
airlineIcaos.convertFromJson(Json::jsonObjectFromString(airlineJson));
airlineIcaos.convertFromJson(airlineJson);
const int c = airlineIcaos.size();
this->m_airlineIcaoCache.set(airlineIcaos);
reallyRead |= CEntityFlags::AirlineIcaoEntity;

14
src/blackcore/db/modeldatareader.cpp
View File

@@ -10,6 +10,7 @@
#include "blackcore/application.h"
#include "blackcore/data/globalsetup.h"
#include "blackcore/db/modeldatareader.h"
#include "blackcore/db/databaseutils.h"
#include "blackmisc/fileutils.h"
#include "blackmisc/json.h"
#include "blackmisc/logmessage.h"
@@ -34,6 +35,7 @@ using namespace BlackMisc::Aviation;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Network;
using namespace BlackCore::Data;
using namespace BlackCore::Db;
namespace BlackCore
{
@@ -383,7 +385,7 @@ namespace BlackCore
CStatusMessageList CModelDataReader::readFromJsonFiles(const QString &dir, CEntityFlags::Entity whatToRead)
{
QDir directory(dir);
const QDir directory(dir);
if (!directory.exists())
{
return CStatusMessage(this).error("Missing directory '%1'") << dir;
@@ -396,7 +398,7 @@ namespace BlackCore
if (whatToRead.testFlag(CEntityFlags::LiveryEntity))
{
const QString fileName = CFileUtils::appendFilePaths(directory.absolutePath(), "liveries.json");
const QString liveriesJson(CFileUtils::readFileToString(fileName));
const QJsonObject liveriesJson(CDatabaseUtils::readQJsonObjectFromDatabaseFile(fileName));
if (liveriesJson.isEmpty())
{
msgs.push_back(CStatusMessage(this).error("Failed to read from file/empty file '%1'") << fileName);
@@ -423,7 +425,7 @@ namespace BlackCore
if (whatToRead.testFlag(CEntityFlags::ModelEntity))
{
const QString fileName = CFileUtils::appendFilePaths(directory.absolutePath(), "models.json");
const QString modelsJson(CFileUtils::readFileToString(fileName));
const QJsonObject modelsJson(CDatabaseUtils::readQJsonObjectFromDatabaseFile(fileName));
if (modelsJson.isEmpty())
{
msgs.push_back(CStatusMessage(this).error("Failed to read from file/empty file '%1'") << fileName);
@@ -433,7 +435,7 @@ namespace BlackCore
try
{
CAircraftModelList models;
models.convertFromJson(Json::jsonObjectFromString(modelsJson));
models.convertFromJson(modelsJson);
const int c = models.size();
this->m_modelCache.set(models);
emit dataRead(CEntityFlags::ModelEntity, CEntityFlags::ReadFinished, c);
@@ -450,7 +452,7 @@ namespace BlackCore
if (whatToRead.testFlag(CEntityFlags::DistributorEntity))
{
const QString fileName = CFileUtils::appendFilePaths(directory.absolutePath(), "distributors.json");
const QString distributorsJson(CFileUtils::readFileToString(fileName));
const QJsonObject distributorsJson(CDatabaseUtils::readQJsonObjectFromDatabaseFile(fileName));
if (distributorsJson.isEmpty())
{
msgs.push_back(CStatusMessage(this).error("Failed to read from file/empty file '%1'") << fileName);
@@ -460,7 +462,7 @@ namespace BlackCore
try
{
CDistributorList distributors;
distributors.convertFromJson(Json::jsonObjectFromString(distributorsJson));
distributors.convertFromJson(distributorsJson);
const int c = distributors.size();
this->m_distributorCache.set(distributors);
emit dataRead(CEntityFlags::DistributorEntity, CEntityFlags::ReadFinished, c);