diff options
| author | SulfurNitride <SulfurNitride@users.noreply.github.com> | 2026-02-17 23:59:40 -0600 |
|---|---|---|
| committer | SulfurNitride <SulfurNitride@users.noreply.github.com> | 2026-02-17 23:59:48 -0600 |
| commit | 480a57cf037a46f176128e6c94aa5616fcf704a3 (patch) | |
| tree | 35be94099e2669f518c623acdf8fe23ee82e55a8 /libs/game_bethesda/src/games/skyrim | |
| parent | 91e1d7f9f03ab3fd77cee94c1eac2abf89254e50 (diff) | |
Fix Wine prefix deployment, INI handling, and data directory paths
- Fix data directory path to use ~/.var/app/com.fluorine.manager consistently
(was ~/.local/share/fluorine in committed code)
- Fix VFS helper path in fuseconnector.cpp to use fluorineDataDir()
- Fix localAppFolder() to resolve Wine prefix AppData/Local on Linux
instead of returning XDG ~/.local/share
- Add localAppName() virtual method for correct AppData folder mapping
(Enderal→"enderal", Nehrim→"Oblivion")
- Fix mergeTweak() to use direct INI parser instead of QSettings which
corrupts backslashes and URL-encodes spaces in keys
- Make resolveWineDataDirName() more robust with existence checks and
fallback chain (documentsDirectory → gameShortName → gameName)
- Add comprehensive debug logging throughout Wine prefix deployment
- Fix INI case handling: copy instead of symlink for case-mismatched INIs,
ensure both proper-case and lowercase aliases exist
- Remove native build script (Flatpak only)
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Diffstat (limited to 'libs/game_bethesda/src/games/skyrim')
3 files changed, 12 insertions, 12 deletions
diff --git a/libs/game_bethesda/src/games/skyrim/gameskyrim.cpp b/libs/game_bethesda/src/games/skyrim/gameskyrim.cpp index 4a0053e..b2d95ff 100644 --- a/libs/game_bethesda/src/games/skyrim/gameskyrim.cpp +++ b/libs/game_bethesda/src/games/skyrim/gameskyrim.cpp @@ -48,7 +48,7 @@ bool GameSkyrim::init(IOrganizer* moInfo) registerFeature(dataArchives); registerFeature(std::make_shared<SkyrimBSAInvalidation>(dataArchives.get(), this)); registerFeature(std::make_shared<GamebryoSaveGameInfo>(this)); - registerFeature(std::make_shared<GamebryoLocalSavegames>(this, "skyrim.ini")); + registerFeature(std::make_shared<GamebryoLocalSavegames>(this, "Skyrim.ini")); registerFeature(std::make_shared<SkyrimModDataChecker>(this)); registerFeature(std::make_shared<SkyrimModDataContent>(m_Organizer->gameFeatures())); registerFeature(std::make_shared<SkyrimGamePlugins>(moInfo)); @@ -125,14 +125,14 @@ void GameSkyrim::initializeProfile(const QDir& path, ProfileSettings settings) c if (settings.testFlag(IPluginGame::CONFIGURATION)) { if (settings.testFlag(IPluginGame::PREFER_DEFAULTS) || - !QFileInfo(myGamesPath() + "/skyrim.ini").exists()) { - copyToProfile(gameDirectory().absolutePath(), path, "skyrim_default.ini", - "skyrim.ini"); + !QFileInfo(myGamesPath() + "/Skyrim.ini").exists()) { + copyToProfile(gameDirectory().absolutePath(), path, "Skyrim_default.ini", + "Skyrim.ini"); } else { - copyToProfile(myGamesPath(), path, "skyrim.ini"); + copyToProfile(myGamesPath(), path, "Skyrim.ini"); } - copyToProfile(myGamesPath(), path, "skyrimprefs.ini"); + copyToProfile(myGamesPath(), path, "SkyrimPrefs.ini"); } } @@ -187,7 +187,7 @@ QStringList GameSkyrim::validShortNames() const QStringList GameSkyrim::iniFiles() const { - return {"skyrim.ini", "skyrimprefs.ini"}; + return {"Skyrim.ini", "SkyrimPrefs.ini"}; } QStringList GameSkyrim::DLCPlugins() const diff --git a/libs/game_bethesda/src/games/skyrim/skyrimbsainvalidation.cpp b/libs/game_bethesda/src/games/skyrim/skyrimbsainvalidation.cpp index e056f10..a98a94a 100644 --- a/libs/game_bethesda/src/games/skyrim/skyrimbsainvalidation.cpp +++ b/libs/game_bethesda/src/games/skyrim/skyrimbsainvalidation.cpp @@ -2,7 +2,7 @@ SkyrimBSAInvalidation::SkyrimBSAInvalidation(MOBase::DataArchives* dataArchives, MOBase::IPluginGame const* game) - : GamebryoBSAInvalidation(dataArchives, "skyrim.ini", game) + : GamebryoBSAInvalidation(dataArchives, "Skyrim.ini", game) {} QString SkyrimBSAInvalidation::invalidationBSAName() const diff --git a/libs/game_bethesda/src/games/skyrim/skyrimdataarchives.cpp b/libs/game_bethesda/src/games/skyrim/skyrimdataarchives.cpp index 6422175..bb18510 100644 --- a/libs/game_bethesda/src/games/skyrim/skyrimdataarchives.cpp +++ b/libs/game_bethesda/src/games/skyrim/skyrimdataarchives.cpp @@ -16,8 +16,8 @@ QStringList SkyrimDataArchives::archives(const MOBase::IProfile* profile) const QStringList result; QString iniFile = profile->localSettingsEnabled() - ? QDir(profile->absolutePath()).absoluteFilePath("skyrim.ini") - : localGameDirectory().absoluteFilePath("skyrim.ini"); + ? QDir(profile->absolutePath()).absoluteFilePath("Skyrim.ini") + : localGameDirectory().absoluteFilePath("Skyrim.ini"); result.append(getArchivesFromKey(iniFile, "SResourceArchiveList")); result.append(getArchivesFromKey(iniFile, "SResourceArchiveList2")); @@ -30,8 +30,8 @@ void SkyrimDataArchives::writeArchiveList(MOBase::IProfile* profile, QString list = before.join(", "); QString iniFile = profile->localSettingsEnabled() - ? QDir(profile->absolutePath()).absoluteFilePath("skyrim.ini") - : localGameDirectory().absoluteFilePath("skyrim.ini"); + ? QDir(profile->absolutePath()).absoluteFilePath("Skyrim.ini") + : localGameDirectory().absoluteFilePath("Skyrim.ini"); if (list.length() > 255) { int splitIdx = list.lastIndexOf(",", 256); setArchivesToKey(iniFile, "SResourceArchiveList", list.mid(0, splitIdx)); |
