mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-16 16:20:53 +00:00
Code Issues Projects Releases Wiki Activity

Catch and log exceptions on loading cell names

Browse Source 
Instead of terminating the process.
This commit is contained in:
elsid 2023-03-20 23:57:53 +01:00
parent 5a691380ea
commit d18d860ea2
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
apps/launcher/utils/cellnameloader.cpp
View File

@ -1,37 +1,45 @@
#include "cellnameloader.hpp"
#include <components/debug/debuglog.hpp>
#include <components/esm3/loadcell.hpp>
#include <components/files/qtconversion.hpp>
QSet<QString> CellNameLoader::getCellNames(QStringList& contentPaths)
QSet<QString> CellNameLoader::getCellNames(const QStringList& contentPaths)
{
QSet<QString> cellNames;
ESM::ESMReader esmReader;
// Loop through all content files
for (auto& contentPath : contentPaths)
for (const QString& contentPath : contentPaths)
{
if (contentPath.endsWith(".omwscripts", Qt::CaseInsensitive))
continue;
esmReader.open(Files::pathFromQString(contentPath));
// Loop through all records
while (esmReader.hasMoreRecs())
try
{
ESM::NAME recordName = esmReader.getRecName();
esmReader.getRecHeader();
esmReader.open(Files::pathFromQString(contentPath));
if (isCellRecord(recordName))
// Loop through all records
while (esmReader.hasMoreRecs())
{
QString cellName = getCellName(esmReader);
if (!cellName.isEmpty())
{
cellNames.insert(cellName);
}
}
ESM::NAME recordName = esmReader.getRecName();
esmReader.getRecHeader();
// Stop loading content for this record and continue to the next
esmReader.skipRecord();
if (isCellRecord(recordName))
{
QString cellName = getCellName(esmReader);
if (!cellName.isEmpty())
{
cellNames.insert(cellName);
}
}
// Stop loading content for this record and continue to the next
esmReader.skipRecord();
}
}
catch (const std::exception& e)
{
Log(Debug::Error) << "Failed to get cell names from " << contentPath.toStdString() << ": " << e.what();
}
}

2
apps/launcher/utils/cellnameloader.hpp
View File

@ -25,7 +25,7 @@ public:
* @param contentPaths the file paths of each content file to be examined
* @return the names of all cells
*/
QSet<QString> getCellNames(QStringList& contentPaths);
QSet<QString> getCellNames(const QStringList& contentPaths);
private:
/**