X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;f=backend%2Fsrc%2Fmain.rs;h=c186c3f6dcc500b6a4ffbf6029a5581e542289ff;hb=b0336a574d710ba48449d7330b332c18231df1c5;hp=a2201d4c8ad5b6efa1e9cd2af0f928721ebdbd66;hpb=9deef63b608b62780a4dfed031410c25e10e477a;p=valheim_web.git

diff --git a/backend/src/main.rs b/backend/src/main.rs
index a2201d4..c186c3f 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -21,22 +21,22 @@ struct MainTemplate {
     load_average: String,
     uptime: String,
     world_size: String,
-    nb_of_players: u32,
+    active_players: String,
     last_backup: String,
 }
 
 const VALUE_UNKNOWN: &str = "-";
 
 #[cached(size = 1, time = 10)]
-fn get_valheim_executable_information_cached(world_path: String) -> Option<valheim_controller::ValheimExe> {
-    valheim_controller::get_valheim_executable_information(&world_path)
+fn get_valheim_executable_information_cached(world_path: String, backup_path: String) -> Option<valheim_controller::ValheimExe> {
+    valheim_controller::get_valheim_executable_information(&world_path, &backup_path)
 }
 
 #[get("/")]
 async fn main_page(config_shared: web::Data<Mutex<Config>>) -> impl Responder {
     let config = config_shared.lock().unwrap();
 
-    match get_valheim_executable_information_cached(config.world_path.clone()) {
+    match get_valheim_executable_information_cached(config.world_path.clone(), config.backup_path.clone()) {
         Some(info) =>
             MainTemplate {
                 text_status: String::from("Valheim server is up and running :)"),
@@ -44,12 +44,19 @@ async fn main_page(config_shared: web::Data<Mutex<Config>>) -> impl Responder {
                 load_average: info.format_load_average(),
                 uptime: info.format_uptime(),
                 world_size: info.format_world_size(),
-                nb_of_players: info.get_nb_of_player(),
+                active_players: info.format_active_players(),
                 last_backup: info.format_last_backup()
             },
         None => {
             let value_unknown = String::from(VALUE_UNKNOWN);
-            MainTemplate { text_status: String::from("Valheim server is down :("), memory: value_unknown.clone(), load_average: value_unknown.clone(), uptime: value_unknown.clone(), world_size: value_unknown.clone(), nb_of_players: 0, last_backup: value_unknown.clone() }
+            MainTemplate {
+                text_status: String::from("Valheim server is down :("),
+                memory: value_unknown.clone(),
+                load_average: value_unknown.clone(),
+                uptime: value_unknown.clone(),
+                world_size: value_unknown.clone(),
+                active_players: value_unknown.clone(),
+                last_backup: value_unknown.clone() }
         }
     }
 }