From 69781499cb070535bfc4e968d9ed3102ea722fb3 Mon Sep 17 00:00:00 2001 From: Richard Date: Wed, 16 Feb 2022 19:37:38 -0300 Subject: Introduce `QueryInformation` to `system::Action` --- native/src/command/action.rs | 4 ++-- native/src/system.rs | 3 +++ native/src/system/action.rs | 37 +++++++++++++++++++++++++++++++++++-- native/src/system/information.rs | 12 ++++++++++++ 4 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 native/src/system/information.rs (limited to 'native/src') 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 { Window(window::Action), /// Run a system action. - System(system::Action), + System(system::Action), } impl Action { @@ -38,7 +38,7 @@ impl Action { 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 { + /// Query system information and produce `T` with the result. + QueryInformation(Box) -> T>), +} + +impl Action { + /// Maps the output of a system [`Action`] using the provided closure. + pub fn map( + self, + f: impl Fn(T) -> A + 'static + MaybeSend + Sync, + ) -> Action + where + T: 'static, + { + match self { + Self::QueryInformation(o) => { + Action::QueryInformation(Box::new(move |s| f(o(s)))) + } + } + } +} + +impl fmt::Debug for Action { + 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, +} -- cgit