diff --git a/src/events.rs b/src/events.rs index 9471eed..cc27551 100644 --- a/src/events.rs +++ b/src/events.rs @@ -1,14 +1,13 @@ use crossbeam_channel::{unbounded, Receiver, Sender, TryIter}; use cursive::{CbFunc, Cursive}; -use queue::QueueEvent; use spotify::PlayerEvent; use ui::playlist::PlaylistEvent; pub enum Event { - Queue(QueueEvent), Player(PlayerEvent), Playlist(PlaylistEvent), + ScreenChange(String), } pub type EventSender = Sender; diff --git a/src/main.rs b/src/main.rs index 226c9d0..1dbc344 100644 --- a/src/main.rs +++ b/src/main.rs @@ -39,9 +39,7 @@ mod track; mod ui; use events::{Event, EventManager}; -use queue::QueueEvent; use spotify::PlayerEvent; -use ui::playlist::PlaylistEvent; fn init_logger(content: TextContent) { let mut builder = env_logger::Builder::from_default_env(); @@ -105,7 +103,6 @@ fn main() { cursive.add_global_callback('q', |s| s.quit()); cursive.set_theme(theme::default()); - cursive.set_autorefresh(true); let spotify = Arc::new(spotify::Spotify::new( event_manager.clone(), @@ -160,7 +157,7 @@ fn main() { let status = ui::statusbar::StatusBar::new(queue.clone(), spotify.clone()); - let layout = ui::layout::Layout::new(status) + let layout = ui::layout::Layout::new(status, &event_manager) .view("search", BoxView::with_full_height(search.view), "Search") .view("log", logview_scroller, "Log") .view("playlists", playlists.view.take().unwrap(), "Playlists") @@ -169,12 +166,10 @@ fn main() { cursive.add_fullscreen_layer(layout.with_id("main")); { - let ev = event_manager.clone(); cursive.add_global_callback(Key::F1, move |s| { s.call_on_id("main", |v: &mut ui::layout::Layout| { v.set_view("queue"); }); - ev.send(Event::Queue(QueueEvent::Show)); }); } @@ -185,12 +180,10 @@ fn main() { }); { - let ev = event_manager.clone(); cursive.add_global_callback(Key::F3, move |s| { s.call_on_id("main", |v: &mut ui::layout::Layout| { v.set_view("playlists"); }); - ev.send(Event::Playlist(PlaylistEvent::Show)); }); } @@ -206,7 +199,6 @@ fn main() { for event in event_manager.msg_iter() { trace!("event received"); match event { - Event::Queue(ev) => queueview.handle_ev(&mut cursive, ev), Event::Player(state) => { if state == PlayerEvent::FinishedTrack { queue.lock().expect("could not lock queue").next(); @@ -214,6 +206,11 @@ fn main() { spotify.update_status(state); } Event::Playlist(event) => playlists.handle_ev(&mut cursive, event), + Event::ScreenChange(name) => match name.as_ref() { + "playlists" => playlists.repopulate(&mut cursive), + "queue" => queueview.repopulate(&mut cursive), + _ => (), + }, } } } diff --git a/src/queue.rs b/src/queue.rs index e332816..8da5ad3 100644 --- a/src/queue.rs +++ b/src/queue.rs @@ -13,12 +13,6 @@ pub struct Queue { ev: EventManager, } -pub enum QueueEvent { - Add(usize), - Remove(usize), - Show, -} - impl Queue { pub fn new(ev: EventManager, spotify: Arc) -> Queue { Queue { @@ -52,26 +46,20 @@ impl Queue { pub fn append(&mut self, track: &Track) { self.queue.push(track.clone()); - self.ev - .send(Event::Queue(QueueEvent::Add(self.queue.len()))); } pub fn append_next(&mut self, track: &Track) -> usize { if let Some(next_index) = self.next_index() { self.queue.insert(next_index, track.clone()); - self.ev.send(Event::Queue(QueueEvent::Add(next_index))); next_index } else { self.queue.push(track.clone()); - self.ev - .send(Event::Queue(QueueEvent::Add(self.queue.len() - 1))); self.queue.len() - 1 } } pub fn remove(&mut self, index: usize) { self.queue.remove(index); - self.ev.send(Event::Queue(QueueEvent::Remove(index))); // if the queue is empty or we are at the end of the queue, stop // playback @@ -97,7 +85,7 @@ impl Queue { self.queue.clear(); // redraw queue if open - self.ev.send(Event::Queue(QueueEvent::Show)); + self.ev.send(Event::ScreenChange("queue".to_owned())); } pub fn play(&mut self, index: usize) { diff --git a/src/ui/layout.rs b/src/ui/layout.rs index 9910c55..d486c9d 100644 --- a/src/ui/layout.rs +++ b/src/ui/layout.rs @@ -10,6 +10,8 @@ use cursive::view::{IntoBoxedView, Selector}; use cursive::Printer; use unicode_width::UnicodeWidthStr; +use events; + struct Screen { title: String, view: Box, @@ -20,15 +22,19 @@ pub struct Layout { title: String, statusbar: Box, focus: Option, + screenchange: bool, + ev: events::EventManager, } impl Layout { - pub fn new(status: T) -> Layout { + pub fn new(status: T, ev: &events::EventManager) -> Layout { Layout { views: HashMap::new(), title: String::new(), statusbar: status.as_boxed_view(), focus: None, + ev: ev.clone(), + screenchange: true, } } @@ -53,6 +59,7 @@ impl Layout { let title = &self.views.get(&s).unwrap().title; self.title = title.clone(); self.focus = Some(s); + self.screenchange = true; } } @@ -95,6 +102,14 @@ impl View for Layout { if let Some(ref id) = self.focus { let screen = self.views.get_mut(id).unwrap(); screen.view.layout(Vec2::new(size.x, size.y - 3)); + + // the focus view has changed, let the views know so they can redraw + // their items + if self.screenchange { + debug!("layout: new screen selected: {}", &id); + self.ev.send(events::Event::ScreenChange(id.clone())); + self.screenchange = false; + } } } diff --git a/src/ui/playlist.rs b/src/ui/playlist.rs index fd881f4..a3ce626 100644 --- a/src/ui/playlist.rs +++ b/src/ui/playlist.rs @@ -22,7 +22,6 @@ pub struct Playlist { } pub enum PlaylistEvent { - Show, NewList(Playlist), } @@ -155,15 +154,20 @@ impl PlaylistView { } } - fn populate(&self, playlists: &mut ViewRef) { - for list in self - .playlists - .read() - .expect("could not acquire read lock on playlists") - .iter() - { - let button = self.create_button(&list); - playlists.add_child(button); + pub fn repopulate(&self, cursive: &mut Cursive) { + let view_ref: Option> = cursive.find_id("playlists"); + if let Some(mut playlists) = view_ref { + self.clear_playlists(&mut playlists); + + for list in self + .playlists + .read() + .expect("could not acquire read lock on playlists") + .iter() + { + let button = self.create_button(&list); + playlists.add_child(button); + } } } @@ -172,10 +176,6 @@ impl PlaylistView { if let Some(mut playlists) = view_ref { match event { - PlaylistEvent::Show => { - self.clear_playlists(&mut playlists); - self.populate(&mut playlists); - } PlaylistEvent::NewList(list) => { let button = self.create_button(&list); playlists.add_child(button); diff --git a/src/ui/queue.rs b/src/ui/queue.rs index 2c1bab3..5cd49b8 100644 --- a/src/ui/queue.rs +++ b/src/ui/queue.rs @@ -8,7 +8,7 @@ use cursive::Cursive; use std::sync::Arc; use std::sync::Mutex; -use queue::{Queue, QueueEvent}; +use queue::Queue; use track::Track; use ui::splitbutton::SplitButton; use ui::trackbutton::TrackButton; @@ -46,16 +46,6 @@ impl QueueView { } } - pub fn handle_ev(&self, cursive: &mut Cursive, ev: QueueEvent) { - let view_ref: Option> = cursive.find_id("queue_list"); - if let Some(mut queuelist) = view_ref { - match ev { - QueueEvent::Show => self.populate(&mut queuelist), - _ => (), - } - } - } - fn create_button(&self, track: &Track) -> SplitButton { let mut button = TrackButton::new(&track); // 'd' deletes the selected track @@ -82,15 +72,18 @@ impl QueueView { button } - pub fn populate(&self, queuelist: &mut LinearLayout) { - while queuelist.len() > 0 { - queuelist.remove_child(0); - } + pub fn repopulate(&self, cursive: &mut Cursive) { + let view_ref: Option> = cursive.find_id("queue_list"); + if let Some(mut queuelist) = view_ref { + while queuelist.len() > 0 { + queuelist.remove_child(0); + } - let queue = self.queue.lock().expect("could not lock queue"); - for track in queue.iter() { - let button = self.create_button(track); - queuelist.add_child(button); + let queue = self.queue.lock().expect("could not lock queue"); + for track in queue.iter() { + let button = self.create_button(track); + queuelist.add_child(button); + } } } }