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

[FS family] improved parsing of quoted model strings

Browse Source
This commit is contained in:
Klaus Basan
2020-01-30 18:02:12 +01:00
committed by Mat Sutcliffe
parent b2d94e5f63
commit 9924eb4551
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,15 +433,36 @@ namespace BlackMisc
QString CAircraftCfgParser::getFixedIniLineContent(const QString &line) QString CAircraftCfgParser::getFixedIniLineContent(const QString &line)
{ {
if (line.isEmpty()) { return {}; } if (line.isEmpty()) { return {}; }
int index = line.indexOf('='); const int index = line.indexOf('=');
if (index < 0) { return {}; } if (index < 0) { return {}; }
if (line.length() < index + 1) { return {}; } if (line.length() < index + 1) { return {}; }
QString content(line.midRef(index + 1).trimmed().toString()); QString content(line.midRef(index + 1).trimmed().toString());
// fix "" strings, some are malformed and just contain " at beginning, not at the end // fix "" strings, some are malformed and just contain " at beginning, not at the end
if (content.endsWith('"')) { content.remove(content.size() - 1, 1); } if (hasBalancedQuotes(content, '"'))
if (content.startsWith('"')) { content.remove(0, 1); } {
// seems to be OK
// ex: title=B767-300ER - Condor "Retro Jet"
if (content.size() > 2 && content.startsWith('"') && content.endsWith('"'))
{
// completly in quotes, example title="B767-300ER - Condor Retro Jet"
// we assume the quotes shall be removed
content.remove(0, 1);
content.chop(1);
}
}
else
{
// UNBALANCED
// could be OK, example title=B767-300ER - Condor Retro Jet"
// if (content.endsWith('"')) { content.remove(content.size() - 1, 1); }
// Unlikely, title="B767-300ER - Condor "Retro Jet
if (content.startsWith('"')) { content.remove(0, 1); }
}
// fix C style linebreaks // fix C style linebreaks
content.replace("\\n", " "); content.replace("\\n", " ");