Load/save invalid models to file, originally Ref T247

This commit is contained in:
Klaus Basan
2019-03-16 23:14:32 +01:00
committed by Mat Sutcliffe
parent 8344f03cf3
commit e53e37f770
4 changed files with 66 additions and 3 deletions

View File

@@ -13,6 +13,8 @@
#include "blackmisc/compare.h"
#include "blackmisc/iterator.h"
#include "blackmisc/range.h"
#include "fileutils.h"
#include "directoryutils.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/stringutils.h"
@@ -1560,6 +1562,23 @@ namespace BlackMisc
return stats;
}
CStatusMessage CAircraftModelList::saveInvalidModels() const
{
if (this->isEmpty()) { return CStatusMessage(this).info(u"No models"); }
const QString json = this->toJsonString();
const bool s = CFileUtils::writeStringToFile(json, invalidModelFileAndPath());
if (!s) { return CStatusMessage(this).error(u"Unable to save %1 entries to '%2'") << this->size() << invalidModelFileAndPath(); }
return CStatusMessage(this).info(u"Saved %1 entries to '%2'") << this->size() << invalidModelFileAndPath();
}
CStatusMessage CAircraftModelList::loadInvalidModels()
{
const QString json = CFileUtils::readFileToString(invalidModelFileAndPath());
if (json.isEmpty()) { return CStatusMessage(this).error(u"Unable to read from '%1'") << invalidModelFileAndPath(); }
*this = CAircraftModelList::fromJson(json, true);
return CStatusMessage(this).info(u"Loaded %1 entries from '%2'") << this->size() << invalidModelFileAndPath();
}
CAircraftModelList CAircraftModelList::fromDatabaseJsonCaching(
const QJsonArray &array,
const CAircraftIcaoCodeList &icaos,
@@ -1580,5 +1599,18 @@ namespace BlackMisc
}
return models;
}
const QString &CAircraftModelList::invalidModelFileAndPath()
{
static const QString f = CFileUtils::appendFilePathsAndFixUnc(CDirectoryUtils::logDirectory(), "invalidmodels.json");
return f;
}
bool CAircraftModelList::hasInvalidModelFile()
{
const QFileInfo fi(invalidModelFileAndPath());
return fi.exists();
}
} // namespace
} // namespace

View File

@@ -20,12 +20,13 @@
#include "blackmisc/aviation/liverylist.h"
#include "blackmisc/aviation/callsignobjectlist.h"
#include "blackmisc/db/datastoreobjectlist.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/collection.h"
#include "blackmisc/orderablelist.h"
#include "blackmisc/sequence.h"
#include "blackmisc/statusmessagelist.h"
#include "blackmisc/variant.h"
#include "blackmisc/blackmiscexport.h"
#include <QJsonArray>
#include <QJsonDocument>
@@ -480,6 +481,13 @@ namespace BlackMisc
//! A HTML summary of the data in the list
QString htmlStatistics(bool aircraftStats, bool airlineStats) const;
//! Save/load invalid models @{
CStatusMessage saveInvalidModels() const;
CStatusMessage loadInvalidModels();
static const QString &invalidModelFileAndPath();
static bool hasInvalidModelFile();
//! @}
//! Newer version
static CAircraftModelList fromDatabaseJsonCaching(const QJsonArray &array,
const Aviation::CAircraftIcaoCodeList &aircraftIcaos = {},