diff --git a/core/src/main.rs b/core/src/main.rs index bd57cc3..18548da 100644 --- a/core/src/main.rs +++ b/core/src/main.rs @@ -1,4 +1,4 @@ -use homedisk_utils::{database::Database, config::Config}; +use homedisk_utils::{config::Config, database::Database}; #[tokio::main] async fn main() { diff --git a/utils/src/config/config.rs b/utils/src/config/config.rs index 6ba75c8..005684b 100644 --- a/utils/src/config/config.rs +++ b/utils/src/config/config.rs @@ -20,7 +20,12 @@ impl Config { /// parse configuration file pub fn parse() -> Result { // configuration file path - let config_dir = if dirs::config_dir() == None { return Err(Error::UnknowConfigDir()) } else { dirs::config_dir().unwrap() }; + let config_dir = if dirs::config_dir() == None { + return Err(Error::UnknowConfigDir()); + } else { + dirs::config_dir().unwrap() + }; + let config_path = format!("{}/homedisk/config.toml", config_dir.to_string_lossy()); let config = fs::read_to_string(config_path)?; diff --git a/utils/src/config/error.rs b/utils/src/config/error.rs index 1185aec..1b9d48c 100644 --- a/utils/src/config/error.rs +++ b/utils/src/config/error.rs @@ -22,7 +22,9 @@ impl From for Error { impl fmt::Display for Error { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match self { - Error::UnknowConfigDir() => write!(f, "failed to lock up a system configuration directory"), + Error::UnknowConfigDir() => { + write!(f, "failed to lock up a system configuration directory") + } Error::Io(err) => write!(f, "{}", err), Error::Toml(err) => write!(f, "{}", err), }