Update dependencies and adapt to new sysinfo API

[minecraft_web.git] / backend / src / minecraft_controller.rs

diff --git a/backend/src/minecraft_controller.rs b/backend/src/minecraft_controller.rs
index 163008a..8f67d20 100644 (file)
--- a/backend/src/minecraft_controller.rs
+++ b/backend/src/minecraft_controller.rs
@@ -86,14 +86,16 @@ fn get_status_from_rcon(rcon_password: &str) -> StatusFromRcon {
                 StatusFromRcon {\r
                     players:\r
                         match client.send_command("list".to_string()) {\r
-                            Ok(resp) => {\r
-                                resp.body\r
-                                    .split('\n')\r
-                                    .skip(1)\r
-                                    .filter(|n| !n.is_empty())\r
-                                    .map(|n| n.to_string())\r
-                                    .collect()\r
-                            },\r
+                            Ok(resp) =>\r
+                                match resp.body.find(':') {\r
+                                    Some(i) if i < resp.body.len() -1 =>\r
+                                        resp.body[i + 1..resp.body.len()]\r
+                                            .split(',')\r
+                                            .map(|nick| nick.trim().to_string())\r
+                                            .filter(|nick| !nick.is_empty())\r
+                                            .collect(),\r
+                                    _ => Vec::new()\r
+                                },\r
                             Err(_e) => {\r
                                 println!("Error from 'list' command");\r
                                 Vec::new()\r
@@ -130,12 +132,10 @@ fn get_last_backup_datetime(backup_path: &str) -> Option<SystemTime> {
 pub fn get_minecraft_executable_information(world_path: &str, backup_path: &str, rcon_password: &str) -> Option<MinecraftExe> {\r
     let mut system = sysinfo::System::new_all();\r
     system.refresh_system();\r
-    let processes = system.get_process_by_name(MINECRAFT_PROCESS_NAME);\r
+    let mut processes = system.processes_by_name(MINECRAFT_PROCESS_NAME);\r
 \r
     // TODO: find the correct process by checking the correct jar name in parameters.\r
-    if processes.len() >= 1 {\r
-        let process = processes.first().unwrap();\r
-\r
+    if let Some(process) = processes.next() {\r
         let world_size = match fs_extra::dir::get_size(world_path) { Ok(l) => l, Err(_) => 0u64 };\r
 \r
         let status_from_rcon = get_status_from_rcon(rcon_password);\r
@@ -143,7 +143,7 @@ pub fn get_minecraft_executable_information(world_path: &str, backup_path: &str,
         Some(\r
             MinecraftExe {\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: status_from_rcon.players,\r