Display the minecraft server version

[minecraft_web.git] / backend / src / main.rs

diff --git a/backend/src/main.rs b/backend/src/main.rs
index 2129033..4ce1508 100644 (file)
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -1,7 +1,6 @@
 extern crate askama;
 
 use std::{ sync::Mutex, env::args, fs::File, io::prelude::* };
-
 use actix_files as fs;
 use actix_web::{ get, web, Responder, middleware, App, HttpServer };
 use askama::Template;
@@ -10,13 +9,13 @@ use serde::{ Deserialize, Serialize };
 use cached::proc_macro::cached;
 
 mod consts;
-mod tests;
 mod minecraft_controller;
 
 #[derive(Template)]
 #[template(path = "main.html")]
 struct MainTemplate {
     text_status: String,
+    version: String,
     memory: String,
     load_average: String,
     uptime: String,
@@ -40,6 +39,7 @@ async fn main_page(config_shared: web::Data<Mutex<Config>>) -> impl Responder {
         Some(info) =>
             MainTemplate {
                 text_status: String::from("Minecraft server is up and running :)"),
+                version: info.format_version(),
                 memory: info.format_memory(),
                 load_average: info.format_load_average(),
                 uptime: info.format_uptime(),
@@ -51,12 +51,14 @@ async fn main_page(config_shared: web::Data<Mutex<Config>>) -> impl Responder {
             let value_unknown = String::from(VALUE_UNKNOWN);
             MainTemplate {
                 text_status: String::from("Minecraft server is down :("),
+                version: value_unknown.clone(),
                 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() }
+                last_backup: value_unknown.clone()
+            }
         }
     }
 }