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) --- libs/installer_bsplugins/src/CMakeLists.txt | 111 ++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 libs/installer_bsplugins/src/CMakeLists.txt (limited to 'libs/installer_bsplugins/src/CMakeLists.txt') diff --git a/libs/installer_bsplugins/src/CMakeLists.txt b/libs/installer_bsplugins/src/CMakeLists.txt new file mode 100644 index 0000000..c3c67a1 --- /dev/null +++ b/libs/installer_bsplugins/src/CMakeLists.txt @@ -0,0 +1,111 @@ +cmake_minimum_required(VERSION 3.22) + +# Fluorine port: simplified from upstream vcpkg-based build. +# Removed deps: WebEngineWidgets (LOOT dialog gutted), ryml (LootGroups gutted), +# lootcli (stubbed), lz4 (transitive via bsatk), interprocess/uuid/accumulators +# boost libs (unused), libbsarch/dds-header (unused). See README / commit for rationale. + +find_package(Qt6 REQUIRED COMPONENTS Widgets) +find_package(ZLIB REQUIRED) +find_package(Boost CONFIG REQUIRED COMPONENTS thread) +find_package(Python 3 COMPONENTS Interpreter REQUIRED) + +# ── TES form parser codegen (from ParseTES.cmake, simplified: no esp.json fetch, +# we vendor or skip the generated header on the fly) ── +include(FetchContent) +FetchContent_Declare( + esp_json + GIT_REPOSITORY https://github.com/matortheeternal/esp.json.git + GIT_TAG master +) +FetchContent_MakeAvailable(esp_json) + +set(CODEGEN_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/MakeFormParser.py) +set(TES_INCLUDE_FILES "") +foreach(GAME SSE) + set(INPUT_FILE ${esp_json_SOURCE_DIR}/data/${GAME}.json) + set(OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/include/FormParser.${GAME}.inl) + add_custom_command( + OUTPUT ${OUTPUT_FILE} + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/include + COMMAND ${Python_EXECUTABLE} ${CODEGEN_SCRIPT} ${INPUT_FILE} ${OUTPUT_FILE} + DEPENDS ${CODEGEN_SCRIPT} ${INPUT_FILE} + VERBATIM + ) + list(APPEND TES_INCLUDE_FILES ${OUTPUT_FILE}) +endforeach() + +# ── Source collection ── +file(GLOB_RECURSE BSPLUGINS_SOURCES + ${CMAKE_CURRENT_SOURCE_DIR}/BSPluginInfo/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/BSPluginList/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/GUI/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/MOPlugin/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/MOTools/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/TESData/*.cpp +) +file(GLOB_RECURSE BSPLUGINS_HEADERS + ${CMAKE_CURRENT_SOURCE_DIR}/BSPluginInfo/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/BSPluginList/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/GUI/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/MOPlugin/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/MOTools/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/TESData/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/TESFile/*.h +) +file(GLOB BSPLUGINS_UI + ${CMAKE_CURRENT_SOURCE_DIR}/BSPluginInfo/*.ui + ${CMAKE_CURRENT_SOURCE_DIR}/BSPluginList/*.ui + ${CMAKE_CURRENT_SOURCE_DIR}/GUI/*.ui +) +file(GLOB BSPLUGINS_QRC + ${CMAKE_CURRENT_SOURCE_DIR}/*.qrc +) + +add_library(bsplugins SHARED + ${BSPLUGINS_SOURCES} + ${BSPLUGINS_HEADERS} + ${BSPLUGINS_UI} + ${BSPLUGINS_QRC} + ${TES_INCLUDE_FILES} +) + +set_target_properties(bsplugins PROPERTIES + AUTOMOC ON + AUTOUIC ON + AUTORCC ON + CXX_STANDARD 20 + CXX_STANDARD_REQUIRED ON +) + +target_include_directories(bsplugins + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} + PRIVATE + ${CMAKE_CURRENT_BINARY_DIR}/include + # Bare uibase includes (, , , etc.) + ${MO2_UIBASE_INCLUDE_DIRS} + # moc's preprocessor needs these on -I so quote-includes like + # `#include "IPluginPanel.h"` inside MOPlugin/BSPlugins.h resolve. + ${CMAKE_CURRENT_SOURCE_DIR}/MOPlugin + ${CMAKE_CURRENT_SOURCE_DIR}/BSPluginInfo + ${CMAKE_CURRENT_SOURCE_DIR}/BSPluginList + ${CMAKE_CURRENT_SOURCE_DIR}/GUI + ${CMAKE_CURRENT_SOURCE_DIR}/MOTools + ${CMAKE_CURRENT_SOURCE_DIR}/TESData + ${CMAKE_CURRENT_SOURCE_DIR}/TESFile +) + +target_link_libraries(bsplugins PRIVATE + mo2::uibase + mo2::bsatk + Qt6::Widgets + Boost::thread + ZLIB::ZLIB +) + +# Install into fluorine plugins dir (uses fomod_plus-style shim). +if(COMMAND mo2_install_plugin) + mo2_install_plugin(bsplugins) +elseif(COMMAND mo2_install_target) + mo2_install_target(bsplugins) +endif() -- cgit v1.3.1