Add world size

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

diff --git a/backend/src/valheim_controller.rs b/backend/src/valheim_controller.rs
index 2ce5ea4..efad791 100644 (file)
--- a/backend/src/valheim_controller.rs
+++ b/backend/src/valheim_controller.rs
@@ -1,25 +1,28 @@
-use std::cmp::min;\r
-\r
-use sysinfo::{ ProcessExt, SystemExt };\r
+use sysinfo::{ComponentExt, ProcessExt, SystemExt};\r
 \r
 #[derive(Debug)]\r
 pub struct ValheimExe {\r
     memory: u64, // [kB].\r
-    cpu_usage: f32, // [%].\r
+    load_average_5min: f64, // [%].\r
     uptime: u64, // [s].\r
+    world_size: u64, // [B].\r
 }\r
 \r
 impl ValheimExe {\r
     pub fn format_memory(&self) -> String {\r
         format_byte_size(self.memory * 1024, 2)\r
     }\r
-    pub fn format_cpu_usage(&self) -> String {\r
-        format!("{:.2} %", self.cpu_usage)\r
+    pub fn format_load_average(&self) -> String {\r
+        format!("{:.2} %", self.load_average_5min)\r
     }\r
     pub fn format_uptime(&self) -> String {\r
         let mins = self.uptime / 60;\r
         let hours = mins / 60;\r
-        format!("{}h{}min", hours, mins - 60 * hours)\r
+        let days = hours / 24;\r
+        format!("{}d{}h{}min", days, hours - 24 * days, mins - 60 * hours)\r
+    }\r
+    pub fn format_world_size(&self) -> String {\r
+        format_byte_size(self.world_size, 2)\r
     }\r
 }\r
 \r
@@ -44,23 +47,27 @@ fn format_byte_size(bytes: u64, precision: usize) -> String {
 }\r
 \r
 const VALHEIM_PROCESS_NAME: &str = "valheim_server";\r
+const VALHEIM_WORLD_PATH: &str = "/home/greg/ValheimWorld/pouet.db"; // TODO: Put in conf.\r
 \r
 pub fn get_valheim_executable_information() -> Option<ValheimExe> {\r
     let mut system = sysinfo::System::new_all();\r
-    system.refresh_all();\r
+    system.refresh_system();\r
     let processes = system.get_process_by_name(VALHEIM_PROCESS_NAME);\r
 \r
     if processes.len() >= 1 {\r
         let process = processes.first().unwrap();\r
 \r
+        let world_size = match std::fs::metadata(VALHEIM_WORLD_PATH) { Ok(f) => f.len(), Err(_) => 0u64 };\r
+\r
         Some(\r
             ValheimExe {\r
                 memory: process.memory(),\r
-                cpu_usage: process.cpu_usage(),\r
-                uptime: std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() - process.start_time()\r
+                load_average_5min: system.get_load_average().five / system.get_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
             }\r
         )\r
     } else {\r
         None\r
     }\r
-}
\ No newline at end of file
+}\r