leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed subscription.rs, added better docs and improved readability along with idiomatic changes

Browse source
This commit is contained in:
KushalMeghani1644 2025-08-26 16:12:48 +05:30
parent 6f1fe2a28b
commit e05db73784
No known key found for this signature in database
GPG key ID: B9A1B0C1FEB66685
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cosmic-config/src/subscription.rs
View file

@ -5,12 +5,18 @@ use std::{borrow::Cow, hash::Hash};
use crate::{Config, CosmicConfigEntry}; use crate::{Config, CosmicConfigEntry};
/// Represents the state of a configuration watcher.
#[derive(Debug)]
pub enum ConfigState<T> { pub enum ConfigState<T> {
/// Initial state before the configuration is loaded.
Init(Cow<'static, str>, u64, bool), Init(Cow<'static, str>, u64, bool),
/// Waiting for updates, holding current config and watcher.
Waiting(T, RecommendedWatcher, mpsc::Receiver<Vec<String>>, Config), Waiting(T, RecommendedWatcher, mpsc::Receiver<Vec<String>>, Config),
Failed, /// Permanent failure state.
Failed(String),
} }
#[derive(Debug)]
pub enum ConfigUpdate<T> { pub enum ConfigUpdate<T> {
Update(crate::Update<T>), Update(crate::Update<T>),
Failed, Failed,
@ -48,7 +54,6 @@ fn watcher_stream<T: 'static + Send + Sync + PartialEq + Clone + CosmicConfigEnt
stream::channel(100, move |mut output| { stream::channel(100, move |mut output| {
let config_id = config_id.clone(); let config_id = config_id.clone();
async move { async move {
let config_id = config_id.clone();
let mut state = ConfigState::Init(config_id, config_version, is_state); let mut state = ConfigState::Init(config_id, config_version, is_state);
loop { loop {
@ -72,13 +77,13 @@ async fn start_listening<T: 'static + Send + Sync + PartialEq + Clone + CosmicCo
} else { } else {
Config::new(&config_id, version) Config::new(&config_id, version)
}) else { }) else {
return ConfigState::Failed; return ConfigState::Failed("failed to create config".into());
}; };
let Ok(watcher) = config.watch(move |_helper, keys| { let Ok(watcher) = config.watch(move |_helper, keys| {
let mut tx = tx.clone(); let mut tx = tx.clone();
let _ = tx.try_send(keys.to_vec()); let _ = tx.try_send(keys.to_vec());
}) else { }) else {
return ConfigState::Failed; return ConfigState::Failed("failed to create watcher".into());
}; };
match T::get_entry(&config) { match T::get_entry(&config) {
@ -88,7 +93,7 @@ async fn start_listening<T: 'static + Send + Sync + PartialEq + Clone + CosmicCo
keys: Vec::new(), keys: Vec::new(),
config: t.clone(), config: t.clone(),
}; };
_ = output.send(update).await; let _ = output.send(update).await;
ConfigState::Waiting(t, watcher, rx, config) ConfigState::Waiting(t, watcher, rx, config)
} }
Err((errors, t)) => { Err((errors, t)) => {
@ -97,7 +102,7 @@ async fn start_listening<T: 'static + Send + Sync + PartialEq + Clone + CosmicCo
keys: Vec::new(), keys: Vec::new(),
config: t.clone(), config: t.clone(),
}; };
_ = output.send(update).await; let _ = output.send(update).await;
ConfigState::Waiting(t, watcher, rx, config) ConfigState::Waiting(t, watcher, rx, config)
} }
} }
@ -107,7 +112,7 @@ async fn start_listening<T: 'static + Send + Sync + PartialEq + Clone + CosmicCo
let (errors, changed) = conf_data.update_keys(&config, &keys); let (errors, changed) = conf_data.update_keys(&config, &keys);
if !changed.is_empty() { if !changed.is_empty() {
_ = output let _ = output
.send(crate::Update { .send(crate::Update {
errors, errors,
keys: changed, keys: changed,
@ -117,7 +122,7 @@ async fn start_listening<T: 'static + Send + Sync + PartialEq + Clone + CosmicCo
} }
ConfigState::Waiting(conf_data, watcher, rx, config) ConfigState::Waiting(conf_data, watcher, rx, config)
} }
None => ConfigState::Failed, None => ConfigState::Failed("channel closed".into()),
}, },
ConfigState::Failed => pending().await, ConfigState::Failed => pending().await,
} }