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

Merge branch 'develop' into KoffeinFlummi-keybindings

Browse Source
This commit is contained in:
Henrik Friedrichsen
2019-03-17 16:12:49 +01:00
parent da4f39ffba 114fe0edb8
commit 40289f6e3e
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/playlists.rs
View File

@@ -72,16 +72,19 @@ impl Playlists {
cache_path.to_str().unwrap() cache_path.to_str().unwrap()
); );
let parsed: Result<PlaylistStore, _> = serde_json::from_str(&contents); let parsed: Result<PlaylistStore, _> = serde_json::from_str(&contents);
if let Ok(cache) = parsed { match parsed {
debug!("playlist cache loaded ({} lists)", cache.playlists.len()); Ok(cache) => {
let mut store = self.store.write().expect("can't writelock playlist store"); debug!("playlist cache loaded ({} lists)", cache.playlists.len());
store.clear(); let mut store = self.store.write().expect("can't writelock playlist store");
store.extend(cache.playlists); store.clear();
store.extend(cache.playlists);
// force refresh of UI (if visible) // force refresh of UI (if visible)
self.ev.send(Event::ScreenChange("playlists".to_owned())); self.ev.send(Event::ScreenChange("playlists".to_owned()));
} else { },
error!("playlist cache corrupted?"); Err(e) => {
error!("can't parse playlist cache: {}", e);
}
} }
} }
} }