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

Launcher, content selector: support ESM4 files

Browse source 
Cell name loader ignores ESM4 files
This commit is contained in:
Alexei Dobrohotov 2023-07-11 00:40:23 +03:00
parent d9027f7eef
commit d589b46f96
2 changed files with 67 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/launcher/utils/cellnameloader.cpp
View file

@ -1,7 +1,11 @@
#include "cellnameloader.hpp" #include "cellnameloader.hpp"
#include <fstream>
#include <components/debug/debuglog.hpp> #include <components/debug/debuglog.hpp>
#include <components/esm/format.hpp>
#include <components/esm3/loadcell.hpp> #include <components/esm3/loadcell.hpp>
#include <components/files/openfile.hpp>
#include <components/files/qtconversion.hpp> #include <components/files/qtconversion.hpp>
QSet<QString> CellNameLoader::getCellNames(const QStringList& contentPaths) QSet<QString> CellNameLoader::getCellNames(const QStringList& contentPaths)
@ -16,7 +20,17 @@ QSet<QString> CellNameLoader::getCellNames(const QStringList& contentPaths)
continue; continue;
try try
{ {
esmReader.open(Files::pathFromQString(contentPath)); std::filesystem::path filepath = Files::pathFromQString(contentPath);
auto stream = Files::openBinaryInputFileStream(filepath);
if (!stream->is_open())
continue;
const ESM::Format format = ESM::readFormat(*stream);
if (format != ESM::Format::Tes3)
continue;
stream->seekg(0);
esmReader.open(std::move(stream), filepath);
// Loop through all records // Loop through all records
while (esmReader.hasMoreRecs()) while (esmReader.hasMoreRecs())

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

@ -1,13 +1,17 @@
#include "contentmodel.hpp" #include "contentmodel.hpp"
#include "esmfile.hpp" #include "esmfile.hpp"
#include <fstream>
#include <stdexcept> #include <stdexcept>
#include <unordered_set> #include <unordered_set>
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
#include <components/esm/format.hpp>
#include <components/esm3/esmreader.hpp> #include <components/esm3/esmreader.hpp>
#include <components/esm4/reader.hpp>
#include <components/files/openfile.hpp>
#include <components/files/qtconversion.hpp> #include <components/files/qtconversion.hpp>
ContentSelectorModel::ContentModel::ContentModel(QObject* parent, QIcon warningIcon, bool showOMWScripts) ContentSelectorModel::ContentModel::ContentModel(QObject* parent, QIcon warningIcon, bool showOMWScripts)
@ -467,29 +471,59 @@ void ContentSelectorModel::ContentModel::addFiles(const QString& path, bool newf
try try
{ {
ESM::ESMReader fileReader;
ToUTF8::Utf8Encoder encoder(ToUTF8::calculateEncoding(mEncoding.toStdString()));
fileReader.setEncoder(&encoder);
fileReader.open(Files::pathFromQString(dir.absoluteFilePath(path2)));
EsmFile* file = new EsmFile(path2); EsmFile* file = new EsmFile(path2);
for (std::vector<ESM::Header::MasterData>::const_iterator itemIter = fileReader.getGameFiles().begin();
itemIter != fileReader.getGameFiles().end(); ++itemIter)
file->addGameFile(QString::fromUtf8(itemIter->name.c_str()));
file->setAuthor(QString::fromUtf8(fileReader.getAuthor().c_str()));
file->setDate(info.lastModified()); file->setDate(info.lastModified());
file->setFormat(fileReader.getFormatVersion());
file->setFilePath(info.absoluteFilePath()); file->setFilePath(info.absoluteFilePath());
std::filesystem::path filepath = Files::pathFromQString(info.absoluteFilePath());
auto stream = Files::openBinaryInputFileStream(filepath);
if (!stream->is_open())
{
qWarning() << "Failed to open addon file " << info.fileName() << ": "
<< std::generic_category().message(errno).c_str();
continue;
}
const ESM::Format format = ESM::readFormat(*stream);
stream->seekg(0);
switch (format)
{
case ESM::Format::Tes3:
{
ToUTF8::Utf8Encoder encoder(ToUTF8::calculateEncoding(mEncoding.toStdString()));
ESM::ESMReader fileReader;
fileReader.setEncoder(&encoder);
fileReader.open(std::move(stream), filepath);
file->setAuthor(QString::fromUtf8(fileReader.getAuthor().c_str()));
file->setFormat(fileReader.getFormatVersion());
file->setDescription(QString::fromUtf8(fileReader.getDesc().c_str())); file->setDescription(QString::fromUtf8(fileReader.getDesc().c_str()));
for (const auto& master : fileReader.getGameFiles())
file->addGameFile(QString::fromUtf8(master.name.c_str()));
// HACK // HACK
// Load order constraint of Bloodmoon.esm needing Tribunal.esm is missing // Load order constraint of Bloodmoon.esm needing Tribunal.esm is missing
// from the file supplied by Bethesda, so we have to add it ourselves // from the file supplied by Bethesda, so we have to add it ourselves
if (file->fileName().compare("Bloodmoon.esm", Qt::CaseInsensitive) == 0) if (file->fileName().compare("Bloodmoon.esm", Qt::CaseInsensitive) == 0)
{
file->addGameFile(QString::fromUtf8("Tribunal.esm")); file->addGameFile(QString::fromUtf8("Tribunal.esm"));
break;
}
case ESM::Format::Tes4:
{
ToUTF8::StatelessUtf8Encoder encoder(ToUTF8::calculateEncoding(mEncoding.toStdString()));
ESM4::Reader reader(std::move(stream), filepath, nullptr, &encoder, true);
file->setAuthor(QString::fromUtf8(reader.getAuthor().c_str()));
file->setFormat(reader.esmVersion());
file->setDescription(QString::fromUtf8(reader.getDesc().c_str()));
for (const auto& master : reader.getGameFiles())
file->addGameFile(QString::fromUtf8(master.name.c_str()));
break;
}
default:
{
qWarning() << "Error reading addon file " << info.fileName() << ": unsupported ESM format "
<< ESM::NAME(format).toString().c_str();
continue;
}
} }
// Put the file in the table // Put the file in the table