mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-02 02:11:32 +00:00
Code Issues Releases Wiki Activity

Make the horrifying content model flags() game search less horrifying

Browse source 
Properly exit early and cache game file check result
This commit is contained in:
Alexei Kotov 2025-05-17 19:02:51 +03:00
parent 045640303f
commit 2c6d11f95e
3 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
components/contentselector/model/contentmodel.cpp
View file

@ -116,37 +116,26 @@ Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex& index
if (file == mGameFile) if (file == mGameFile)
return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable; return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable;
Qt::ItemFlags returnFlags; // files with no dependencies can always be checked
if (file->gameFiles().empty())
return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsDragEnabled;
// addon can be checked if its gamefile is // Show the file if the game it is for is enabled.
// ... special case, addon with no dependency can be used with any gamefile. // NB: The file may theoretically depend on multiple games.
bool gamefileChecked = false; // Early exit means that a file is visible only if its earliest found game dependency is enabled.
bool noGameFiles = true; // This can be counterintuitive, but it is okay for non-bizarre content setups. And also faster.
for (const QString& fileName : file->gameFiles()) for (const EsmFile* depFile : mFiles)
{ {
for (QListIterator<EsmFile*> dependencyIter(mFiles); dependencyIter.hasNext(); dependencyIter.next()) if (depFile->isGameFile() && file->gameFiles().contains(depFile->fileName(), Qt::CaseInsensitive))
{ {
// compare filenames only. Multiple instances if (!depFile->builtIn() && !depFile->fromAnotherConfigFile() && !mCheckedFiles.contains(depFile))
// of the filename (with different paths) is not relevant here.
EsmFile* depFile = dependencyIter.peekNext();
if (!depFile->isGameFile() || depFile->fileName().compare(fileName, Qt::CaseInsensitive) != 0)
continue;
noGameFiles = false;
if (depFile->builtIn() || depFile->fromAnotherConfigFile() || mCheckedFiles.contains(depFile))
{
gamefileChecked = true;
break; break;
}
return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsDragEnabled;
} }
} }
if (gamefileChecked || noGameFiles) return Qt::NoItemFlags;
{
returnFlags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsDragEnabled;
}
return returnFlags;
} }
QVariant ContentSelectorModel::ContentModel::data(const QModelIndex& index, int role) const QVariant ContentSelectorModel::ContentModel::data(const QModelIndex& index, int role) const

10
components/contentselector/model/esmfile.cpp
View file

@ -2,13 +2,15 @@
ContentSelectorModel::EsmFile::EsmFile(const QString& fileName, ModelItem* parent) ContentSelectorModel::EsmFile::EsmFile(const QString& fileName, ModelItem* parent)
: ModelItem(parent) : ModelItem(parent)
, mFileName(fileName)
{ {
setFileName(fileName);
} }
void ContentSelectorModel::EsmFile::setFileName(const QString& fileName) void ContentSelectorModel::EsmFile::setFileName(const QString& fileName)
{ {
mFileName = fileName; mFileName = fileName;
mHasGameExtension = (mFileName.endsWith(QLatin1String(".esm"), Qt::CaseInsensitive)
|| mFileName.endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive));
} }
void ContentSelectorModel::EsmFile::setAuthor(const QString& author) void ContentSelectorModel::EsmFile::setAuthor(const QString& author)
@ -53,9 +55,7 @@ void ContentSelectorModel::EsmFile::setFromAnotherConfigFile(bool fromAnotherCon
bool ContentSelectorModel::EsmFile::isGameFile() const bool ContentSelectorModel::EsmFile::isGameFile() const
{ {
return (mGameFiles.size() == 0) return mHasGameExtension && mGameFiles.empty();
&& (mFileName.endsWith(QLatin1String(".esm"), Qt::CaseInsensitive)
|| mFileName.endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive));
} }
QVariant ContentSelectorModel::EsmFile::fileProperty(const FileProperty prop) const QVariant ContentSelectorModel::EsmFile::fileProperty(const FileProperty prop) const
@ -108,7 +108,7 @@ void ContentSelectorModel::EsmFile::setFileProperty(const FileProperty prop, con
switch (prop) switch (prop)
{ {
case FileProperty_FileName: case FileProperty_FileName:
mFileName = value; setFileName(value);
break; break;
case FileProperty_Author: case FileProperty_Author:

1
components/contentselector/model/esmfile.hpp
View file

@ -102,6 +102,7 @@ namespace ContentSelectorModel
QString mToolTip; QString mToolTip;
bool mBuiltIn = false; bool mBuiltIn = false;
bool mFromAnotherConfigFile = false; bool mFromAnotherConfigFile = false;
bool mHasGameExtension = false;
}; };
} }