X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;f=backend%2Fsrc%2Fmain.rs;h=a71142722207a239cbd3e7e8ac07e793c331d4ef;hb=b76be16ce4c1bf35f67bab105e0f454da6662240;hp=d2607fd5350eaade99205935dcc5c57c7ad7f9d8;hpb=e9855a47ac1f9ebede015e89ec9cd1291c2876ea;p=valheim_web.git

diff --git a/backend/src/main.rs b/backend/src/main.rs
index d2607fd..a711427 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -2,12 +2,13 @@
 extern crate listenfd;
 extern crate askama;
 
+// use futures::sink::With;
 use listenfd::ListenFd;
 use actix_files as fs;
-use actix_web::{ get, web, Responder, middleware, App, HttpServer, web::Query };
+use actix_web::{ get, web, Responder, middleware, App, HttpServer };
 use askama::Template;
 
-use std::{ sync::Mutex, fs::File, env::args, io::prelude::* };
+use std::{ sync::Mutex, env::args, fs::File, io::prelude::* };
 use ron::{ de::from_reader, ser::{ to_string_pretty, PrettyConfig } };
 use serde::{ Deserialize, Serialize };
 
@@ -18,30 +19,49 @@ mod valheim_controller;
 #[derive(Template)]
 #[template(path = "main.html")]
 struct MainTemplate {
-    sentence: String,
+    text_status: String,
+    memory: String,
+    load_average: String,
+    uptime: String,
+    world_size: String
 }
 
-#[derive(Deserialize)]
-pub struct Request {
-   m: Option<String>
-}
+const VALUE_UNKNOWN: &str = "-";
 
 #[get("/")]
-async fn main_page(/*key_shared: web::Data<Mutex<String>>,*/ query: Query<Request>) -> impl Responder {
-    //let key = key_shared.lock().unwrap();
-
-    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 }
+async fn main_page(config_shared: web::Data<Mutex<Config>>) -> impl Responder {
+    let config = config_shared.lock().unwrap();
+
+    match valheim_controller::get_valheim_executable_information(&config.world_path) {
+        Some(info) =>
+            MainTemplate {
+                text_status: String::from("Valheim server is up and running :)"),
+                memory: info.format_memory(),
+                load_average: info.format_load_average(),
+                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(), world_size: value_unknown.clone() }
+        }
+    }
 }
 
 #[derive(Debug, Deserialize, Serialize)]
 struct Config {
-    port: u16
+    port: u16,
+    #[serde(default = "empty_string")]
+    world_path: String,
 }
 
-const DEFAULT_CONFIG: Config = Config { port: 8082 };
+fn empty_string() -> String { "".to_string() }
+
+impl Config {
+    fn default() -> Self {
+        Config { port: 8082, world_path: String::from("") }
+    }
+}
 
 fn get_exe_name() -> String {
     let first_arg = std::env::args().next().unwrap();
@@ -55,29 +75,32 @@ fn load_config() -> Config {
         Ok(file) => from_reader(file).unwrap_or_else(|_| panic!("Failed to open configuration file {}", consts::FILE_CONF)),
         Err(_) => {
             let mut file = File::create(consts::FILE_CONF) .unwrap();
-            file.write_all(to_string_pretty(&DEFAULT_CONFIG, PrettyConfig::new()).unwrap().as_bytes()).unwrap(); // We do not use 'to_writer' because it can't pretty format the output.
-            DEFAULT_CONFIG
+            let default_config = Config::default();
+            file.write_all(to_string_pretty(&default_config, PrettyConfig::new()).unwrap().as_bytes()).unwrap(); // We do not use 'to_writer' because it can't pretty format the output.
+            default_config
         }
     }
 }
 
 #[actix_rt::main]
 async fn main() -> std::io::Result<()> {
+    let config = load_config();
+    let port = config.port;
 
-    if process_args() { return Ok(()) }
-
-    println!("Starting RUP as web server...");
+    if process_args(&config) { return Ok(()) }
 
-    let config = load_config();
+    println!("Starting Valheim Admin as web server...");
 
     println!("Configuration: {:?}", config);
 
+    let config_shared = web::Data::new(Mutex::new(config));
+
     let mut listenfd = ListenFd::from_env();
     let mut server =
         HttpServer::new(
             move || {
                 App::new()
-                    // .app_data(key_shared.clone())
+                    .app_data(config_shared.clone())
                     .wrap(middleware::Compress::default())
                     .wrap(middleware::Logger::default())
                     .service(main_page)
@@ -89,13 +112,13 @@ async fn main() -> std::io::Result<()> {
         if let Some(l) = listenfd.take_tcp_listener(0).unwrap() {
             server.listen(l).unwrap()
         } else {
-            server.bind(&format!("0.0.0.0:{}", config.port)).unwrap()
+            server.bind(&format!("0.0.0.0:{}", port)).unwrap()
         };
 
     server.run().await
 }
 
-fn process_args() -> bool {
+fn process_args(config: &Config) -> bool {
     fn print_usage() {
         println!("Usage:");
         println!(" {} [--help] [--status]", get_exe_name());
@@ -107,7 +130,7 @@ fn process_args() -> bool {
         print_usage();
         return true
     } else if args.iter().any(|arg| arg == "--status") {
-        valheim_controller::is_valheim_running();
+        println!("{:?}", valheim_controller::get_valheim_executable_information(&config.world_path));
         return true
     }