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

fix playlist cache parsing

Browse Source
This commit is contained in:
Henrik Friedrichsen
2019-03-17 16:17:15 +01:00
parent 40289f6e3e
commit c0469a3b3d
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/playlists.rs
View File

@@ -20,11 +20,6 @@ pub enum PlaylistEvent {
NewList(usize, Playlist), NewList(usize, Playlist),
} }
#[derive(Default, Serialize, Deserialize)]
pub struct PlaylistStore {
pub playlists: Vec<Playlist>,
}
#[derive(Clone)] #[derive(Clone)]
pub struct Playlists { pub struct Playlists {
pub store: Arc<RwLock<Vec<Playlist>>>, pub store: Arc<RwLock<Vec<Playlist>>>,
@@ -71,13 +66,13 @@ impl Playlists {
"loading playlist cache from {}", "loading playlist cache from {}",
cache_path.to_str().unwrap() cache_path.to_str().unwrap()
); );
let parsed: Result<PlaylistStore, _> = serde_json::from_str(&contents); let parsed: Result<Vec<Playlist>, _> = serde_json::from_str(&contents);
match parsed { match parsed {
Ok(cache) => { Ok(cache) => {
debug!("playlist cache loaded ({} lists)", cache.playlists.len()); debug!("playlist cache loaded ({} lists)", cache.len());
let mut store = self.store.write().expect("can't writelock playlist store"); let mut store = self.store.write().expect("can't writelock playlist store");
store.clear(); store.clear();
store.extend(cache.playlists); store.extend(cache);
// 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()));