Remove all warnings

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

diff --git a/backend/src/main.rs b/backend/src/main.rs
index ce9ae9f..b386358 100644 (file)
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -5,7 +5,7 @@ extern crate askama;
 // use futures::sink::With;
 use listenfd::ListenFd;
 use actix_files as fs;
-use actix_web::{ get, Responder, middleware, App, HttpServer, web::Query };
+use actix_web::{ get, Responder, middleware, App, HttpServer };
 use askama::Template;
 
 use std::{ /*sync::Mutex, */fs::File, env::args, io::prelude::* };
@@ -22,18 +22,14 @@ struct MainTemplate {
     text_status: String,
     memory: String,
     load_average: String,
-    uptime: String
-}
-
-#[derive(Deserialize)]
-pub struct Request {
-   m: Option<String>
+    uptime: String,
+    world_size: String
 }
 
 const VALUE_UNKNOWN: &str = "-";
 
 #[get("/")]
-async fn main_page(/*key_shared: web::Data<Mutex<String>>,*/ query: Query<Request>) -> impl Responder {
+async fn main_page() -> impl Responder {
     //let key = key_shared.lock().unwrap();
 
     match valheim_controller::get_valheim_executable_information() {
@@ -42,21 +38,14 @@ async fn main_page(/*key_shared: web::Data<Mutex<String>>,*/ query: Query<Reques
                 text_status: String::from("Valheim server is up and running :)"),
                 memory: info.format_memory(),
                 load_average: info.format_load_average(),
-                uptime: info.format_uptime()
+                uptime: info.format_uptime(),
+                world_size: info.format_world_size()
             },
         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() }
+            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() }
         }
     }
-
-    /*
-
-    let m =
-        if valheim_controller::is_valheim_running() { String::from("Valheim server is up and running") } else { String::from("Valheim server is down :(") };
-
-    MainTemplate { sentence: m }
-    */
 }
 
 #[derive(Debug, Deserialize, Serialize)]