0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: use std::filesystem for overrides

Browse Source 
Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow 2022-08-07 08:50:39 -03:00
parent be3fae6511
commit 1cf949226e
No known key found for this signature in database
GPG Key ID: 8D0F221F0A59F469
1 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
launcher/FileSystem.cpp
View File

@ -403,47 +403,24 @@ bool createShortCut(QString location, QString dest, QStringList args, QString na
#endif #endif
} }
QStringList listFolderPaths(QDir root)
{
auto createAbsPath = [](QFileInfo const& entry) { return FS::PathCombine(entry.path(), entry.fileName()); };
QStringList entries;
root.refresh();
for (auto entry : root.entryInfoList(QDir::Filter::Files)) {
entries.append(createAbsPath(entry));
}
for (auto entry : root.entryInfoList(QDir::Filter::AllDirs | QDir::Filter::NoDotAndDotDot)) {
entries.append(listFolderPaths(createAbsPath(entry)));
}
return entries;
}
bool overrideFolder(QString overwritten_path, QString override_path) bool overrideFolder(QString overwritten_path, QString override_path)
{ {
using copy_opts = std::filesystem::copy_options;
if (!FS::ensureFolderPathExists(overwritten_path)) if (!FS::ensureFolderPathExists(overwritten_path))
return false; return false;
QStringList paths_to_override; std::error_code err;
QDir root_override (override_path); std::filesystem::copy_options opt = copy_opts::recursive | copy_opts::overwrite_existing;
for (auto file : listFolderPaths(root_override)) {
QString destination = file;
destination.replace(override_path, overwritten_path);
ensureFilePathExists(destination);
qDebug() << QString("Applying override %1 in %2").arg(file, destination); std::filesystem::copy(override_path.toStdString(), overwritten_path.toStdString(), opt, err);
if (QFile::exists(destination)) if (err) {
QFile::remove(destination); qCritical() << QString("Failed to apply override from %1 to %2").arg(override_path, overwritten_path);
if (!QFile::rename(file, destination)) { qCritical() << "Reason:" << QString::fromStdString(err.message());
qCritical() << QString("Failed to apply override from %1 to %2").arg(file, destination);
return false;
}
} }
return true; return err.value() == 0;
} }
} }