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

Ref T689 Add validation that XP model directories are within the XP sim directory.

Browse Source
This commit is contained in:
Mat Sutcliffe
2019-06-23 17:10:34 +01:00
parent 668a77d083
commit 73d3a341da
4 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackmisc/directoryutils.cpp
View File

@@ -525,6 +525,17 @@ namespace BlackMisc
return d1.absolutePath() == d2.absolutePath();
}
bool CDirectoryUtils::isSubDirectoryOf(const QString &dir1, const QString &dir2)
{
QDir d1(dir1);
const QDir d2(dir2);
do
{
if (d1 == d2) { return true; }
} while (d1.cdUp());
return false;
}
QSet<QString> CDirectoryUtils::fileNamesToQSet(const QFileInfoList &fileInfoList)
{
QSet<QString> sl;

3
src/blackmisc/directoryutils.h
View File

@@ -184,6 +184,9 @@ namespace BlackMisc
//! Same existing directories
static bool isSameExistingDirectory(const QString &dir1, const QString &dir2);
//! Is dir1 a subdirectory (possibly nested) of dir2 or the same directory
static bool isSubDirectoryOf(const QString &dir1, const QString &dir2);
//! Result of directory comparison
struct DirComparison
{

17
src/blackmisc/simulation/settings/simulatorsettings.h
View File

@@ -20,6 +20,7 @@
#include "blackmisc/statusmessage.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/directoryutils.h"
#include <QStringList>
#include <QObject>
@@ -386,6 +387,22 @@ namespace BlackMisc
//! \copydoc BlackMisc::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("XPlane settings"); return name; }
//! \copydoc BlackMisc::TSettingTrait::isValid
static bool isValid(const CSimulatorSettings &value, QString &reason)
{
const QString simDir = value.hasSimulatorDirectory() ? value.getSimulatorDirectory()
: CSpecializedSimulatorSettings::defaultSimulatorDirectory(CSimulatorInfo::XPLANE);
for (const QString &modelDir : value.getModelDirectories())
{
if (!CDirectoryUtils::isSubDirectoryOf(modelDir, simDir))
{
reason = QStringLiteral("Model directory must be within the simulator directory structure");
return false;
}
}
return true;
}
};
//! Trait for simulator settings