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

P3D/FSX parser, skip reading of aircraft.cfg/sim.cfg files

Browse Source 
* actually only aircraft.cfg files should be considered
* we also read sim.cfg files (Robinson)
* results in a lot of trash

https://discordapp.com/channels/539048679160676382/594962359441948682/596359689260761089
This commit is contained in:
Klaus Basan
2019-07-05 01:58:01 +02:00
committed by Mat Sutcliffe
parent 5e7c335a86
commit 419b837b65
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
View File

@@ -158,7 +158,8 @@ namespace BlackMisc
}
// set directory with name filters, get aircraft.cfg and sub directories
QDir dir(directory, "", QDir::Name, QDir::Files | QDir::AllDirs | QDir::NoDotAndDotDot);
static const QString NoNameFilter;
QDir dir(directory, NoNameFilter, QDir::Name, QDir::Files | QDir::AllDirs | QDir::NoDotAndDotDot);
dir.setNameFilters(fileNameFilters());
if (!dir.exists())
{
@@ -170,8 +171,15 @@ namespace BlackMisc
emit this->loadingProgress(this->getSimulator(), QStringLiteral("Parsing '%1'").arg(currentDir), -1);
// Dirs last is crucial, since I will break recursion on "aircraft.cfg" level
// with T514 this behavious has been changed
// with T514 this behaviour has been changed
const QFileInfoList files = dir.entryInfoList(QDir::Files | QDir::AllDirs | QDir::NoDotAndDotDot, QDir::DirsLast);
// the sim.cfg/aircraft.cfg file should have an *.air file sibling
// if not we assume these files can be ignored
const QDir dirForAir(directory, QStringLiteral("*.air"), QDir::Name, QDir::Files | QDir::NoDotAndDotDot);
const int airFilesCount = dirForAir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::DirsLast).size();
const bool hasAirFile = airFilesCount > 0;
for (const auto &fileInfo : files)
{
if (m_cancelLoading) { return CAircraftCfgEntriesList(); }
@@ -194,14 +202,16 @@ namespace BlackMisc
}
else
{
// due to the filter we expect only "aircraft.cfg" here
if (!hasAirFile) { continue; }
// due to the filter we expect only "aircraft.cfg"/"sim.cfg" here
// remark: in a 1st version I have used QSettings to parse to file as ini file
// unfortunately some files are malformed which could end up in wrong data
const QString fileName = fileInfo.absoluteFilePath();
const QString fileName = fileInfo.absoluteFilePath(); // full path and name
bool fileOk = false;
CStatusMessageList fileMsgs;
CAircraftCfgEntriesList fileResults = CAircraftCfgParser::performParsingOfSingleFile(fileName, fileOk, fileMsgs);
const CAircraftCfgEntriesList fileResults = CAircraftCfgParser::performParsingOfSingleFile(fileName, fileOk, fileMsgs);
if (!fileOk)
{
const CStatusMessage m = CStatusMessage(this).warning(u"Parsing of '%1' failed") << fileName;

11
src/blackmisc/simulation/fscommon/fscommonutil.cpp
View File

@@ -421,7 +421,7 @@ namespace BlackMisc
QSet<QString> files;
for (const QString &path : locations)
{
QString pathUp = CFileUtils::appendFilePaths(CFileUtils::pathUp(path), "Lockheed Martin");
const QString pathUp = CFileUtils::appendFilePaths(CFileUtils::pathUp(path), "Lockheed Martin");
const QDir d(pathUp);
if (!d.exists()) { continue; }
@@ -493,8 +493,13 @@ namespace BlackMisc
QSet<QString> CFsCommonUtil::allP3dAddOnSimObjectPaths(const QString &versionHint)
{
const QStringList configFiles = CFsCommonUtil::findP3dAddOnConfigFiles(versionHint).toList();
const QStringList addOnPaths = CFsCommonUtil::allConfigFilesPathValues(configFiles, true, {}).toList();
// all add-ons.cfg files
const QStringList addOnConfigFiles = CFsCommonUtil::findP3dAddOnConfigFiles(versionHint).toList();
// all PATH values in those files
const QStringList addOnPaths = CFsCommonUtil::allConfigFilesPathValues(addOnConfigFiles, true, {}).toList();
// based on all paths of all config
const QSet<QString> all = CFsCommonUtil::allP3dAddOnSimObjectPaths(addOnPaths, true);
return all;
}