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

fix (cosmic-config): feature gate updates for subscription helpers

Browse source
This commit is contained in:
Ashley Wulber 2023-05-22 10:29:39 -04:00
parent b82b6566f1
commit 259bba4d19
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cosmic-config/src/lib.rs
View file

@ -261,14 +261,14 @@ impl<'a> ConfigSet for ConfigTransaction<'a> {
} }
} }
#[cfg(feature = "iced")] #[cfg(feature = "subscription")]
pub enum ConfigState<T> { pub enum ConfigState<T> {
Init(Cow<'static, str>, u64), Init(Cow<'static, str>, u64),
Waiting(T, RecommendedWatcher, mpsc::Receiver<()>, Config), Waiting(T, RecommendedWatcher, mpsc::Receiver<()>, Config),
Failed, Failed,
} }
#[cfg(feature = "iced")] #[cfg(feature = "subscription")]
pub enum ConfigUpdate<T> { pub enum ConfigUpdate<T> {
Update(T), Update(T),
UpdateError(T, Vec<crate::Error>), UpdateError(T, Vec<crate::Error>),
@ -283,7 +283,7 @@ where
fn get_entry(config: &Config) -> Result<Self, (Vec<crate::Error>, Self)>; fn get_entry(config: &Config) -> Result<Self, (Vec<crate::Error>, Self)>;
} }
#[cfg(feature = "iced")] #[cfg(feature = "subscription")]
pub fn config_subscription< pub fn config_subscription<
I: 'static + Copy + Send + Sync + Hash, I: 'static + Copy + Send + Sync + Hash,
T: 'static + Send + Sync + PartialEq + Clone + CosmicConfigEntry, T: 'static + Send + Sync + PartialEq + Clone + CosmicConfigEntry,
@ -291,7 +291,7 @@ pub fn config_subscription<
id: I, id: I,
config_id: Cow<'static, str>, config_id: Cow<'static, str>,
config_version: u64, config_version: u64,
) -> iced::Subscription<(I, Result<T, (Vec<crate::Error>, T)>)> { ) -> iced_futures::Subscription<(I, Result<T, (Vec<crate::Error>, T)>)> {
subscription::unfold( subscription::unfold(
id, id,
ConfigState::Init(config_id, config_version), ConfigState::Init(config_id, config_version),
@ -299,7 +299,7 @@ pub fn config_subscription<
) )
} }
#[cfg(feature = "iced")] #[cfg(feature = "subscription")]
async fn start_listening< async fn start_listening<
I: Copy, I: Copy,
T: 'static + Send + Sync + PartialEq + Clone + CosmicConfigEntry, T: 'static + Send + Sync + PartialEq + Clone + CosmicConfigEntry,
@ -310,21 +310,21 @@ async fn start_listening<
Option<(I, Result<T, (Vec<crate::Error>, T)>)>, Option<(I, Result<T, (Vec<crate::Error>, T)>)>,
ConfigState<T>, ConfigState<T>,
) { ) {
use iced::futures::StreamExt; use iced_futures::futures::{future::pending, StreamExt};
match state { match state {
ConfigState::Init(config_id, version) => { ConfigState::Init(config_id, version) => {
let (tx, rx) = mpsc::channel(100); let (tx, rx) = mpsc::channel(100);
let config = match Config::new(&config_id, version) { let config = match Config::new(&config_id, version) {
Ok(c) => c, Ok(c) => c,
Err(e) => return (None, ConfigState::Failed), Err(_) => return (None, ConfigState::Failed),
}; };
let watcher = match config.watch(move |_helper, _keys| { let watcher = match config.watch(move |_helper, _keys| {
let mut tx = tx.clone(); let mut tx = tx.clone();
let _ = tx.try_send(()); let _ = tx.try_send(());
}) { }) {
Ok(w) => w, Ok(w) => w,
Err(e) => return (None, ConfigState::Failed), Err(_) => return (None, ConfigState::Failed),
}; };
match T::get_entry(&config) { match T::get_entry(&config) {
@ -350,7 +350,7 @@ async fn start_listening<
), ),
Err((errors, t)) => ( Err((errors, t)) => (
if t != old { if t != old {
Some((id, Ok(t.clone()))) Some((id, Err((errors, t.clone()))))
} else { } else {
None None
}, },
@ -360,11 +360,11 @@ async fn start_listening<
None => (None, ConfigState::Failed), None => (None, ConfigState::Failed),
}, },
ConfigState::Failed => iced::futures::future::pending().await, ConfigState::Failed => pending().await,
} }
} }
#[cfg(feature = "iced")] #[cfg(feature = "subscription")]
async fn start_listening_loop< async fn start_listening_loop<
I: Copy, I: Copy,
T: 'static + Send + Sync + PartialEq + Clone + CosmicConfigEntry, T: 'static + Send + Sync + PartialEq + Clone + CosmicConfigEntry,