X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;f=backend%2Fsrc%2Fvalheim_controller.rs;h=aa0ff319ba415f1c39f5f6a431b8fd434accfeda;hb=c6b54f676e513e2b43a9190f2afae5178641f978;hp=ea502b0c56ebf940a4f8111c3dd394aa3438288a;hpb=789a6a753a37442c641e63c52105ae2433fda634;p=valheim_web.git

diff --git a/backend/src/valheim_controller.rs b/backend/src/valheim_controller.rs
index ea502b0..aa0ff31 100644
--- a/backend/src/valheim_controller.rs
+++ b/backend/src/valheim_controller.rs
@@ -1,7 +1,6 @@
-use sysinfo::{ ProcessExt, SystemExt };
 
 use std::{ fs, time::SystemTime };
-
+use sysinfo::{ ProcessExt, SystemExt };
 use chrono::{ DateTime, offset::Local };
 
 #[cfg(target_os = "linux")]
@@ -13,7 +12,7 @@ pub struct ValheimExe {
     load_average_5min: f64, // [%].
     uptime: u64, // [s].
     world_size: u64, // [B].
-    nb_of_players: u32,
+    active_players: Vec<String>,
     last_backup: Option<SystemTime>,
 }
 
@@ -30,15 +29,21 @@ impl ValheimExe {
         let mins = self.uptime / 60;
         let hours = mins / 60;
         let days = hours / 24;
-        format!("{}d{}h{}min", days, hours - 24 * days, mins - 60 * hours)
+        format!("{}d {}h {}min", days, hours - 24 * days, mins - 60 * hours)
     }
 
     pub fn format_world_size(&self) -> String {
         format_byte_size(self.world_size, 2)
     }
 
-    pub fn get_nb_of_player(&self) -> u32 {
-        self.nb_of_players
+    pub fn format_active_players(&self) -> String {
+        /* Commented because the player list isn't correct (the number is).
+        if self.active_players.len() == 0 {
+            String::from("<none>")
+        } else {
+            self.active_players.join(", ")
+        }*/
+        self.active_players.len().to_string()
     }
 
     pub fn format_last_backup(&self) -> String {
@@ -73,36 +78,64 @@ fn format_byte_size(bytes: u64, precision: usize) -> String {
 const VALHEIM_PROCESS_NAME: &str = "valheim_server";
 
 #[cfg(target_os = "linux")]
-fn get_number_of_players() -> u32 {
+const STRING_BEFORE_CHARACTER_NAME: &str = "Got character ZDOID from";
+
+#[cfg(target_os = "linux")]
+const STRING_BEFORE_NB_OF_CONNECTIONS: &str = "Connections";
+
+// It doesn't work for the moment, it only scan the connection event and do not treat disconnections.
+#[cfg(target_os = "linux")]
+fn get_active_players() -> Vec<String> {
     let mut journal =
         journal::OpenOptions::default().current_user(true).open().unwrap();
 
     journal.seek_tail().unwrap();
 
+    let mut number_of_connections = -1i32;
+    let mut players : Vec<String> = Vec::new();
+
     loop {
         match journal.previous_entry() {
             Ok(Some(entry)) => {
                 if let (Some(unit), Some(mess)) = (entry.get("_SYSTEMD_UNIT"), entry.get("MESSAGE")) {
                     if unit == "valheim.service" {
-                        if let Some(pos) = mess.find("Connections") {
-                            let nb_of_connections_str = mess.get(pos+12..).unwrap();
+                        if let Some(pos) = mess.find(STRING_BEFORE_CHARACTER_NAME) {
+                            let character_str = mess.get(pos+STRING_BEFORE_CHARACTER_NAME.len()+1..).unwrap();
+                            if let Some(pos_end) = character_str.find(" : ") {
+                                let player_name = String::from(character_str.get(0..pos_end).unwrap());
+                                if !players.contains(&player_name) {
+                                    players.push(player_name);
+                                    if players.len() as i32 == number_of_connections {
+                                        return players;
+                                    }
+                                }
+                            }
+                        }
+                        else if let Some(pos) = mess.find(STRING_BEFORE_NB_OF_CONNECTIONS) {
+                            let nb_of_connections_str = mess.get(pos+STRING_BEFORE_NB_OF_CONNECTIONS.len()+1..).unwrap();
                             if let Some(pos_end) = nb_of_connections_str.find(' ') {
-                                if let Ok(n) = nb_of_connections_str.get(0..pos_end).unwrap().parse() {
-                                    return n;
+                                if let Ok(n) = nb_of_connections_str.get(0..pos_end).unwrap().parse::<i32>() {
+                                    if number_of_connections == -1 {
+                                        number_of_connections = n;
+
+                                        if players.len() as i32 >= number_of_connections {
+                                            return players;
+                                        }
+                                    }
                                 }
                             }
                         }
                     }
                 }
             },
-            _ => return 0
+            _ => return players
         }
     }
 }
 
 #[cfg(target_os = "windows")]
-fn get_number_of_players() -> u32 {
-    0
+fn get_active_players() -> Vec<String> {
+    Vec::new()
 }
 
 fn get_last_backup_datetime(backup_path: &str) -> Option<SystemTime> {
@@ -110,7 +143,7 @@ fn get_last_backup_datetime(backup_path: &str) -> Option<SystemTime> {
         fs::read_dir(backup_path).ok()?.filter_map(
             |e| {
                 let dir = e.ok()?;
-                if dir.path().is_file() { Some(dir.metadata().ok()?.created().ok()?) } else { None }
+                if dir.path().is_file() { Some(dir.metadata().ok()?.modified().ok()?) } else { None }
             }
         )
         .collect::<Vec<SystemTime>>();
@@ -123,20 +156,19 @@ fn get_last_backup_datetime(backup_path: &str) -> Option<SystemTime> {
 pub fn get_valheim_executable_information(world_path: &str, backup_path: &str) -> Option<ValheimExe> {
     let mut system = sysinfo::System::new_all();
     system.refresh_system();
-    let processes = system.get_process_by_name(VALHEIM_PROCESS_NAME);
+    let mut processes = system.processes_by_name(VALHEIM_PROCESS_NAME);
 
-    if processes.len() >= 1 {
-        let process = processes.first().unwrap();
+    if let Some(process) = processes.next() {
 
         let world_size = match std::fs::metadata(world_path) { Ok(f) => f.len(), Err(_) => 0u64 };
 
         Some(
             ValheimExe {
                 memory: process.memory(),
-                load_average_5min: system.get_load_average().five / system.get_processors().len() as f64 * 100.,
+                load_average_5min: system.load_average().five / system.cpus().len() as f64 * 100.,
                 uptime: std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() - process.start_time(),
                 world_size,
-                nb_of_players: get_number_of_players(),
+                active_players: get_active_players(),
                 last_backup: get_last_backup_datetime(backup_path)
             }
         )