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

Improve XP model loader messages

Browse Source 
Change the severity to Error for parser errors and raise a prominent popup with all collected issues.
Also be more explicit from which file and line the error came from.

Maniphest Tasks: T462
This commit is contained in:
Roland Rossgotterer
2019-01-31 13:32:52 +01:00
committed by Mat Sutcliffe
parent 6ea8d16460
commit 6aa1402303
2 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
View File

@@ -170,11 +170,12 @@ namespace BlackMisc
} }
//! Add model only if there no other model with the same model string //! Add model only if there no other model with the same model string
void addUniqueModel(const CAircraftModel &model, CAircraftModelList &models) void CAircraftModelLoaderXPlane::addUniqueModel(const CAircraftModel &model, CAircraftModelList &models)
{ {
if (models.containsModelString(model.getModelString())) if (models.containsModelString(model.getModelString()))
{ {
CLogMessage(static_cast<CAircraftModelLoaderXPlane *>(nullptr)).warning(u"XPlane model '%1' exists already! Potential model string conflict! Ignoring it.") << model.getModelString(); const CStatusMessage m = CStatusMessage(this).warning(u"XPlane model '%1' exists already! Potential model string conflict! Ignoring it.") << model.getModelString();
m_loadingMessages.push_back(m);
} }
models.push_back(model); models.push_back(model);
} }
@@ -187,7 +188,7 @@ namespace BlackMisc
QDir searchPath(rootDirectory, fileFilterFlyable()); QDir searchPath(rootDirectory, fileFilterFlyable());
QDirIterator aircraftIt(searchPath, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); QDirIterator aircraftIt(searchPath, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
emit loadingProgress(this->getSimulator(), QStringLiteral("Parsing '%1'").arg(rootDirectory), -1); emit loadingProgress(this->getSimulator(), QStringLiteral("Parsing flyable airplanes in '%1'").arg(rootDirectory), -1);
CAircraftModelList installedModels; CAircraftModelList installedModels;
while (aircraftIt.hasNext()) while (aircraftIt.hasNext())
@@ -320,7 +321,8 @@ namespace BlackMisc
{ {
if (tokens.size() != 2) if (tokens.size() != 2)
{ {
CLogMessage(this).error(u"XPlane '%1' - '%2': EXPORT_NAME command requires 1 argument.") << path << lineNum; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : EXPORT_NAME command requires 1 argument.") << path << lineNum;
m_loadingMessages.push_back(m);
return false; return false;
} }
@@ -333,7 +335,8 @@ namespace BlackMisc
} }
else else
{ {
CLogMessage(this).error(u"XPlane package name '%1' already in use by '%2' reqested by use by '%3'") << tokens[1] << p->path << path; const CStatusMessage m = CStatusMessage(this).error(u"XPlane package name '%1' already in use by '%2' reqested by use by '%3'") << tokens[1] << p->path << path;
m_loadingMessages.push_back(m);
return false; return false;
} }
} }
@@ -343,13 +346,15 @@ namespace BlackMisc
Q_UNUSED(package); Q_UNUSED(package);
if (tokens.size() != 2) if (tokens.size() != 2)
{ {
CLogMessage(this).error(u"'%1' - '%2': DEPENDENCY command requires 1 argument.") << path << lineNum; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : DEPENDENCY command requires 1 argument.") << path << lineNum;
m_loadingMessages.push_back(m);
return false; return false;
} }
if (std::count_if(m_cslPackages.cbegin(), m_cslPackages.cend(), [&tokens](const CSLPackage & p) { return p.name == tokens[1]; }) == 0) if (std::count_if(m_cslPackages.cbegin(), m_cslPackages.cend(), [&tokens](const CSLPackage & p) { return p.name == tokens[1]; }) == 0)
{ {
CLogMessage(this).error(u"XPlane required package %1 not found. Aborting processing of this package.") << tokens[1]; const CStatusMessage m = CStatusMessage(this).error(u"XPlane required package %1 not found. Aborting processing of this package.") << tokens[1];
m_loadingMessages.push_back(m);
return false; return false;
} }
@@ -373,7 +378,8 @@ namespace BlackMisc
{ {
if (tokens.size() != 2) if (tokens.size() != 2)
{ {
CLogMessage(this).error(u"XPlane '%1' - '%2': OBJECT command requires 1 argument.") << path << lineNum; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : OBJECT command requires 1 argument.") << path << lineNum;
m_loadingMessages.push_back(m);
return false; return false;
} }
@@ -382,7 +388,8 @@ namespace BlackMisc
QString fullPath(relativePath); QString fullPath(relativePath);
if (!doPackageSub(fullPath)) if (!doPackageSub(fullPath))
{ {
CLogMessage(this).error(u"XPlane '%1' - '%2: package not found.") << path << lineNum; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : package not found.") << path << lineNum;
m_loadingMessages.push_back(m);
return false; return false;
} }
@@ -390,7 +397,8 @@ namespace BlackMisc
QFile objFile(fullPath); QFile objFile(fullPath);
if (!objFile.open(QIODevice::ReadOnly | QIODevice::Text)) if (!objFile.open(QIODevice::ReadOnly | QIODevice::Text))
{ {
CLogMessage(this).error(u"XPlane object '%1' does not exist.") << fullPath; const CStatusMessage m = CStatusMessage(this).error(u"XPlane object '%1' does not exist.") << fullPath;
m_loadingMessages.push_back(m);
return false; return false;
} }
QTextStream ts(&objFile); QTextStream ts(&objFile);
@@ -436,7 +444,8 @@ namespace BlackMisc
{ {
if (tokens.size() != 2) if (tokens.size() != 2)
{ {
CLogMessage(this).error(u"XPlane '%1' - '%2': TEXTURE command requires 1 argument.") << path << lineNum; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : TEXTURE command requires 1 argument.") << path << lineNum;
m_loadingMessages.push_back(m);
return false; return false;
} }
@@ -447,14 +456,16 @@ namespace BlackMisc
if (!doPackageSub(absoluteTexPath)) if (!doPackageSub(absoluteTexPath))
{ {
CLogMessage(this).error(u"XPlane '%1' - '%2': package not found.") << path << lineNum; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : package not found.") << path << lineNum;
m_loadingMessages.push_back(m);
return false; return false;
} }
QFileInfo fileInfo(absoluteTexPath); QFileInfo fileInfo(absoluteTexPath);
if (!fileInfo.exists()) if (!fileInfo.exists())
{ {
CLogMessage(this).error(u"XPlane texture '%1' does not exist.") << absoluteTexPath; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : Texture '%1' does not exist.") << path << lineNum << absoluteTexPath;
m_loadingMessages.push_back(m);
return false; return false;
} }
@@ -468,7 +479,9 @@ namespace BlackMisc
// AIRCAFT <min> <max> <path> // AIRCAFT <min> <max> <path>
if (tokens.size() != 4) if (tokens.size() != 4)
{ {
CLogMessage(this).error(u"XPlane '%1' - '%2': AIRCRAFT command requires 3 arguments.") << path << lineNum; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : AIRCRAFT command requires 3 arguments.") << path << lineNum;
m_loadingMessages.push_back(m);
return false;
} }
// Flyable aircrafts are parsed by a different method. We don't know any aircraft files in CSL packages. // Flyable aircrafts are parsed by a different method. We don't know any aircraft files in CSL packages.
@@ -482,7 +495,9 @@ namespace BlackMisc
// OBJ8_AIRCRAFT <path> // OBJ8_AIRCRAFT <path>
if (tokens.size() != 2) if (tokens.size() != 2)
{ {
CLogMessage(this).error(u"XPlane '%1' - '%2': OBJ8_AIRCARFT command requires 1 argument.") << path << lineNum; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : OBJ8_AIRCARFT command requires 1 argument.") << path << lineNum;
m_loadingMessages.push_back(m);
return false;
} }
package.planes.push_back(CSLPlane()); package.planes.push_back(CSLPlane());
@@ -494,7 +509,9 @@ namespace BlackMisc
// OBJ8 <group> <animate YES|NO> <filename> {<texture filename> {<lit texture filename>}} // OBJ8 <group> <animate YES|NO> <filename> {<texture filename> {<lit texture filename>}}
if (tokens.size() < 4 || tokens.size() > 6) if (tokens.size() < 4 || tokens.size() > 6)
{ {
CLogMessage(this).error(u"XPlane '%1' - '%2': OBJ8 command takes 3-5 arguments.") << path << lineNum; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : OBJ8 command takes 3-5 arguments.") << path << lineNum;
m_loadingMessages.push_back(m);
return false;
} }
if (tokens[1] != "SOLID") { return true; } if (tokens[1] != "SOLID") { return true; }
@@ -504,7 +521,8 @@ namespace BlackMisc
QString fullPath(relativePath); QString fullPath(relativePath);
if (!doPackageSub(fullPath)) if (!doPackageSub(fullPath))
{ {
CLogMessage(this).error(u"XPlane '%1' - '%2': package not found.") << path << lineNum; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : package not found.") << path << lineNum;
m_loadingMessages.push_back(m);
return false; return false;
} }
@@ -533,14 +551,16 @@ namespace BlackMisc
if (!doPackageSub(absoluteTexPath)) if (!doPackageSub(absoluteTexPath))
{ {
CLogMessage(this).error(u"XPlane '%1' - '%2': package not found.") << path << lineNum; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : package not found.") << path << lineNum;
m_loadingMessages.push_back(m);
return false; return false;
} }
QFileInfo fileInfo(absoluteTexPath); QFileInfo fileInfo(absoluteTexPath);
if (!fileInfo.exists()) if (!fileInfo.exists())
{ {
CLogMessage(this).error(u"XPlane texture '%1' does not exist.") << absoluteTexPath; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : Texture '%1' does not exist.") << path << lineNum << absoluteTexPath;
m_loadingMessages.push_back(m);
return false; return false;
} }
@@ -563,7 +583,8 @@ namespace BlackMisc
// ICAO <code> // ICAO <code>
if (tokens.size() != 2) if (tokens.size() != 2)
{ {
CLogMessage(this).error(u"XPlane '%1' - '%2': ICAO command requires 1 argument.") << path << lineNum; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : ICAO command requires 1 argument.") << path << lineNum;
m_loadingMessages.push_back(m);
return false; return false;
} }
@@ -577,7 +598,8 @@ namespace BlackMisc
// AIRLINE <code> <airline> // AIRLINE <code> <airline>
if (tokens.size() != 3) if (tokens.size() != 3)
{ {
CLogMessage(this).error(u"XPlane '%1' - '%2': AIRLINE command requires 2 arguments.") << path << lineNum; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : AIRLINE command requires 2 arguments.") << path << lineNum;
m_loadingMessages.push_back(m);
return false; return false;
} }
@@ -593,7 +615,8 @@ namespace BlackMisc
// LIVERY <code> <airline> <livery> // LIVERY <code> <airline> <livery>
if (tokens.size() != 4) if (tokens.size() != 4)
{ {
CLogMessage(this).error(u"XPlane '%1' - '%2': LIVERY command requires 3 arguments.") << path << lineNum; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : LIVERY command requires 3 arguments.") << path << lineNum;
m_loadingMessages.push_back(m);
return false; return false;
} }
@@ -679,21 +702,22 @@ namespace BlackMisc
auto tokens = splitString(line, [](QChar c) { return c.isSpace(); }); auto tokens = splitString(line, [](QChar c) { return c.isSpace(); });
if (!tokens.empty()) if (!tokens.empty())
{ {
const CStatusMessage parserErrorMessage = CStatusMessage(this).error(u"Ignoring rest of CSL package '%1' due to previous parser error. Please fix the error and reload the model cache!") << package.name;
auto it = commands.find(tokens[0]); auto it = commands.find(tokens[0]);
if (it != commands.end()) if (it != commands.end())
{ {
bool result = it.value()(tokens, package, package.path, lineNum); bool result = it.value()(tokens, package, package.path, lineNum);
if (!result) if (!result)
{ {
const CStatusMessage m = CStatusMessage(this).warning(u"XPlane ignoring CSL package '%1'") << package.name; m_loadingMessages.push_back(parserErrorMessage);
m_loadingMessages.push_back(m);
break; break;
} }
} }
else else
{ {
const CStatusMessage m = CStatusMessage(this).warning(u"XPlane unrecognized command '%1' in '%2'") << tokens[0] << package.name; const CStatusMessage m = CStatusMessage(this).error(u"%1/xsb_aircraft.txt Line %2 : Unrecognized CSL command: '%3'") << package.path << lineNum << tokens[0];
m_loadingMessages.push_back(m); m_loadingMessages.push_back(m);
m_loadingMessages.push_back(parserErrorMessage);
break; break;
} }
} }

2
src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.h
View File

@@ -120,6 +120,8 @@ namespace BlackMisc
CSLPackage parsePackageHeader(const QString &path, const QString &content); CSLPackage parsePackageHeader(const QString &path, const QString &content);
void parseFullPackage(const QString &content, CSLPackage &package); void parseFullPackage(const QString &content, CSLPackage &package);
void addUniqueModel(const CAircraftModel &model, CAircraftModelList &models);
QPointer<CWorker> m_parserWorker; //!< worker will destroy itself, so weak pointer QPointer<CWorker> m_parserWorker; //!< worker will destroy itself, so weak pointer
QVector<CSLPackage> m_cslPackages; //!< Parsed Packages. No lock required since accessed only from one thread QVector<CSLPackage> m_cslPackages; //!< Parsed Packages. No lock required since accessed only from one thread