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

screenreader: Don't fail enabling if orca settings aren't present

Browse source
This commit is contained in:
Vicki Pfau 2025-05-30 17:32:19 -07:00
parent e21153671b
commit 874b799005
1 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/screenreader.rs
View file

@ -10,6 +10,7 @@ use gio::{prelude::SettingsExt, Settings};
use lazy_static::lazy_static; use lazy_static::lazy_static;
use serde_json::{Map, Value}; use serde_json::{Map, Value};
use std::collections::HashMap; use std::collections::HashMap;
use std::io::ErrorKind;
use std::ops::RangeInclusive; use std::ops::RangeInclusive;
use std::path::PathBuf; use std::path::PathBuf;
use tokio::fs::{read_to_string, write}; use tokio::fs::{read_to_string, write};
@ -105,7 +106,12 @@ impl<'dbus> OrcaManager<'dbus> {
.set_boolean(SCREEN_READER_SETTING, enable) .set_boolean(SCREEN_READER_SETTING, enable)
.map_err(|e| anyhow!("Unable to set screen reader enabled gsetting, {e}"))?; .map_err(|e| anyhow!("Unable to set screen reader enabled gsetting, {e}"))?;
} }
self.set_orca_enabled(enable).await?; if let Err(e) = self.set_orca_enabled(enable).await {
match e.downcast_ref::<std::io::Error>() {
Some(e) if e.kind() == ErrorKind::NotFound => (),
_ => return Err(e),
}
}
if enable { if enable {
self.restart_orca().await?; self.restart_orca().await?;
} else { } else {
@ -316,9 +322,6 @@ mod test {
let unit = SystemdUnit::new(connection.clone(), "orca.service") let unit = SystemdUnit::new(connection.clone(), "orca.service")
.await .await
.expect("unit"); .expect("unit");
copy(TEST_ORCA_SETTINGS, h.test.path().join(ORCA_SETTINGS))
.await
.unwrap();
let mut manager = OrcaManager::new(&connection) let mut manager = OrcaManager::new(&connection)
.await .await
@ -332,6 +335,21 @@ mod test {
assert_eq!(manager.enabled(), false); assert_eq!(manager.enabled(), false);
assert_eq!(unit.active().await.unwrap(), false); assert_eq!(unit.active().await.unwrap(), false);
assert_eq!(unit.enabled().await.unwrap(), EnableState::Disabled); assert_eq!(unit.enabled().await.unwrap(), EnableState::Disabled);
copy(TEST_ORCA_SETTINGS, h.test.path().join(ORCA_SETTINGS))
.await
.unwrap();
manager.load_values().await.unwrap();
manager.set_enabled(true).await.unwrap();
assert_eq!(manager.enabled(), true);
assert_eq!(unit.active().await.unwrap(), true);
assert_eq!(unit.enabled().await.unwrap(), EnableState::Enabled);
manager.set_enabled(false).await.unwrap();
assert_eq!(manager.enabled(), false);
assert_eq!(unit.active().await.unwrap(), false);
assert_eq!(unit.enabled().await.unwrap(), EnableState::Disabled);
} }
#[tokio::test] #[tokio::test]