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

refs #887, directories available via CDirectoryUtils/relative paths

Browse Source 
* relative cache/settings paths are available relativeFilePath
* directories build in CDirectoryUtils
* directory comparison in CDirectoryUtils
* using CFileUtils to concatenate dir paths
* using URL encoded string for normalized directory (as it can be decoded)
This commit is contained in:
Klaus Basan
2017-02-22 05:10:24 +01:00
parent f4941b2189
commit 888375d294
8 changed files with 220 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
src/blackmisc/directoryutils.cpp
View File

@@ -10,9 +10,12 @@
//! \cond PRIVATE
#include "blackmisc/directoryutils.h"
#include "blackmisc/fileutils.h"
#include <QCoreApplication>
#include <QDir>
#include <QUrl>
#include <QSet>
#include <QDateTime>
#include <QRegularExpression>
#include <QStandardPaths>
@@ -34,13 +37,11 @@ namespace BlackMisc
QString normalizedApplicationDirectoryImpl()
{
QString appDir = CDirectoryUtils::applicationDirectoryPath().toLower();
QString appDir = CDirectoryUtils::applicationDirectoryPath();
Q_ASSERT(appDir.size() > 0);
// Remove leading '/' on Unix
if (appDir.at(0) == '/') { appDir.remove(0, 1); }
const QRegularExpression re("[:\\\\\\/]");
appDir = appDir.replace(re, "_");
return appDir;
return QUrl::toPercentEncoding(appDir);
}
const QString &CDirectoryUtils::normalizedApplicationDirectory()
@@ -49,15 +50,146 @@ namespace BlackMisc
return appDir;
}
const QString &CDirectoryUtils::getLogDirectory()
const QString &CDirectoryUtils::swiftApplicationDataDirectory()
{
static const QString logPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) +
"/org.swift-project/" +
CDirectoryUtils::normalizedApplicationDirectory() +
"/logs";
return logPath;
static const QString p = CFileUtils::appendFilePaths(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation), "/org.swift-project/");
return p;
}
QFileInfoList CDirectoryUtils::swiftApplicationDataDirectories()
{
QDir swiftAppData(CDirectoryUtils::swiftApplicationDataDirectory()); // contains 1..n subdirs
if (!swiftAppData.isReadable()) return QFileInfoList();
return swiftAppData.entryInfoList({}, QDir::Dirs | QDir::NoDotAndDotDot, QDir::Time);
}
QStringList CDirectoryUtils::swiftApplicationDataDirectoryList(bool withoutCurrent, bool beautify)
{
QStringList dirs;
const QFileInfoList directories(CDirectoryUtils::swiftApplicationDataDirectories());
for (const QFileInfo &info : directories)
{
if (withoutCurrent && info.filePath().contains(normalizedApplicationDirectory(), Qt::CaseInsensitive)) continue;
dirs.append(beautify ?
CDirectoryUtils::decodeNormalizedDirectory(info.fileName()) :
info.fileName());
}
return dirs;
}
const QString &CDirectoryUtils::swiftNormalizedApplicationDataDirectory()
{
static const QString p = CFileUtils::appendFilePaths(swiftApplicationDataDirectory(), normalizedApplicationDirectory());
return p;
}
const QString &CDirectoryUtils::getLogDirectory()
{
static const QString p = CFileUtils::appendFilePaths(swiftNormalizedApplicationDataDirectory(), "/logs");
return p;
}
const QString &CDirectoryUtils::getCrashpadDirectory()
{
static const QString p = CFileUtils::appendFilePaths(swiftNormalizedApplicationDataDirectory(), "/crashpad");
return p;
}
QString CDirectoryUtils::decodeNormalizedDirectory(const QString &directory)
{
return QUrl::fromPercentEncoding(directory.toUtf8());
}
QSet<QString> CDirectoryUtils::fileNamesToQSet(const QFileInfoList &fileInfoList)
{
QSet<QString> sl;
for (const QFileInfo &info : fileInfoList)
{
sl.insert(info.fileName());
}
return sl;
}
QSet<QString> CDirectoryUtils::canonicalFileNamesToQSet(const QFileInfoList &fileInfoList)
{
QSet<QString> sl;
for (const QFileInfo &info : fileInfoList)
{
sl.insert(info.canonicalFilePath());
}
return sl;
}
const QSet<QString> CDirectoryUtils::filesToCanonicalNames(const QSet<QString> &fileNames, const QSet<QString> &canonicalFileNames)
{
QSet<QString> found;
if (fileNames.isEmpty()) return found;
for (const QString &canonical : canonicalFileNames)
{
if (canonical.endsWith('/')) continue;
const QString c = canonical.mid(1 + canonical.lastIndexOf('/'));
if (fileNames.contains(c))
{
found.insert(canonical);
}
}
return found;
}
CDirectoryUtils::DirComparison CDirectoryUtils::compareTwoDirectories(const QString &dirSource, const QString &dirTarget)
{
DirComparison comp;
const QDir d1(dirSource);
const QDir d2(dirTarget);
if (!d1.exists() || !d2.exists()) { return comp; }
const QFileInfoList dSourceList = d1.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::Name);
const QFileInfoList dTargetList = d2.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::Name);
// only names
const QSet<QString> sSourceFiles = CDirectoryUtils::fileNamesToQSet(dSourceList);
const QSet<QString> sTargetFiles = CDirectoryUtils::fileNamesToQSet(dTargetList);
// full paths
const QSet<QString> sSourceCanonicalFiles = CDirectoryUtils::canonicalFileNamesToQSet(dSourceList);
const QSet<QString> sTargetCanonicalFiles = CDirectoryUtils::canonicalFileNamesToQSet(dTargetList);
QSet<QString> missingInTarget(sSourceFiles);
QSet<QString> missingInSource(sTargetFiles);
QSet<QString> sameNames(sSourceFiles);
missingInSource.subtract(sSourceFiles);
missingInTarget.subtract(sTargetFiles);
sameNames.intersect(sTargetFiles);
comp.source = sSourceCanonicalFiles;
comp.missingInSource = CDirectoryUtils::filesToCanonicalNames(missingInSource, sSourceCanonicalFiles);
comp.missingInTarget = CDirectoryUtils::filesToCanonicalNames(missingInTarget, sSourceCanonicalFiles);
comp.sameNameInSource = CDirectoryUtils::filesToCanonicalNames(sameNames, sSourceCanonicalFiles);
comp.sameNameInTarget = CDirectoryUtils::filesToCanonicalNames(sameNames, sTargetCanonicalFiles);
Q_ASSERT_X(comp.sameNameInSource.size() == comp.sameNameInTarget.size(), Q_FUNC_INFO, "Same sets require same size");
QSet<QString>::const_iterator targetIt = comp.sameNameInTarget.begin();
for (const QString &sourceFile : comp.sameNameInSource)
{
const QFileInfo source(sourceFile);
const QFileInfo target(*targetIt++);
if (source.lastModified() == target.lastModified() && source.size() == target.size())
{
// same
}
else if (source.lastModified() < target.lastModified())
{
comp.newerInTarget.insert(target.canonicalFilePath());
}
else
{
// source.lastModified() >= target.lastModified()
comp.newerInSource.insert(source.canonicalFilePath());
}
}
comp.ok = true;
return comp;
}
} // ns
//! \endcond