From 3949dcfce95af4bd305f258ff5b170d7d50435f6 Mon Sep 17 00:00:00 2001 From: SulfurNitride Date: Sun, 12 Apr 2026 21:04:15 -0500 Subject: VFS perf fixes, icon/stylesheet compat, download filename fix VFS: - Open backing fd at mo2_open time for read-only handles so mo2_read can splice without re-opening the file on every read call. - Bump RLIMIT_NOFILE at mount time to fit the resulting fd pressure when the game keeps hundreds of BSAs open. - Dedicated node_cache_mutex so resolveByInode / mo2_lookup stop racing unordered_map writes while multiple tree_mutex readers are active. - max_read=1MB + matching conn->max_read and raised max_readahead/max_write so the kernel merges Wine's small sequential reads into bigger FUSE requests. - Per-op wall-clock counters in mo2_init() logs so we can distinguish VFS latency from game-side work. Proton launch: - Write dxvk.conf to the prefix and set DXVK_CONFIG_FILE to force dxvk.enableGraphicsPipelineLibrary=False, avoiding long GPL compile stalls on first run. UI / plugin compat: - Clamp IconDelegate's per-icon width to [8, 16] so narrow content columns don't trigger QIcon::pixmap(0,0) returning null and logging "failed to load icon" every repaint. - Pre-create lowercase symlinks in the stylesheet directory so QSS files authored on Windows resolve url(foo.svg) when on-disk files are Foo.svg. - Flip content icons empty-chessboard.png and facegen.png to 8-bit RGBA so Qt's built-in PNG reader loads them uniformly. - Add mobase.Version.canonicalString shim for legacy Python plugins that still call the old VersionInfo method on appVersion()'s return. - BSPluginList: compare normalized plugin name lists instead of byte hashes so the post-run case-fix refresh stops spuriously firing the "load order changed" dialog. - BSPluginList disabled by default. Download manager: - Parse CDN URL with QUrl + QUrlQuery and read the filename from the response-content-disposition query param (RFC 6266 quoted / unquoted / ext-value forms), not QFileInfo on the raw URL. - When the API or URL gives us a CDN object key (no archive extension), prefer the actual Content-Disposition header from the live response in metaDataChanged and downloadFinished. Co-Authored-By: Claude Opus 4.6 (1M context) --- .../src/TESData/BranchConflictParser.cpp | 133 +++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 libs/installer_bsplugins/src/TESData/BranchConflictParser.cpp (limited to 'libs/installer_bsplugins/src/TESData/BranchConflictParser.cpp') diff --git a/libs/installer_bsplugins/src/TESData/BranchConflictParser.cpp b/libs/installer_bsplugins/src/TESData/BranchConflictParser.cpp new file mode 100644 index 0000000..7ea33de --- /dev/null +++ b/libs/installer_bsplugins/src/TESData/BranchConflictParser.cpp @@ -0,0 +1,133 @@ +#include "BranchConflictParser.h" + +#include +#include + +namespace TESData +{ + +BranchConflictParser::BranchConflictParser(PluginList* pluginList, + const std::string& pluginName, + const RecordPath& path) + : m_PluginList{pluginList}, m_PluginName{pluginName}, m_Path{path} +{} + +bool BranchConflictParser::Group(TESFile::GroupData group) +{ + if (m_CurrentPath.groups().size() < m_Path.groups().size()) { + const auto& lastGroup = m_Path.groups()[m_CurrentPath.groups().size()]; + if (group.type() != lastGroup.type()) { + return false; + } + + if (group.hasParent()) { + const std::uint8_t localIndex = group.parent() >> 24U; + const std::string& owner = + localIndex < m_Masters.size() ? m_Masters[localIndex] : m_PluginName; + + if (!TESFile::iequals(owner, m_Path.files()[lastGroup.parent() >> 24])) { + return false; + } + } else if (group != lastGroup) { + return false; + } + } else { + if (group.hasParent() && m_Path.hasFormId()) { + if ((group.parent() & 0xFFFFFF) != (m_Path.formId() & 0xFFFFFF)) { + return false; + } + + const std::uint8_t localIndex = group.parent() >> 24U; + const std::string& owner = + localIndex < m_Masters.size() ? m_Masters[localIndex] : m_PluginName; + + if (!TESFile::iequals(owner.data(), m_Path.files()[m_Path.formId() >> 24])) { + return false; + } + } + } + + m_CurrentPath.push(group, m_Masters, m_PluginName); + return true; +} + +void BranchConflictParser::EndGroup() +{ + m_CurrentPath.pop(); +} + +bool BranchConflictParser::Form(TESFile::FormData form) +{ + m_CurrentType = form.type(); + + if (m_CurrentPath.groups().empty()) { + return form.type() == "TES4"_ts; + } + + if (m_CurrentPath.groups().size() < m_Path.groups().size()) { + return false; + } else if (m_CurrentPath.groups().size() == m_Path.groups().size()) { + if (m_Path.hasFormId()) { + if ((form.formId() & 0xFFFFFF) != (m_Path.formId() & 0xFFFFFF)) { + return false; + } + + const std::uint8_t localIndex = form.formId() >> 24U; + const std::string& owner = + localIndex < m_Masters.size() ? m_Masters[localIndex] : m_PluginName; + + if (!TESFile::iequals(owner, m_Path.files()[m_Path.formId() >> 24])) { + return false; + } + } + } + + m_CurrentPath.setFormId(form.formId(), m_Masters, m_PluginName); + + const std::uint8_t localModIndex = form.localModIndex(); + const bool isMasterRecord = localModIndex < m_Masters.size(); + return isMasterRecord; +} + +void BranchConflictParser::EndForm() +{ + if (m_CurrentType != "TES4"_ts && m_CurrentType != "TES3"_ts) { + + m_PluginList->addRecordConflict(m_PluginName, m_CurrentPath, m_CurrentType, + m_CurrentName); + } + + m_CurrentPath.unsetFormId(); + m_CurrentType = {}; + m_CurrentChunk = {}; + m_CurrentName.clear(); +} + +bool BranchConflictParser::Chunk(TESFile::Type type) +{ + m_CurrentChunk = type; + if (m_CurrentPath.groups().empty()) { + return type == "MAST"_ts; + } else { + return type == "EDID"_ts; + } +} + +void BranchConflictParser::Data(std::istream& stream) +{ + switch (m_CurrentChunk) { + case "MAST"_ts: { + const std::string master = TESFile::readZstring(stream); + if (!master.empty()) { + m_Masters.push_back(master); + } + } break; + + case "EDID"_ts: { + const std::string editorId = TESFile::readZstring(stream); + m_CurrentName = std::move(editorId); + } break; + } +} + +} // namespace TESData -- cgit v1.3.1