Merge branch 'master' of gburri.org:valheim_web

diff --git a/backend/build.rs b/backend/build.rs
index be60465..012f651 100644 (file)
--- a/backend/build.rs
+++ b/backend/build.rs
@@ -41,6 +41,6 @@ fn main() {
     if !output.status.success() {
         // SASS will put the error in the file.
         let error = std::fs::read_to_string("./static/style.css").expect("unable to read style.css");
-        panic!("{}", error);
+        panic!("Error from SASS: {}", error);
     }
 }

diff --git a/backend/src/valheim_controller.rs b/backend/src/valheim_controller.rs
index f92e63d..631f46b 100644 (file)
--- a/backend/src/valheim_controller.rs
+++ b/backend/src/valheim_controller.rs
@@ -37,11 +37,13 @@ impl ValheimExe {
     }\r
 \r
     pub fn format_active_players(&self) -> String {\r
+        /* Commented because the player list isn't correct (the number is).\r
         if self.active_players.len() == 0 {\r
             String::from("<none>")\r
         } else {\r
             self.active_players.join(", ")\r
-        }\r
+        }*/\r
+        self.active_players.len().to_string()\r
     }\r
 \r
     pub fn format_last_backup(&self) -> String {\r
@@ -81,6 +83,7 @@ const STRING_BEFORE_CHARACTER_NAME: &str = "Got character ZDOID from";
 #[cfg(target_os = "linux")]\r
 const STRING_BEFORE_NB_OF_CONNECTIONS: &str = "Connections";\r
 \r
+// It doesn't work for the moment, it only scan the connection event and do not treat disconnections.\r
 #[cfg(target_os = "linux")]\r
 fn get_active_players() -> Vec<String> {\r
     let mut journal =\r