fly/flightgear
1
0
Fork 0
Code Activity

Launcher: improve local -set.xml scanning

Browse source 
Fix some more cases found by LarsT, where -set.xml scanning would
failure due to include paths.
This commit is contained in:
James Turner 2020-06-23 23:13:43 +01:00
parent 8a35be7798
commit c07a4c2df9
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/GUI/LocalAircraftCache.cxx
View file

@ -278,18 +278,23 @@ QVariant AircraftItem::status(int variant)
} }
// ensure references to Aircraft/ foo are resolved. This happens when // ensure references to Aircraft/foo and <my-aircraft-dir>/foo are resolved. This happens when
// aircraft reference a path (probably to themselves) in their -set.xml // aircraft reference a path (probably to themselves) in their -set.xml
class CurrentScanDirProvider : public simgear::ResourceProvider class ScanDirProvider : public simgear::ResourceProvider
{ {
public: public:
CurrentScanDirProvider() : simgear::ResourceProvider(simgear::ResourceManager::PRIORITY_NORMAL) {} ScanDirProvider() : simgear::ResourceProvider(simgear::ResourceManager::PRIORITY_NORMAL) {}
~CurrentScanDirProvider() = default; ~ScanDirProvider() = default;
SGPath resolve(const std::string& aResource, SGPath& aContext) const override SGPath resolve(const std::string& aResource, SGPath& aContext) const override
{ {
Q_UNUSED(aContext) Q_UNUSED(aContext)
SGPath ap = _currentAircraftPath / aResource;
if (ap.exists())
return ap;
string_list pieces(sgPathBranchSplit(aResource)); string_list pieces(sgPathBranchSplit(aResource));
if ((pieces.size() < 3) || (pieces.front() != "Aircraft")) { if ((pieces.size() < 3) || (pieces.front() != "Aircraft")) {
return SGPath{}; // not an Aircraft path return SGPath{}; // not an Aircraft path
@ -308,8 +313,14 @@ public:
_currentScanPath = p; _currentScanPath = p;
} }
void setCurrentAircraftPath(const SGPath& p)
{
_currentAircraftPath = p;
}
private: private:
SGPath _currentScanPath; SGPath _currentScanPath;
SGPath _currentAircraftPath;
}; };
class AircraftScanThread : public QThread class AircraftScanThread : public QThread
@ -321,7 +332,7 @@ public:
m_done(false) m_done(false)
{ {
auto rm = simgear::ResourceManager::instance(); auto rm = simgear::ResourceManager::instance();
m_currentScanDir.reset(new CurrentScanDirProvider); m_currentScanDir.reset(new ScanDirProvider);
rm->addProvider(m_currentScanDir.get()); rm->addProvider(m_currentScanDir.get());
} }
@ -423,6 +434,11 @@ private:
QMap<QString, AircraftItemPtr> baseAircraft; QMap<QString, AircraftItemPtr> baseAircraft;
QList<AircraftItemPtr> variants; QList<AircraftItemPtr> variants;
// ensure aircraft dir is available to simgear::ResourceProvider
// otherwise some aircraft -set.xml includes fail
const auto p = SGPath::fromUtf8(child.absoluteFilePath().toUtf8().toStdString());
m_currentScanDir->setCurrentAircraftPath(p);
Q_FOREACH(QFileInfo xmlChild, childDir.entryInfoList(filters, QDir::Files)) { Q_FOREACH(QFileInfo xmlChild, childDir.entryInfoList(filters, QDir::Files)) {
try { try {
QString absolutePath = xmlChild.absoluteFilePath(); QString absolutePath = xmlChild.absoluteFilePath();
@ -493,7 +509,7 @@ private:
QMap<QString, AircraftItemPtr > m_nextCache; QMap<QString, AircraftItemPtr > m_nextCache;
bool m_done; bool m_done;
std::unique_ptr<CurrentScanDirProvider> m_currentScanDir; std::unique_ptr<ScanDirProvider> m_currentScanDir;
}; };
static std::unique_ptr<LocalAircraftCache> static_cacheInstance; static std::unique_ptr<LocalAircraftCache> static_cacheInstance;