giers10/Heimgeist
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor settings import to use legacy/Heimgeist settings instead of Electron settings

Browse Source
This commit is contained in:
Victor Giers
2026-05-06 05:59:00 +02:00
parent f2abb9121d
commit 514fde9cad
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src-tauri/src/main.rs
View File

@@ -264,7 +264,7 @@ fn push_unique_candidate(candidates: &mut Vec<PathBuf>, candidate: PathBuf, taur
candidates.push(candidate);
}
fn electron_settings_candidates(app: &AppHandle, tauri_path: &Path) -> Vec<PathBuf> {
fn legacy_settings_candidates(app: &AppHandle, tauri_path: &Path) -> Vec<PathBuf> {
let mut candidates = Vec::new();
if let Ok(config_dir) = app.path().config_dir() {
@@ -282,15 +282,12 @@ fn electron_settings_candidates(app: &AppHandle, tauri_path: &Path) -> Vec<PathB
candidates
}
fn import_electron_settings_if_available(
app: &AppHandle,
tauri_path: &Path,
) -> Option<SettingsMap> {
for candidate in electron_settings_candidates(app, tauri_path) {
fn import_legacy_settings_if_available(app: &AppHandle, tauri_path: &Path) -> Option<SettingsMap> {
for candidate in legacy_settings_candidates(app, tauri_path) {
match read_settings_file(&candidate) {
Ok(Some(settings)) => {
println!(
"Imported Electron settings for first Tauri run from {}",
"Imported legacy Heimgeist settings for first Tauri run from {}",
candidate.display()
);
return Some(settings);
@@ -298,7 +295,7 @@ fn import_electron_settings_if_available(
Ok(None) => {}
Err(error) => {
eprintln!(
"Skipping Electron settings import from {}: {error}",
"Skipping legacy settings import from {}: {error}",
candidate.display()
);
}
@@ -350,7 +347,7 @@ fn load_settings_store(app: &AppHandle) -> Result<SettingsStore, String> {
}
None => {
let imported_settings = if explicit_settings_file_path().is_none() {
import_electron_settings_if_available(app, &path)
import_legacy_settings_if_available(app, &path)
} else {
None
};