trafficlunar/computer-statistics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: replace left_clicks and right_clicks with generic clicks

Browse source
This commit is contained in:
trafficlunar 2025-03-22 12:39:06 +00:00
parent cd63b0c670
commit cff4c435d2
2 changed files with 11 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/computer.rs
View file

@ -15,12 +15,10 @@ pub fn start_sending(socket: &mut WebSocket<MaybeTlsStream<TcpStream>>) {
let mut sys = System::new(); let mut sys = System::new();
let key_counter = Arc::new(Mutex::new(0_u16)); let key_counter = Arc::new(Mutex::new(0_u16));
let left_click_counter = Arc::new(Mutex::new(0_u16)); let click_counter = Arc::new(Mutex::new(0_u16));
let right_click_counter = Arc::new(Mutex::new(0_u16));
let key_counter_clone = Arc::clone(&key_counter); let key_counter_clone = Arc::clone(&key_counter);
let left_click_counter_clone = Arc::clone(&left_click_counter); let click_counter_clone = Arc::clone(&click_counter);
let right_click_counter_clone = Arc::clone(&right_click_counter);
thread::spawn(move || { thread::spawn(move || {
KeybdKey::bind_all(move |_| { KeybdKey::bind_all(move |_| {
@ -29,12 +27,8 @@ pub fn start_sending(socket: &mut WebSocket<MaybeTlsStream<TcpStream>>) {
}); });
MouseButton::bind_all(move |event| match event { MouseButton::bind_all(move |event| match event {
MouseButton::LeftButton => { MouseButton::LeftButton | MouseButton::RightButton => {
let mut count = left_click_counter_clone.lock().unwrap(); let mut count = click_counter_clone.lock().unwrap();
*count += 1;
}
MouseButton::RightButton => {
let mut count = right_click_counter_clone.lock().unwrap();
*count += 1; *count += 1;
} }
_ => {} _ => {}
@ -56,25 +50,14 @@ pub fn start_sending(socket: &mut WebSocket<MaybeTlsStream<TcpStream>>) {
let mut key_guard = key_counter.lock().unwrap(); let mut key_guard = key_counter.lock().unwrap();
let key_presses = *key_guard; let key_presses = *key_guard;
let mut left_guard = left_click_counter.lock().unwrap(); let mut click_guard = click_counter.lock().unwrap();
let left_clicks = *left_guard; let clicks = *click_guard;
let mut right_guard = right_click_counter.lock().unwrap(); websocket::send(socket, cpu_usage, memory_usage, key_presses, clicks);
let right_clicks = *right_guard;
websocket::send(
socket,
cpu_usage,
memory_usage,
key_presses,
left_clicks,
right_clicks,
);
// Reset counters after sending // Reset counters after sending
*key_guard = 0; *key_guard = 0;
*left_guard = 0; *click_guard = 0;
*right_guard = 0;
thread::sleep(Duration::from_secs(60)); thread::sleep(Duration::from_secs(60));
} }

7
src/websocket.rs
View file

@ -48,12 +48,11 @@ pub fn send(
cpu: u8, cpu: u8,
ram: u8, ram: u8,
key_presses: u16, key_presses: u16,
left_clicks: u16, clicks: u16,
right_clicks: u16,
) { ) {
let message = format!( let message = format!(
"{{ \"cpu\": {}, \"ram\": {}, \"key_presses\": {}, \"left_clicks\": {}, \"right_clicks\": {} }}", "{{ \"cpu\": {}, \"ram\": {}, \"key_presses\": {}, \"clicks\": {} }}",
cpu, ram, key_presses, left_clicks, right_clicks cpu, ram, key_presses, clicks
); );
println!("Sending to WebSocket: {}", message); println!("Sending to WebSocket: {}", message);