From 480a57cf037a46f176128e6c94aa5616fcf704a3 Mon Sep 17 00:00:00 2001 From: SulfurNitride Date: Tue, 17 Feb 2026 23:59:40 -0600 Subject: Fix Wine prefix deployment, INI handling, and data directory paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 --- libs/nak/src/paths.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'libs/nak/src') diff --git a/libs/nak/src/paths.rs b/libs/nak/src/paths.rs index 4b212b9..e86c284 100644 --- a/libs/nak/src/paths.rs +++ b/libs/nak/src/paths.rs @@ -1,12 +1,11 @@ //! Shared data directory for Fluorine Manager. //! -//! All data lives under `~/.local/share/fluorine/` — accessible from both -//! native and Flatpak builds (the Flatpak has `--filesystem=home`). +//! All data lives under `~/.var/app/com.fluorine.manager/`. use std::path::PathBuf; -/// Returns the Fluorine data directory (`~/.local/share/fluorine`). +/// Returns the Fluorine data directory (`~/.var/app/com.fluorine.manager`). pub fn data_dir() -> PathBuf { let home = std::env::var("HOME").unwrap_or_else(|_| "/tmp".to_string()); - PathBuf::from(home).join(".local/share/fluorine") + PathBuf::from(home).join(".var/app/com.fluorine.manager") } -- cgit v1.3.1