mirrors/envision
1
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-04-20 11:35:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: use anyhow::Result for dump_active_runtime_to_path

Browse source
This commit is contained in:
Gabriele Musco 2024-09-14 17:41:46 +02:00
parent 6feba023af
commit 8dbec90bce
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/file_builders/active_runtime_json.rs
View file

@ -4,7 +4,7 @@ use crate::{
util::file_utils::{copy_file, deserialize_file, get_writer, set_file_readonly},
xdg::XDG,
};
use serde::{ser::Error, Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::path::{Path, PathBuf};
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
@ -62,17 +62,13 @@ pub fn get_current_active_runtime() -> Option<ActiveRuntime> {
get_active_runtime_from_path(&get_active_runtime_json_path())
}
fn dump_active_runtime_to_path(
active_runtime: &ActiveRuntime,
path: &Path,
) -> Result<(), serde_json::Error> {
let writer = get_writer(path).map_err(serde_json::Error::custom)?;
serde_json::to_writer_pretty(writer, active_runtime)
fn dump_active_runtime_to_path(active_runtime: &ActiveRuntime, path: &Path) -> anyhow::Result<()> {
let writer = get_writer(path)?;
serde_json::to_writer_pretty(writer, active_runtime)?;
Ok(())
}
pub fn dump_current_active_runtime(
active_runtime: &ActiveRuntime,
) -> Result<(), serde_json::Error> {
pub fn dump_current_active_runtime(active_runtime: &ActiveRuntime) -> anyhow::Result<()> {
dump_active_runtime_to_path(active_runtime, &get_active_runtime_json_path())
}
@ -139,7 +135,6 @@ pub fn set_current_active_runtime_to_profile(profile: &Profile) -> anyhow::Resul
let dest = get_active_runtime_json_path();
set_file_readonly(&dest, false)?;
backup_steam_active_runtime();
// TODO: need to escape path spaces here?
let pfx = profile.clone().prefix;
let mut ar = build_profile_active_runtime(profile)?;
// hack: relativize libopenxr_monado.so path for system installs