mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 03:39:55 +00:00
Code Issues Projects Releases Wiki Activity

Simplify converting file names into absolute file paths

Browse Source
This commit is contained in:
elsid 2023-03-21 00:42:21 +01:00
parent d18d860ea2
commit de112a2950
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
2 changed files with 23 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
apps/launcher/datafilespage.cpp
View File

@ -98,6 +98,27 @@ namespace Launcher
{
return Settings::Manager::getUInt64("max navmeshdb file size", "Navigator") / (1024 * 1024);
}
std::optional<QString> findFirstPath(const QStringList& directories, const QString& fileName)
{
for (const QString& directoryPath : directories)
{
const QString filePath = QDir(directoryPath).absoluteFilePath(fileName);
if (QFile::exists(filePath))
return filePath;
}
return std::nullopt;
}
QStringList findAllFilePaths(const QStringList& directories, const QStringList& fileNames)
{
QStringList result;
result.reserve(fileNames.size());
for (const QString& fileName : fileNames)
if (const auto filepath = findFirstPath(directories, fileName))
result.append(*filepath);
return result;
}
}
}
@ -305,25 +326,8 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
row++;
}
PathIterator pathIterator(directories);
mSelector->setProfileContent(filesInProfile(contentModelName, pathIterator));
}
QStringList Launcher::DataFilesPage::filesInProfile(const QString& profileName, PathIterator& pathIterator)
{
QStringList files = mLauncherSettings.getContentListFiles(profileName);
QStringList filepaths;
for (const QString& file : files)
{
QString filepath = pathIterator.findFirstPath(file);
if (!filepath.isEmpty())
filepaths << filepath;
}
return filepaths;
mSelector->setProfileContent(
findAllFilePaths(directories, mLauncherSettings.getContentListFiles(contentModelName)));
}
void Launcher::DataFilesPage::saveSettings(const QString& profile)

52
apps/launcher/datafilespage.hpp
View File

@ -140,58 +140,6 @@ namespace Launcher
QStringList selectedFilePaths() const;
QStringList selectedArchivePaths() const;
QStringList selectedDirectoriesPaths() const;
class PathIterator
{
QStringList::ConstIterator mCitEnd;
QStringList::ConstIterator mCitCurrent;
QStringList::ConstIterator mCitBegin;
QString mFile;
QString mFilePath;
public:
PathIterator(const QStringList& list)
{
mCitBegin = list.constBegin();
mCitCurrent = mCitBegin;
mCitEnd = list.constEnd();
}
QString findFirstPath(const QString& file)
{
mCitCurrent = mCitBegin;
mFile = file;
return path();
}
QString findNextPath() { return path(); }
private:
QString path()
{
bool success = false;
QDir dir;
QFileInfo file;
while (!success)
{
if (mCitCurrent == mCitEnd)
break;
dir.setPath(*(mCitCurrent++));
file.setFile(dir.absoluteFilePath(mFile));
success = file.exists();
}
if (success)
return file.absoluteFilePath();
return "";
}
};
QStringList filesInProfile(const QString& profileName, PathIterator& pathIterator);
};
}
#endif