Be sure the right number of connection is used

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

diff --git a/backend/src/valheim_controller.rs b/backend/src/valheim_controller.rs
index a89c442..8c04e23 100644 (file)
--- a/backend/src/valheim_controller.rs
+++ b/backend/src/valheim_controller.rs
@@ -75,6 +75,8 @@ fn format_byte_size(bytes: u64, precision: usize) -> String {
 }\r
 \r
 const VALHEIM_PROCESS_NAME: &str = "valheim_server";\r
+const STRING_BEFORE_CHARACTER_NAME: &str = "Got character ZDOID from";\r
+const STRING_BEFORE_NB_OF_CONNECTIONS: &str = "Connections";\r
 \r
 #[cfg(target_os = "linux")]\r
 fn get_active_players() -> Vec<String> {\r
@@ -83,7 +85,7 @@ fn get_active_players() -> Vec<String> {
 \r
     journal.seek_tail().unwrap();\r
 \r
-    let mut number_of_connections = 0;\r
+    let mut number_of_connections = -1i32;\r
     let mut players : Vec<String> = Vec::new();\r
 \r
     loop {\r
@@ -91,26 +93,28 @@ fn get_active_players() -> Vec<String> {
             Ok(Some(entry)) => {\r
                 if let (Some(unit), Some(mess)) = (entry.get("_SYSTEMD_UNIT"), entry.get("MESSAGE")) {\r
                     if unit == "valheim.service" {\r
-                        //"Got character ZDOID from {}"\r
-                        if let Some(pos) = mess.find("Got character ZDOID from") {\r
-                            let character_str = mess.get(pos+25..).unwrap();\r
+                        if let Some(pos) = mess.find(STRING_BEFORE_CHARACTER_NAME) {\r
+                            let character_str = mess.get(pos+STRING_BEFORE_CHARACTER_NAME.len()+1..).unwrap();\r
                             if let Some(pos_end) = character_str.find(" : ") {\r
                                 let player_name = String::from(character_str.get(0..pos_end).unwrap());\r
                                 if !players.contains(&player_name) {\r
                                     players.push(player_name);\r
-                                    if players.len() == number_of_connections {\r
+                                    if players.len() as i32 == number_of_connections {\r
                                         return players;\r
                                     }\r
                                 }\r
                             }\r
                         }\r
-                        else if let Some(pos) = mess.find("Connections") {\r
-                            let nb_of_connections_str = mess.get(pos+12..).unwrap();\r
+                        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
-                                    number_of_connections = n;\r
-                                    if players.len() >= number_of_connections {\r
-                                        return players;\r
+                                    if number_of_connections == -1 {\r
+                                        number_of_connections = n as i32\r
+\r
+                                        if players.len() as i32 >= number_of_connections {\r
+                                            return players;\r
+                                        }\r
                                     }\r
                                 }\r
                             }\r