diff options
author | 2022-02-16 19:37:38 -0300 | |
---|---|---|
committer | 2022-04-26 18:54:23 -0300 | |
commit | 69781499cb070535bfc4e968d9ed3102ea722fb3 (patch) | |
tree | b08c61ebb646595ff9420351201bf71a1cf21df8 | |
parent | fed8da1c9078638a96ae57a9dd6edacb0a1936b3 (diff) | |
download | iced-69781499cb070535bfc4e968d9ed3102ea722fb3.tar.gz iced-69781499cb070535bfc4e968d9ed3102ea722fb3.tar.bz2 iced-69781499cb070535bfc4e968d9ed3102ea722fb3.zip |
Introduce `QueryInformation` to `system::Action`
-rw-r--r-- | native/src/command/action.rs | 4 | ||||
-rw-r--r-- | native/src/system.rs | 3 | ||||
-rw-r--r-- | native/src/system/action.rs | 37 | ||||
-rw-r--r-- | native/src/system/information.rs | 12 |
4 files changed, 52 insertions, 4 deletions
diff --git a/native/src/command/action.rs b/native/src/command/action.rs index 39536f7d..342d0cfe 100644 --- a/native/src/command/action.rs +++ b/native/src/command/action.rs @@ -20,7 +20,7 @@ pub enum Action<T> { Window(window::Action), /// Run a system action. - System(system::Action), + System(system::Action<T>), } impl<T> Action<T> { @@ -38,7 +38,7 @@ impl<T> Action<T> { Self::Future(future) => Action::Future(Box::pin(future.map(f))), Self::Clipboard(action) => Action::Clipboard(action.map(f)), Self::Window(window) => Action::Window(window), - Self::System(system) => Action::System(system), + Self::System(system) => Action::System(system.map(f)), } } } diff --git a/native/src/system.rs b/native/src/system.rs index e1a790bc..61c8ff29 100644 --- a/native/src/system.rs +++ b/native/src/system.rs @@ -1,3 +1,6 @@ //! Access the native system. mod action; +mod information; + pub use action::Action; +pub use information::Information; diff --git a/native/src/system/action.rs b/native/src/system/action.rs index 0d484957..3bece0bb 100644 --- a/native/src/system/action.rs +++ b/native/src/system/action.rs @@ -1,3 +1,36 @@ +use crate::system; + +use iced_futures::MaybeSend; + +use std::fmt; + /// An operation to be performed on the system. -#[derive(Debug)] -pub enum Action {} +pub enum Action<T> { + /// Query system information and produce `T` with the result. + QueryInformation(Box<dyn Fn(Option<system::Information>) -> T>), +} + +impl<T> Action<T> { + /// Maps the output of a system [`Action`] using the provided closure. + pub fn map<A>( + self, + f: impl Fn(T) -> A + 'static + MaybeSend + Sync, + ) -> Action<A> + where + T: 'static, + { + match self { + Self::QueryInformation(o) => { + Action::QueryInformation(Box::new(move |s| f(o(s)))) + } + } + } +} + +impl<T> fmt::Debug for Action<T> { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + Self::QueryInformation(_) => write!(f, "Action::QueryInformation"), + } + } +} diff --git a/native/src/system/information.rs b/native/src/system/information.rs new file mode 100644 index 00000000..2100d110 --- /dev/null +++ b/native/src/system/information.rs @@ -0,0 +1,12 @@ +/// Contains informations about the system (e.g. system name, processor, memory, graphics adapter). +#[derive(Debug)] +pub struct Information { + system_name: String, + system_kernel: String, + system_version: String, + cpu_brand: String, + cpu_vendor: String, + cpu_name: String, + cpu_cores: String, + memory_total: String, +} |