nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

global_settings: do not create file if not existing & empty

Browse Source
This commit is contained in:
pythcoiner 2025-07-12 07:23:22 +02:00
parent a0b74709f3
commit b1e06ee106
1 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
liana-gui/src/app/settings.rs
View File

@ -437,11 +437,14 @@ pub mod global {
Self::update(path, |s| s.bitbox = Some(bitbox.clone()), true)
}
pub fn update<F>(path: &PathBuf, mut update: F, write: bool) -> Result<(), String>
pub fn update<F>(path: &PathBuf, mut update: F, mut write: bool) -> Result<(), String>
where
F: FnMut(&mut GlobalSettings),
{
log::info!("GLobalSettings::update() write: {write}");
let exists = path.is_file();
let (mut global_settings, file) = if exists {
let mut file = OpenOptions::new()
.read(true)
.write(true)
@ -453,19 +456,47 @@ pub mod global {
file.lock_exclusive()
.map_err(|e| format!("Locking file: {e}"))?;
let mut global_settings = if exists {
let mut content = String::new();
file.read_to_string(&mut content)
.map_err(|e| format!("Reading file: {e}"))?;
serde_json::from_str::<GlobalSettings>(&content).map_err(|e| e.to_string())?
if !write {
file.unlock().map_err(|e| format!("Unlocking file: {e}"))?;
}
(
serde_json::from_str::<GlobalSettings>(&content).map_err(|e| e.to_string())?,
Some(file),
)
} else {
GlobalSettings::default()
(GlobalSettings::default(), None)
};
update(&mut global_settings);
if !exists
&& global_settings.bitbox.is_none()
&& global_settings.window_config.is_none()
{
write = false;
}
if write {
let mut file = if let Some(file) = file {
file
} else {
let file = OpenOptions::new()
.read(true)
.write(true)
.create(true)
.truncate(false)
.open(path)
.map_err(|e| format!("Opening file: {e}"))?;
file.lock_exclusive()
.map_err(|e| format!("Locking file: {e}"))?;
file
};
let content = serde_json::to_vec_pretty(&global_settings)
.map_err(|e| format!("Failed to serialize GlobalSettings: {e}"))?;
@ -476,9 +507,8 @@ pub mod global {
.map_err(|e| format!("Failed to write file: {e}"))?;
file.set_len(content.len() as u64)
.map_err(|e| format!("Failed to truncate file: {e}"))?;
}
file.unlock().map_err(|e| format!("Unlocking file: {e}"))?;
}
Ok(())
}