fly/flightgear
1
0
Fork 0
Code Activity

Fix WS 2.0 paths to live inside a Terrain/ prefix

Browse source
This commit is contained in:
James Turner 2017-09-21 17:48:30 +01:00
parent 5fbf5fceab
commit c4aa3434ab
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/GUI/InstallSceneryDialog.cxx
View file

@ -37,6 +37,25 @@
#include <simgear/io/untar.hxx>
class SceneryExtractor : public simgear::TarExtractor
{
public:
SceneryExtractor(const SGPath& root) :
TarExtractor(root)
{}
protected:
auto filterPath(std::string& path) -> PathResult override
{
if ((path.find("Objects/") == 0) || (path.find("Terrain/") == 0)) {
return Accepted;
}
path = "Terrain/" + path;
return Modified;
}
};
class InstallSceneryThread : public QThread
{
Q_OBJECT
@ -93,7 +112,7 @@ private:
void extractNextArchive()
{
SGPath root(m_extractDir.toStdString());
m_untar.reset(new simgear::TarExtractor(root));
m_untar.reset(new SceneryExtractor(root));
QString path = m_remainingPaths.front();
m_remainingPaths.pop_front();