archives/steamos-manager
archives/steamos-manager
2
0
Fork 1
mirror of https://gitlab.steamos.cloud/holo/steamos-manager.git synced 2025-07-04 13:46:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'work/whiting/addcontext' into 'master'

Browse source 
Add some context of which file is missing in a couple places.

See merge request holo/steamos-manager!17
This commit is contained in:
Jeremy Whiting 2025-07-03 21:49:47 -06:00
commit 36685ce630
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/platform.rs
View file

@ -5,6 +5,8 @@
* SPDX-License-Identifier: MIT
*/
#[cfg(not(test))]
use anyhow::Context;
use anyhow::Result;
use nix::errno::Errno;
use nix::unistd::{access, AccessFlags};
@ -173,7 +175,10 @@ impl FormatDeviceConfig {
impl PlatformConfig {
#[cfg(not(test))]
async fn load() -> Result<Option<PlatformConfig>> {
let config = read_to_string("/usr/share/steamos-manager/platform.toml").await?;
let path = "/usr/share/steamos-manager/platform.toml";
let config = read_to_string(path)
.await
.with_context(|| format!("Failed to read {path}"))?;
Ok(Some(toml::from_str(config.as_ref())?))
}

20
src/screenreader.rs
View file

@ -6,7 +6,7 @@
*/
use ::sysinfo::System;
use anyhow::{anyhow, bail, ensure, Result};
use anyhow::{anyhow, bail, ensure, Context, Result};
use gio::{prelude::SettingsExt, Settings};
use input_linux::Key;
use lazy_static::lazy_static;
@ -20,7 +20,7 @@ use std::ops::RangeInclusive;
use std::path::PathBuf;
use strum::{Display, EnumString};
use tokio::fs::{read_to_string, write};
use tracing::{debug, error, info, trace, warn};
use tracing::{error, info, trace, warn};
#[cfg(not(test))]
use xdg::BaseDirectories;
use zbus::Connection;
@ -327,7 +327,10 @@ impl<'dbus> OrcaManager<'dbus> {
async fn set_orca_enabled(&mut self, enabled: bool) -> Result<()> {
// Change json file
let data = read_to_string(self.settings_path()?).await?;
let path = self.settings_path()?;
let data = read_to_string(&path)
.await
.with_context(|| format!("Unable to read from {}", path.display()))?;
let mut json: Value = serde_json::from_str(&data)?;
let general = json
@ -345,8 +348,10 @@ impl<'dbus> OrcaManager<'dbus> {
}
async fn load_values(&mut self) -> Result<()> {
debug!("Loading orca values from user-settings.conf");
let data = read_to_string(self.settings_path()?).await?;
let path = self.settings_path()?;
let data = read_to_string(&path)
.await
.with_context(|| format!("Unable to read from {}", path.display()))?;
let json: Value = serde_json::from_str(&data)?;
let Some(default_voice) = json
@ -405,7 +410,10 @@ impl<'dbus> OrcaManager<'dbus> {
} else {
bail!("Invalid orca option {option}");
}
let data = read_to_string(self.settings_path()?).await?;
let path = self.settings_path()?;
let data = read_to_string(&path)
.await
.with_context(|| format!("Unable to read from {}", path.display()))?;
let mut json: Value = serde_json::from_str(&data)?;
let profiles = json