Remove all warnings

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

diff --git a/backend/src/valheim_controller.rs b/backend/src/valheim_controller.rs
index f36307c..c09f080 100644 (file)
--- a/backend/src/valheim_controller.rs
+++ b/backend/src/valheim_controller.rs
@@ -1,10 +1,11 @@
-use sysinfo::{ ProcessExt, SystemExt };\r
+use sysinfo::{ProcessExt, SystemExt};\r
 \r
 #[derive(Debug)]\r
 pub struct ValheimExe {\r
     memory: u64, // [kB].\r
     load_average_5min: f64, // [%].\r
     uptime: u64, // [s].\r
+    world_size: u64, // [B].\r
 }\r
 \r
 impl ValheimExe {\r
@@ -20,6 +21,9 @@ impl ValheimExe {
         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
 const BINARY_PREFIXES: [&str; 8] = ["B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB"];\r
@@ -27,9 +31,7 @@ const BINARY_PREFIXES: [&str; 8] = ["B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB
 fn format_byte_size(bytes: u64, precision: usize) -> String {\r
     for i in 0 .. 8 {\r
         let mut size: u64 = 1;\r
-        for j in 0 .. i {\r
-            size *= 1024;\r
-        }\r
+        size *= 1024u64.pow(i as u32);\r
 \r
         if bytes < 1024 {\r
             return format!("{} {}", std::cmp::max(0u64, bytes), BINARY_PREFIXES[i]);\r
@@ -43,20 +45,24 @@ 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
                 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
+                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