me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Turn Information fields pub

Browse source
This commit is contained in:
Richard 2022-03-08 19:58:34 -03:00
parent 6295a72aa6
commit c2f45a192f
2 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
native/src/system/information.rs
View file

@ -1,12 +1,20 @@
/// Contains informations about the system (e.g. system name, processor, memory, graphics adapter). /// Contains informations about the system (e.g. system name, processor, memory, graphics adapter).
#[derive(Debug)] #[derive(Debug)]
pub struct Information { pub struct Information {
system_name: String, /// Contains the system name.
system_kernel: String, pub system_name: Option<String>,
system_version: String, /// Contains the kernel version.
cpu_brand: String, pub system_kernel: Option<String>,
cpu_vendor: String, /// Contains the systme version.
cpu_name: String, pub system_version: Option<String>,
cpu_cores: String, /// Contains the processor brand.
memory_total: String, 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<usize>,
/// Contains the total RAM size in KB.
pub memory_total: u64,
} }

19
winit/src/application.rs
View file

@ -583,25 +583,16 @@ pub fn run_command<Message: 'static + std::fmt::Debug + Send, E: Executor>(
system.refresh_all(); system.refresh_all();
let cpu = system.global_processor_info(); let cpu = system.global_processor_info();
let unknown = String::from("unknown");
let information = system::Information { let information = system::Information {
system_name: system system_name: system.name(),
.name() system_kernel: system.kernel_version(),
.unwrap_or(unknown.clone()), system_version: system.long_os_version(),
system_kernel: system
.kernel_version()
.unwrap_or(unknown.clone()),
system_version: system
.long_os_version()
.unwrap_or(unknown.clone()),
cpu_brand: cpu.brand().into(), cpu_brand: cpu.brand().into(),
cpu_vendor: cpu.vendor_id().into(), cpu_vendor: cpu.vendor_id().into(),
cpu_name: cpu.name().into(), cpu_name: cpu.name().into(),
cpu_cores: system cpu_cores: system.physical_core_count(),
.physical_core_count() memory_total: system.total_memory(),
.map_or(unknown, |cores| cores.to_string()),
memory_total: system.total_memory().to_string(),
}; };
Some(information) Some(information)