Update dependencies

[valheim_web.git] / backend / src / valheim_controller.rs

diff --git a/backend/src/valheim_controller.rs b/backend/src/valheim_controller.rs
index f8bcbed..f92e63d 100644 (file)
--- a/backend/src/valheim_controller.rs
+++ b/backend/src/valheim_controller.rs
@@ -1,7 +1,6 @@
-use sysinfo::{ ProcessExt, SystemExt };\r
 \r
 use std::{ fs, time::SystemTime };\r
-\r
+use sysinfo::{ ProcessExt, SystemExt };\r
 use chrono::{ DateTime, offset::Local };\r
 \r
 #[cfg(target_os = "linux")]\r
@@ -75,7 +74,11 @@ fn format_byte_size(bytes: u64, precision: usize) -> String {
 }\r
 \r
 const VALHEIM_PROCESS_NAME: &str = "valheim_server";\r
+\r
+#[cfg(target_os = "linux")]\r
 const STRING_BEFORE_CHARACTER_NAME: &str = "Got character ZDOID from";\r
+\r
+#[cfg(target_os = "linux")]\r
 const STRING_BEFORE_NB_OF_CONNECTIONS: &str = "Connections";\r
 \r
 #[cfg(target_os = "linux")]\r
@@ -108,9 +111,9 @@ fn get_active_players() -> Vec<String> {
                         else if let Some(pos) = mess.find(STRING_BEFORE_NB_OF_CONNECTIONS) {\r
                             let nb_of_connections_str = mess.get(pos+STRING_BEFORE_NB_OF_CONNECTIONS.len()+1..).unwrap();\r
                             if let Some(pos_end) = nb_of_connections_str.find(' ') {\r
-                                if let Ok(n) = nb_of_connections_str.get(0..pos_end).unwrap().parse() {\r
+                                if let Ok(n) = nb_of_connections_str.get(0..pos_end).unwrap().parse::<i32>() {\r
                                     if number_of_connections == -1 {\r
-                                        number_of_connections = n as i32;\r
+                                        number_of_connections = n;\r
 \r
                                         if players.len() as i32 >= number_of_connections {\r
                                             return players;\r
@@ -150,17 +153,16 @@ fn get_last_backup_datetime(backup_path: &str) -> Option<SystemTime> {
 pub fn get_valheim_executable_information(world_path: &str, backup_path: &str) -> Option<ValheimExe> {\r
     let mut system = sysinfo::System::new_all();\r
     system.refresh_system();\r
-    let processes = system.get_process_by_name(VALHEIM_PROCESS_NAME);\r
+    let mut processes = system.processes_by_name(VALHEIM_PROCESS_NAME);\r
 \r
-    if processes.len() >= 1 {\r
-        let process = processes.first().unwrap();\r
+    if let Some(process) = processes.next() {\r
 \r
         let world_size = match std::fs::metadata(world_path) { Ok(f) => f.len(), Err(_) => 0u64 };\r
 \r
         Some(\r
             ValheimExe {\r
                 memory: process.memory(),\r
-                load_average_5min: system.get_load_average().five / system.get_processors().len() as f64 * 100.,\r
+                load_average_5min: system.load_average().five / system.processors().len() as f64 * 100.,\r
                 uptime: std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() - process.start_time(),\r
                 world_size,\r
                 active_players: get_active_players(),\r