From c98acf824d7646fe0fefa99d13f338a879a18927 Mon Sep 17 00:00:00 2001
From: BlueFunny <bluefunny@cock.li>
Date: Sun, 28 Jan 2024 00:20:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E4=BA=86=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE,=20=E5=B0=8F=E4=BF=AE=E4=BA=86=E5=87=A0?=
 =?UTF-8?q?=E4=B8=AA=E5=9C=B0=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config.rs | 73 ++++++++++++++++++++-------------------------------
 1 file changed, 29 insertions(+), 44 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 7140ff3..a5ddb90 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -2,7 +2,7 @@ use {
     log::{error, warn},
     serde::{Deserialize, Serialize},
     serde_json::Result,
-    std::{env, fs, io::Error},
+    std::{env, fs},
 };
 
 const CONFIG_PATH: &str = "config.toml";
@@ -10,7 +10,7 @@ const CONFIG_PATH: &str = "config.toml";
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Config {
     /// http or https
-    /// CLUSTER_BYOC + CENTER_URL
+    /// CENTER_URL
     pub center_url: String,
     /// CLUSTER_IP
     pub host_ip: String,
@@ -22,61 +22,45 @@ pub struct Config {
     pub cluster_secret: String,
     /// NO_DEMAON
     pub no_demaon: bool,
-    // DISABLE_ACCESS_LOG [DECRAPEATED]
-    // pub disable_access_log: bool,
-    // FORCE_NOOPEN [DECRAPEATED]
-    // pub force_noopen: bool,
-    // ENABLE_NGINX [DECRAPEATED]
-    // pub enable_nginx: bool,
 }
 
 impl Config {
     pub fn new(
-        center_url: String,
-        host_ip: String,
-        host_port: u32,
+        center_url: Option<String>,
+        host_ip: Option<String>,
+        host_port: Option<u32>,
         cluster_id: String,
         cluster_secret: String,
-        no_demaon: bool,
+        no_demaon: Option<bool>,
     ) -> Self {
         // https://openbmclapi.bangbang93.com
         Self {
-            center_url,
-            host_ip,
-            host_port,
+            center_url: center_url.unwrap_or("https://openbmclapi.bangbang93.com".to_string()),
+            host_ip: host_ip.unwrap_or("0.0.0.0".to_string()),
+            host_port: host_port.unwrap_or(8080),
             cluster_id,
             cluster_secret,
-            no_demaon,
+            no_demaon: no_demaon.unwrap_or(false),
         }
     }
 
     pub fn convert_from_env() {
         // Load from env
-        let center_url = env::var("CENTER_URL").unwrap_or("openbmclapi.bangbang93.com".to_string());
-        let host_ip: String = env::var("CLUSTER_IP").unwrap_or("0.0.0.0".to_string());
-        let host_port = env::var("CLUSTER_PORT")
-            .unwrap_or("8080".to_string())
-            .parse::<u32>()
-            .unwrap_or_else(|_| {
-                error!("CLUSTER_PORT must be a number");
-                panic!();
-            });
-        let cluster_id = env::var("CLUSTER_ID").unwrap_or_else(|_| {
-            error!("CLUSTER_ID must be set");
-            panic!();
-        });
-        let cluster_secret = env::var("CLUSTER_SECRET").unwrap_or_else(|_| {
-            error!("CLUSTER_SECRET must be set");
-            panic!();
-        });
-        let no_demaon = env::var("NO_DAEMON")
-            .unwrap_or("false".to_string())
-            .parse::<bool>()
-            .unwrap_or_else(|_| {
-                error!("NO_DAEMON must be true or false");
-                panic!();
-            });
+        let center_url = env::var("CENTER_URL").ok();
+        let host_ip = env::var("CLUSTER_IP").ok();
+        let host_port = env::var("CLUSTER_PORT").unwrap().parse::<u32>().ok();
+        let no_demaon = env::var("NO_DAEMON").unwrap().parse::<bool>().ok();
 
+        // Load from env
+        let cluster_id = env::var("CLUSTER_ID").unwrap_or_else(|err| {
+            error!("CLUSTER_ID must be set");
+            panic!("{}", err);
+        });
+        let cluster_secret = env::var("CLUSTER_SECRET").unwrap_or_else(|err| {
+            error!("CLUSTER_SECRET must be set");
+            panic!("{}", err);
+        });
+        
         // Decrapated warning
         if env::var("CLUSTER_BYOC").is_ok() {
             warn!("CLUSTER_BYOC is deprecated, ignored");
@@ -107,14 +91,15 @@ impl Config {
     }
     pub fn save(&self) {
         if !fs::canonicalize(CONFIG_PATH).is_ok() {
-            fs::File::create(CONFIG_PATH).unwrap_or_else(|_| {
+            fs::File::create(CONFIG_PATH).unwrap_or_else(|err| {
                 error!("Failed to create config file");
-                panic!();
+                panic!("{}", err);
             });
+            //TODO: Trigger initialization
         }
-        fs::write(CONFIG_PATH, toml::to_string(&self).unwrap()).unwrap_or_else(|_| {
+        fs::write(CONFIG_PATH, toml::to_string(&self).unwrap()).unwrap_or_else(|err| {
             error!("Failed to save config");
-            panic!();
+            panic!("{}", err);
         });
     }