ryze/ff2mpv-rust
1
0
Fork 0
Code Issues Pull requests Releases 8 Activity

Clean up config.rs #8

Closed
MarkusPettersson98 wants to merge 1 commit from typesafe-get-config-location into main
pull from: typesafe-get-config-location
merge into: ryze:main
Conversation 1 Commits 1 Files changed 1 +33 -47
1 changed files with 33 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/config.rs
View file

@ -1,81 +1,67 @@
use serde::Deserialize;
use std::env; use std::env;
use std::fs; use std::fs;
use std::path::PathBuf; use std::path::PathBuf;
ryze312 commented 2023-10-30 22:48:27 +01:00 (Migrated from github.com)
Review
Copy link

I am not sure if the moving of Deserialize import was intentional.
Use declarations should be ordered as following:

  1. std;
  2. Public crates;
  3. Local crates
I am not sure if the moving of `Deserialize` import was intentional. Use declarations should be ordered as following: 1. `std`; 2. Public crates; 3. Local crates
use serde::Deserialize;
use crate::error::FF2MpvError; use crate::error::FF2MpvError;
#[derive(Deserialize)] #[derive(Deserialize)]
#[serde(default)]
pub struct Config { pub struct Config {
#[serde(default = "default_player_command")]
pub player_command: String, pub player_command: String,
#[serde(default = "default_player_args")]
pub player_args: Vec<String>, pub player_args: Vec<String>,
} }
impl Default for Config { impl Default for Config {
fn default() -> Self { fn default() -> Self {
Self { Self {
player_command: default_player_command(), player_command: "mpv".to_owned(),
player_args: default_player_args(), player_args: vec![],
} }
} }
} }
impl Config { impl Config {
pub const FILENAME: &str = "ff2mpv-rust.json";
pub fn build() -> Self { pub fn build() -> Self {
if let Ok(config) = Config::parse_config_file() { Config::parse_config_file().unwrap_or_default()
config
} else {
Config::default()
}
} }
pub fn parse_config_file() -> Result<Self, FF2MpvError> { pub fn parse_config_file() -> Result<Self, FF2MpvError> {
let config_path = Config::get_config_location(); let config_path = Config::get_config_location()?;
if !config_path.exists() {
return Err(FF2MpvError::NoConfig);
}
let string = fs::read_to_string(config_path)?; let string = fs::read_to_string(config_path)?;
let config = serde_json::from_str(&string)?; let config = serde_json::from_str(&string)?;
Ok(config) Ok(config)
} }
#[cfg(target_family = "unix")] /// Returns a *valid* config path, i.e. it exists and is readable by the
fn get_config_location() -> PathBuf { /// current user. If the config path is not valid, an [`FF2MpvError`] is
let mut path = PathBuf::new(); /// returned.
fn get_config_location() -> Result<PathBuf, FF2MpvError> {
if let Ok(home) = env::var("XDG_CONFIG_HOME") { let config_dir = if cfg!(target_family = "unix") {
path.push(home); if let Ok(home) = env::var("XDG_CONFIG_HOME") {
} else if let Ok(home) = env::var("HOME") { PathBuf::from(home)
path.push(home); } else if let Ok(home) = env::var("HOME") {
path.push(".config"); PathBuf::from(home).join(".config")
} else {
PathBuf::from("/etc")
}
} else if cfg!(target_family = "windows") {
env::var("APPDATA")
.map_err(|_| FF2MpvError::NoConfig)?
.into()
} else { } else {
path.push("/etc"); unimplemented!("This platform is not supported")
};
let path = config_dir.join(Config::FILENAME);
match path.try_exists() {
Ok(true) => Ok(path),
// Broken symbolic link to config file.
Ok(false) => Err(FF2MpvError::NoConfig),
Err(err) => Err(FF2MpvError::IOError(err)),
} }
path.push("ff2mpv-rust.json");
path
}
#[cfg(target_family = "windows")]
fn get_config_location() -> PathBuf {
let mut path = PathBuf::new();
let appdata = env::var("APPDATA").unwrap();
path.push(appdata);
path.push("ff2mpv-rust.json");
path
} }
} }
fn default_player_command() -> String {
"mpv".to_owned()
}
fn default_player_args() -> Vec<String> {
vec![]
}