mirror of
https://github.com/MedzikUser/HomeDisk.git
synced 2024-08-14 21:46:53 +00:00
utils (config): rustfmt
This commit is contained in:
parent
0099e93ad3
commit
c5b76d8b90
3 changed files with 10 additions and 3 deletions
|
@ -1,4 +1,4 @@
|
||||||
use homedisk_utils::{database::Database, config::Config};
|
use homedisk_utils::{config::Config, database::Database};
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() {
|
async fn main() {
|
||||||
|
|
|
@ -20,7 +20,12 @@ impl Config {
|
||||||
/// parse configuration file
|
/// parse configuration file
|
||||||
pub fn parse() -> Result<Config, Error> {
|
pub fn parse() -> Result<Config, Error> {
|
||||||
// configuration file path
|
// 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_path = format!("{}/homedisk/config.toml", config_dir.to_string_lossy());
|
||||||
|
|
||||||
let config = fs::read_to_string(config_path)?;
|
let config = fs::read_to_string(config_path)?;
|
||||||
|
|
|
@ -22,7 +22,9 @@ impl From<toml::de::Error> for Error {
|
||||||
impl fmt::Display for Error {
|
impl fmt::Display for Error {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
match self {
|
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::Io(err) => write!(f, "{}", err),
|
||||||
Error::Toml(err) => write!(f, "{}", err),
|
Error::Toml(err) => write!(f, "{}", err),
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue