zeldon
/
razer-battery-report
mirror of https://github.com/xzeldon/razer-battery-report.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: reduce CPU usage

This commit is contained in:
Timofey Gelazoniya 2024-09-06 02:32:16 +03:00
parent 7138c941d9
commit 9866802f91
Signed by: zeldon
GPG Key ID: 047886915281DD2A
1 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/tray.rs
View File

@ -3,6 +3,7 @@ use std::{
rc::Rc, rc::Rc,
sync::{mpsc, Arc, Mutex}, sync::{mpsc, Arc, Mutex},
thread, thread,
time::Duration,
}; };
use crate::manager::DeviceManager; use crate::manager::DeviceManager;
@ -193,47 +194,54 @@ impl TrayApp {
let menu_channel = MenuEvent::receiver(); let menu_channel = MenuEvent::receiver();
event_loop.run(move |event, _, control_flow| { let mut last_update = std::time::Instant::now();
*control_flow = tao::event_loop::ControlFlow::WaitUntil( let update_interval = Duration::from_millis(100);
std::time::Instant::now() + std::time::Duration::from_millis(100),
);
if let Ok(device_ids) = rx.try_recv() { event_loop.run(move |event, _, control_flow| {
*control_flow = tao::event_loop::ControlFlow::Wait;
match event {
tao::event::Event::NewEvents(tao::event::StartCause::Init) => {
TrayInner::build_tray(&tray_icon, &tray_menu, icon.clone());
}
tao::event::Event::MainEventsCleared => {
// Check if it's time to process updates
if last_update.elapsed() >= update_interval {
while let Ok(device_ids) = rx.try_recv() {
Self::update(&devices, &device_manager, &device_ids, &tray_icon); Self::update(&devices, &device_manager, &device_ids, &tray_icon);
} }
if let tao::event::Event::NewEvents(tao::event::StartCause::Init) = event { while let Ok(event) = menu_channel.try_recv() {
// We create the icon once the event loop is actually running
// to prevent issues like https://github.com/tauri-apps/tray-icon/issues/90
TrayInner::build_tray(&tray_icon, &tray_menu, icon.clone());
}
if let Ok(event) = menu_channel.try_recv() {
let menu_items = menu_items.lock().unwrap(); let menu_items = menu_items.lock().unwrap();
let show_console_item = &menu_items[0]; let show_console_item = &menu_items[0];
let quit_item = &menu_items[1]; let quit_item = &menu_items[1];
if event.id == show_console_item.id() { if event.id == show_console_item.id() {
let mut visible = console_state.lock().unwrap(); let mut visible = console_state.lock().unwrap();
*visible = !*visible;
if *visible { if *visible {
unsafe { ShowWindow(GetConsoleWindow(), winuser::SW_SHOW) };
show_console_item.set_text("Hide Log Window");
trace!("showing log window");
} else {
unsafe { ShowWindow(GetConsoleWindow(), winuser::SW_HIDE) }; unsafe { ShowWindow(GetConsoleWindow(), winuser::SW_HIDE) };
show_console_item.set_text("Show Log Window"); show_console_item.set_text("Show Log Window");
trace!("hiding log window"); trace!("hiding log window");
*visible = false;
} else {
unsafe { ShowWindow(GetConsoleWindow(), SW_SHOW) };
show_console_item.set_text("Hide Log Window");
trace!("showing log window");
*visible = true
} }
} }
if event.id == quit_item.id() { if event.id == quit_item.id() {
*control_flow = tao::event_loop::ControlFlow::Exit; *control_flow = tao::event_loop::ControlFlow::Exit;
return;
} }
} }
last_update = std::time::Instant::now();
}
}
_ => (),
}
}); });
} }