open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug that caused the deprecation warning message to be printed multiple times. Fix #85.

Browse Source
This commit is contained in:
Federico Terzi 2019-10-19 21:44:59 +02:00
parent 498e2e5550
commit 5537d70989
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/context/mod.rs
View File

@ -30,6 +30,7 @@ use std::sync::mpsc::Sender;
use crate::event::Event; use crate::event::Event;
use std::path::PathBuf; use std::path::PathBuf;
use std::fs::create_dir_all; use std::fs::create_dir_all;
use std::sync::Once;
pub trait Context { pub trait Context {
fn eventloop(&self); fn eventloop(&self);
@ -55,6 +56,8 @@ pub fn new(send_channel: Sender<Event>) -> Box<dyn Context> {
// espanso directories // espanso directories
static WARING_INIT : Once = Once::new();
pub fn get_data_dir() -> PathBuf { pub fn get_data_dir() -> PathBuf {
let data_dir = dirs::data_local_dir().expect("Can't obtain data_local_dir(), terminating."); let data_dir = dirs::data_local_dir().expect("Can't obtain data_local_dir(), terminating.");
let espanso_dir = data_dir.join("espanso"); let espanso_dir = data_dir.join("espanso");
@ -79,9 +82,13 @@ pub fn get_config_dir() -> PathBuf {
let home_dir = dirs::home_dir().expect("Can't obtain the user home directory, terminating."); let home_dir = dirs::home_dir().expect("Can't obtain the user home directory, terminating.");
let legacy_espanso_dir = home_dir.join(".espanso"); let legacy_espanso_dir = home_dir.join(".espanso");
if legacy_espanso_dir.exists() { if legacy_espanso_dir.exists() {
eprintln!("WARNING: using legacy espanso config location in $HOME/.espanso is DEPRECATED"); // Avoid printing the warning multiple times with std::sync::Once
eprintln!("Starting from espanso v0.3.0, espanso config location is changed."); WARING_INIT.call_once(|| {
eprintln!("Please check out the documentation to find out more: https://espanso.org/docs/configuration/"); eprintln!("WARNING: using legacy espanso config location in $HOME/.espanso is DEPRECATED");
eprintln!("Starting from espanso v0.3.0, espanso config location is changed.");
eprintln!("Please check out the documentation to find out more: https://espanso.org/docs/configuration/");
eprintln!()
});
return legacy_espanso_dir; return legacy_espanso_dir;
} }