config support; started more sharding

src/config.rs

@@ -1,24 +1,84 @@
+use serde_derive::Deserialize;
+use std::collections::HashMap;
+use std::path::Path;
+use tokio::fs::File;
+use tokio::io::AsyncReadExt;
+use toml;
+
+use crate::errors::Error;
+
 #[derive(Clone, PartialEq, Hash, std::cmp::Eq, Debug)]
 pub struct Address {
     pub host: String,
     pub port: String,
 }
 
-#[derive(Clone, PartialEq, Hash, std::cmp::Eq)]
+#[derive(Clone, PartialEq, Hash, std::cmp::Eq, Deserialize, Debug)]
 pub struct User {
     pub name: String,
     pub password: String,
 }
 
-// #[derive(Clone)]
-// pub struct Config {
-//     pools: HashMap<String, Pool<ServerPool>>,
-// }
+#[derive(Deserialize, Debug, Clone)]
+pub struct General {
+    pub host: String,
+    pub port: i16,
+    pub pool_size: u32,
+    pub pool_mode: String,
+    pub connect_timeout: u64,
+    pub healthcheck_timeout: u64,
+    pub ban_time: i64,
+}
 
-// impl Config {
-//     pub fn new() -> Config {
-//         Config {
-//             pools: HashMap::new(),
-//         }
-//     }
-// }
+#[derive(Deserialize, Debug, Clone)]
+pub struct Shard {
+    pub servers: Vec<(String, u16)>,
+    pub database: String,
+}
+
+#[derive(Deserialize, Debug, Clone)]
+pub struct Config {
+    pub general: General,
+    pub user: User,
+    pub shards: HashMap<String, Shard>,
+}
+
+pub async fn parse(path: &str) -> Result<Config, Error> {
+    // let path = Path::new(path);
+    let mut contents = String::new();
+    let mut file = match File::open(path).await {
+        Ok(file) => file,
+        Err(err) => {
+            println!("> Config error: {:?}", err);
+            return Err(Error::BadConfig);
+        }
+    };
+
+    match file.read_to_string(&mut contents).await {
+        Ok(_) => (),
+        Err(err) => {
+            println!("> Config error: {:?}", err);
+            return Err(Error::BadConfig);
+        }
+    };
+
+    // let config: toml::Value = match toml::from_str(&contents) {
+    //     Ok(config) => config,
+    //     Err(err) => {
+    //         println!("> Config error: {:?}", err);
+    //         return Err(Error::BadConfig);
+    //     }
+    // };
+
+    // println!("Config: {:?}", config);
+
+    let config: Config = match toml::from_str(&contents) {
+        Ok(config) => config,
+        Err(err) => {
+            println!("> Config error: {:?}", err);
+            return Err(Error::BadConfig);
+        }
+    };
+
+    Ok(config)
+}