lostecho/ncspot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: pass globally mutable config reference

Browse Source 
Before, copies of the configuration were passed over. This change also
causes configuration reloads to affect the entire application and is
easier to maintain but introduces some RwLock overhead.
This commit is contained in:
Henrik Friedrichsen
2020-10-18 13:09:45 +02:00
parent e1b4892b8a
commit 013beb245b
12 changed files with 132 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/commands.rs
View File

@@ -32,6 +32,7 @@ pub struct CommandManager {
spotify: Arc<Spotify>,
queue: Arc<Queue>,
library: Arc<Library>,
config: Arc<Config>,
}
impl CommandManager {
@@ -39,18 +40,21 @@ impl CommandManager {
spotify: Arc<Spotify>,
queue: Arc<Queue>,
library: Arc<Library>,
config: &Config,
config: Arc<Config>,
) -> CommandManager {
let bindings = RefCell::new(Self::get_bindings(config.clone()));
CommandManager {
aliases: HashMap::new(),
bindings: RefCell::new(Self::get_bindings(config)),
bindings,
spotify,
queue,
library,
config,
}
}
pub fn get_bindings(config: &Config) -> HashMap<String, Command> {
pub fn get_bindings(config: Arc<Config>) -> HashMap<String, Command> {
let config = config.values();
let mut kb = if config.default_keybindings.unwrap_or(true) {
Self::default_keybindings()
} else {
@@ -161,15 +165,16 @@ impl CommandManager {
Ok(None)
}
Command::ReloadConfig => {
let cfg = crate::config::load()?;
self.config.reload();
// update theme
let theme = crate::theme::load(&cfg);
let theme = self.config.build_theme();
s.set_theme(theme);
// update bindings
self.unregister_keybindings(s);
self.bindings.replace(Self::get_bindings(&cfg));
self.bindings
.replace(Self::get_bindings(self.config.clone()));
self.register_keybindings(s);
Ok(None)
}