From fed8da1c9078638a96ae57a9dd6edacb0a1936b3 Mon Sep 17 00:00:00 2001 From: Richard Date: Wed, 16 Feb 2022 19:20:26 -0300 Subject: Add new `System` variant to `Action` --- native/src/command/action.rs | 6 ++++++ native/src/lib.rs | 1 + native/src/system.rs | 3 +++ native/src/system/action.rs | 3 +++ 4 files changed, 13 insertions(+) create mode 100644 native/src/system.rs create mode 100644 native/src/system/action.rs (limited to 'native') diff --git a/native/src/command/action.rs b/native/src/command/action.rs index 5c7509c8..39536f7d 100644 --- a/native/src/command/action.rs +++ b/native/src/command/action.rs @@ -1,4 +1,5 @@ use crate::clipboard; +use crate::system; use crate::window; use iced_futures::MaybeSend; @@ -17,6 +18,9 @@ pub enum Action { /// Run a window action. Window(window::Action), + + /// Run a system action. + System(system::Action), } impl Action { @@ -34,6 +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), } } } @@ -46,6 +51,7 @@ impl fmt::Debug for Action { write!(f, "Action::Clipboard({:?})", action) } Self::Window(action) => write!(f, "Action::Window({:?})", action), + Self::System(action) => write!(f, "Action::System({:?})", action), } } } diff --git a/native/src/lib.rs b/native/src/lib.rs index 5c9c24c9..b8054169 100644 --- a/native/src/lib.rs +++ b/native/src/lib.rs @@ -48,6 +48,7 @@ pub mod program; pub mod renderer; pub mod subscription; pub mod svg; +pub mod system; pub mod text; pub mod touch; pub mod user_interface; diff --git a/native/src/system.rs b/native/src/system.rs new file mode 100644 index 00000000..e1a790bc --- /dev/null +++ b/native/src/system.rs @@ -0,0 +1,3 @@ +//! Access the native system. +mod action; +pub use action::Action; diff --git a/native/src/system/action.rs b/native/src/system/action.rs new file mode 100644 index 00000000..0d484957 --- /dev/null +++ b/native/src/system/action.rs @@ -0,0 +1,3 @@ +/// An operation to be performed on the system. +#[derive(Debug)] +pub enum Action {} -- cgit 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') 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 From c2f45a192fdeba5eec79158dda8640a99a36fdb1 Mon Sep 17 00:00:00 2001 From: Richard Date: Tue, 8 Mar 2022 19:58:34 -0300 Subject: Turn `Information` fields `pub` --- native/src/system/information.rs | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'native') diff --git a/native/src/system/information.rs b/native/src/system/information.rs index 2100d110..a2abec93 100644 --- a/native/src/system/information.rs +++ b/native/src/system/information.rs @@ -1,12 +1,20 @@ /// 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, + /// Contains the system name. + pub system_name: Option, + /// Contains the kernel version. + pub system_kernel: Option, + /// Contains the systme version. + pub system_version: Option, + /// Contains the processor brand. + pub cpu_brand: String, + /// Contains the processor vendor id. + pub cpu_vendor: String, + /// Contains the processor name. + pub cpu_name: String, + /// Contains the number of physical cores on the processor. + pub cpu_cores: Option, + /// Contains the total RAM size in KB. + pub memory_total: u64, } -- cgit From 53538b65b1c557015c2900fc28b8916cf719a10b Mon Sep 17 00:00:00 2001 From: Richard Date: Thu, 10 Mar 2022 03:02:17 -0300 Subject: Add `system_information` example --- native/src/system/information.rs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'native') diff --git a/native/src/system/information.rs b/native/src/system/information.rs index a2abec93..e614f11e 100644 --- a/native/src/system/information.rs +++ b/native/src/system/information.rs @@ -9,10 +9,6 @@ pub struct Information { pub system_version: Option, /// Contains the processor brand. pub cpu_brand: String, - /// Contains the processor vendor id. - pub cpu_vendor: String, - /// Contains the processor name. - pub cpu_name: String, /// Contains the number of physical cores on the processor. pub cpu_cores: Option, /// Contains the total RAM size in KB. -- cgit From 5356bb9bdb0074683722be194f36169836824af8 Mon Sep 17 00:00:00 2001 From: Richard Date: Thu, 17 Mar 2022 00:58:28 -0300 Subject: Add graphics information to `system::Information` --- native/src/system/information.rs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'native') diff --git a/native/src/system/information.rs b/native/src/system/information.rs index e614f11e..bf0b100c 100644 --- a/native/src/system/information.rs +++ b/native/src/system/information.rs @@ -13,4 +13,8 @@ pub struct Information { pub cpu_cores: Option, /// Contains the total RAM size in KB. pub memory_total: u64, + /// Contains the graphics backend. + pub graphics_backend: String, + /// Contains the graphics adapter. + pub graphics_adapter: String, } -- cgit From c9ea1f11dec96df04ade463ea9f33062a85c9219 Mon Sep 17 00:00:00 2001 From: Richard Date: Thu, 14 Apr 2022 02:11:43 -0300 Subject: Add memory usage to `Information` struct --- native/src/system/information.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'native') diff --git a/native/src/system/information.rs b/native/src/system/information.rs index bf0b100c..fa4a835b 100644 --- a/native/src/system/information.rs +++ b/native/src/system/information.rs @@ -1,5 +1,5 @@ /// Contains informations about the system (e.g. system name, processor, memory, graphics adapter). -#[derive(Debug)] +#[derive(Clone, Debug)] pub struct Information { /// Contains the system name. pub system_name: Option, @@ -13,6 +13,8 @@ pub struct Information { pub cpu_cores: Option, /// Contains the total RAM size in KB. pub memory_total: u64, + /// Contains the system used RAM size in KB. + pub memory_used: Option, /// Contains the graphics backend. pub graphics_backend: String, /// Contains the graphics adapter. -- cgit From 5eefa5d4ead9ebfac7dab1db9aebf9797d2dad38 Mon Sep 17 00:00:00 2001 From: Richard Date: Wed, 27 Apr 2022 16:18:27 -0300 Subject: Simplify the `QueryInformation` Action --- native/src/system/action.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'native') diff --git a/native/src/system/action.rs b/native/src/system/action.rs index 3bece0bb..6dab20a6 100644 --- a/native/src/system/action.rs +++ b/native/src/system/action.rs @@ -7,7 +7,7 @@ use std::fmt; /// An operation to be performed on the system. pub enum Action { /// Query system information and produce `T` with the result. - QueryInformation(Box) -> T>), + QueryInformation(Box T>), } impl Action { -- cgit From f1ec0af5070fe2752967cdc38ed66b8b70882366 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 4 May 2022 14:25:04 +0200 Subject: Run `system::information` in a different thread ... since it seems it can block for a couple of seconds. --- native/src/system/action.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'native') diff --git a/native/src/system/action.rs b/native/src/system/action.rs index 6dab20a6..dea9536f 100644 --- a/native/src/system/action.rs +++ b/native/src/system/action.rs @@ -1,15 +1,18 @@ use crate::system; use iced_futures::MaybeSend; - use std::fmt; /// An operation to be performed on the system. pub enum Action { /// Query system information and produce `T` with the result. - QueryInformation(Box T>), + QueryInformation(Box>), } +pub trait Closure: Fn(system::Information) -> T + MaybeSend {} + +impl Closure for T where T: Fn(system::Information) -> O + MaybeSend {} + impl Action { /// Maps the output of a system [`Action`] using the provided closure. pub fn map( -- cgit