PolytreeDE/alacritty
1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-18 13:55:23 -05:00
Code Releases Activity

Minor cleanup in config.rs

Browse source 
Adds logging at default verbosity when writing new config file.
This commit is contained in:
Joe Wilm 2017-07-07 10:51:03 -07:00
parent c67f0ddf34
commit 1ec53bc179
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/config.rs
View file

@ -244,12 +244,12 @@ fn default_padding() -> Delta {
} }
#[cfg(not(target_os="macos"))] #[cfg(not(target_os="macos"))]
static DEFAULT_ALACRITTY_CONFIG: &'static str = include_str!("../alacritty.yml"); static DEFAULT_CONFIG: &'static str = include_str!("../alacritty.yml");
#[cfg(target_os="macos")] #[cfg(target_os="macos")]
static DEFAULT_ALACRITTY_CONFIG: &'static str = include_str!("../alacritty_macos.yml"); static DEFAULT_CONFIG: &'static str = include_str!("../alacritty_macos.yml");
fn default_config() -> Config { fn default_config() -> Config {
serde_yaml::from_str(DEFAULT_ALACRITTY_CONFIG) serde_yaml::from_str(DEFAULT_CONFIG)
.expect("default config is valid") .expect("default config is valid")
} }
@ -993,11 +993,13 @@ impl Config {
/// 2. $XDG_CONFIG_HOME/alacritty.yml /// 2. $XDG_CONFIG_HOME/alacritty.yml
/// 3. $HOME/.config/alacritty/alacritty.yml /// 3. $HOME/.config/alacritty/alacritty.yml
/// 4. $HOME/.alacritty.yml /// 4. $HOME/.alacritty.yml
pub fn installed_config() -> Option<Cow<'static, Path>> { pub fn existing_path() -> Option<Cow<'static, Path>> {
// Try using XDG location by default // Try using XDG location by default
::xdg::BaseDirectories::with_prefix("alacritty") ::xdg::BaseDirectories::with_prefix("alacritty")
.ok() .ok()
// $XDG_CONFIG_HOME/alacritty/alacritty.yml
.and_then(|xdg| xdg.find_config_file("alacritty.yml")) .and_then(|xdg| xdg.find_config_file("alacritty.yml"))
// $XDG_CONFIG_HOME/alacritty.yml
.or_else(|| { .or_else(|| {
::xdg::BaseDirectories::new().ok().and_then(|fallback| { ::xdg::BaseDirectories::new().ok().and_then(|fallback| {
fallback.find_config_file("alacritty.yml") fallback.find_config_file("alacritty.yml")
@ -1023,9 +1025,13 @@ impl Config {
pub fn write_defaults() -> io::Result<Cow<'static, Path>> { pub fn write_defaults() -> io::Result<Cow<'static, Path>> {
let path = ::xdg::BaseDirectories::with_prefix("alacritty") let path = ::xdg::BaseDirectories::with_prefix("alacritty")
.map_err(|err| io::Error::new(io::ErrorKind::NotFound, ::std::error::Error::description(&err))) .map_err(|err| io::Error::new(io::ErrorKind::NotFound, Box::new(err)))
.and_then(|p| p.place_config_file("alacritty.yml"))?; .and_then(|p| p.place_config_file("alacritty.yml"))?;
File::create(&path)?.write_all(DEFAULT_ALACRITTY_CONFIG.as_bytes())?;
File::create(&path)?
.write_all(DEFAULT_CONFIG.as_bytes())?;
warn!("Wrote default config to {}", path.display());
Ok(path.into()) Ok(path.into())
} }
@ -1129,13 +1135,15 @@ impl Config {
/// generate a default file. If an empty configuration file is given, i.e. /// generate a default file. If an empty configuration file is given, i.e.
/// /dev/null, we load the compiled-in defaults. /// /dev/null, we load the compiled-in defaults.
pub fn load(options: &::cli::Options) -> Config { pub fn load(options: &::cli::Options) -> Config {
// Get config path
let config_path = options.config_path() let config_path = options.config_path()
.or_else(|| Config::installed_config()) .or_else(|| Config::existing_path())
.unwrap_or_else(|| { .unwrap_or_else(|| {
Config::write_defaults() Config::write_defaults()
.unwrap_or_else(|err| die!("Write defaults config failure: {}", err)) .unwrap_or_else(|err| die!("Write defaults config failure: {}", err))
}); });
// Load config from path
Config::load_from(&*config_path) Config::load_from(&*config_path)
.map(|config| { .map(|config| {
if let Some(path) = config.path().as_ref() { if let Some(path) = config.path().as_ref() {
@ -1147,12 +1155,8 @@ impl Config {
.unwrap_or_else(|err| { .unwrap_or_else(|err| {
use self::Error::*; use self::Error::*;
match err { match err {
NotFound => { NotFound | Empty => {
die!("Config file not found at: {}", config_path.display()); die!("Config file empty or not found at: {}", config_path.display());
},
Empty => {
err_println!("Empty config; Loading defaults");
Config::default()
}, },
_ => die!("{}", err), _ => die!("{}", err),
} }