johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-26 19:57:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use new navigator for all screens

Browse source
This commit is contained in:
Elias Projahn 2021-02-03 16:22:18 +01:00
parent c72bc71432
commit ee71a905e1
6 changed files with 156 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

115
src/screens/person.rs
View file

@ -1,11 +1,10 @@
use super::{WorkScreen, RecordingScreen};
use crate::backend::Backend;
use crate::database::{Person, Recording, Work};
use crate::editors::PersonEditor;
use crate::navigator::NavigatorWindow;
use crate::widgets::{List, Navigator, NavigatorScreen, Screen, Section};
use crate::navigator::{NavigatorWindow, NavigationHandle, Screen};
use crate::widgets;
use crate::widgets::{List, Section, Widget};
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
@ -15,67 +14,60 @@ use std::rc::Rc;
/// A screen for showing works by and recordings with a person.
pub struct PersonScreen {
backend: Rc<Backend>,
handle: NavigationHandle<()>,
person: Person,
widget: Screen,
widget: widgets::Screen,
work_list: Rc<List>,
recording_list: Rc<List>,
works: RefCell<Vec<Work>>,
recordings: RefCell<Vec<Recording>>,
navigator: RefCell<Option<Rc<Navigator>>>,
}
impl PersonScreen {
impl Screen<Person, ()> for PersonScreen {
/// Create a new person screen for the specified person and load the
/// contents asynchronously.
pub fn new(backend: Rc<Backend>, person: Person) -> Rc<Self> {
let widget = Screen::new();
fn new(person: Person, handle: NavigationHandle<()>) -> Rc<Self> {
let widget = widgets::Screen::new();
widget.set_title(&person.name_fl());
let work_list = List::new();
let recording_list = List::new();
let this = Rc::new(Self {
backend,
handle,
person,
widget,
work_list,
recording_list,
works: RefCell::new(Vec::new()),
recordings: RefCell::new(Vec::new()),
navigator: RefCell::new(None),
});
this.widget.set_back_cb(clone!(@strong this => move || {
let navigator = this.navigator.borrow().clone();
if let Some(navigator) = navigator {
navigator.pop();
}
this.widget.set_back_cb(clone!(@weak this => move || {
this.handle.pop(None);
}));
this.widget.add_action(&gettext("Edit person"), clone!(@strong this => move || {
this.widget.add_action(&gettext("Edit person"), clone!(@weak this => move || {
spawn!(@clone this, async move {
let window = NavigatorWindow::new(this.backend.clone());
replace!(window.navigator, PersonEditor, None).await;
let window = NavigatorWindow::new(this.handle.backend.clone());
replace!(window.navigator, PersonEditor, Some(this.person.clone())).await;
});
}));
this.widget.add_action(&gettext("Delete person"), clone!(@strong this => move || {
let context = glib::MainContext::default();
let clone = this.clone();
context.spawn_local(async move {
clone.backend.db().delete_person(&clone.person.id).await.unwrap();
clone.backend.library_changed();
this.widget.add_action(&gettext("Delete person"), clone!(@weak this => move || {
spawn!(@clone this, async move {
this.handle.backend.db().delete_person(&this.person.id).await.unwrap();
this.handle.backend.library_changed();
});
}));
this.widget.set_search_cb(clone!(@strong this => move || {
this.widget.set_search_cb(clone!(@weak this => move || {
this.work_list.invalidate_filter();
this.recording_list.invalidate_filter();
}));
this.work_list.set_make_widget_cb(clone!(@strong this => move |index| {
this.work_list.set_make_widget_cb(clone!(@weak this => move |index| {
let work = &this.works.borrow()[index];
let row = libadwaita::ActionRow::new();
@ -83,24 +75,24 @@ impl PersonScreen {
row.set_title(Some(&work.title));
let work = work.to_owned();
row.connect_activated(clone!(@strong this => move |_| {
let navigator = this.navigator.borrow().clone();
if let Some(navigator) = navigator {
navigator.push(WorkScreen::new(this.backend.clone(), work.clone()));
}
row.connect_activated(clone!(@weak this => move |_| {
let work = work.clone();
spawn!(@clone this, async move {
push!(this.handle, WorkScreen, work.clone()).await;
});
}));
row.upcast()
}));
this.work_list.set_filter_cb(clone!(@strong this => move |index| {
this.work_list.set_filter_cb(clone!(@weak this => move |index| {
let work = &this.works.borrow()[index];
let search = this.widget.get_search();
let title = work.title.to_lowercase();
search.is_empty() || title.contains(&search)
}));
this.recording_list.set_make_widget_cb(clone!(@strong this => move |index| {
this.recording_list.set_make_widget_cb(clone!(@weak this => move |index| {
let recording = &this.recordings.borrow()[index];
let row = libadwaita::ActionRow::new();
@ -109,17 +101,17 @@ impl PersonScreen {
row.set_subtitle(Some(&recording.get_performers()));
let recording = recording.to_owned();
row.connect_activated(clone!(@strong this => move |_| {
let navigator = this.navigator.borrow().clone();
if let Some(navigator) = navigator {
navigator.push(RecordingScreen::new(this.backend.clone(), recording.clone()));
}
row.connect_activated(clone!(@weak this => move |_| {
let recording = recording.clone();
spawn!(@clone this, async move {
push!(this.handle, RecordingScreen, recording.clone()).await;
});
}));
row.upcast()
}));
this.recording_list.set_filter_cb(clone!(@strong this => move |index| {
this.recording_list.set_filter_cb(clone!(@weak this => move |index| {
let recording = &this.recordings.borrow()[index];
let search = this.widget.get_search();
let text = recording.work.get_title() + &recording.get_performers();
@ -128,59 +120,48 @@ impl PersonScreen {
// Load the content asynchronously.
let context = glib::MainContext::default();
let clone = Rc::clone(&this);
context.spawn_local(async move {
let works = clone
spawn!(@clone this, async move {
let works = this.handle
.backend
.db()
.get_works(&clone.person.id)
.get_works(&this.person.id)
.await
.unwrap();
let recordings = clone
let recordings = this.handle
.backend
.db()
.get_recordings_for_person(&clone.person.id)
.get_recordings_for_person(&this.person.id)
.await
.unwrap();
if !works.is_empty() {
let length = works.len();
clone.works.replace(works);
clone.work_list.update(length);
this.works.replace(works);
this.work_list.update(length);
let section = Section::new("Works", &clone.work_list.widget);
clone.widget.add_content(&section.widget);
let section = Section::new("Works", &this.work_list.widget);
this.widget.add_content(&section.widget);
}
if !recordings.is_empty() {
let length = recordings.len();
clone.recordings.replace(recordings);
clone.recording_list.update(length);
this.recordings.replace(recordings);
this.recording_list.update(length);
let section = Section::new("Recordings", &clone.recording_list.widget);
clone.widget.add_content(&section.widget);
let section = Section::new("Recordings", &this.recording_list.widget);
this.widget.add_content(&section.widget);
}
clone.widget.ready();
this.widget.ready();
});
this
}
}
impl NavigatorScreen for PersonScreen {
fn attach_navigator(&self, navigator: Rc<Navigator>) {
self.navigator.replace(Some(navigator));
}
impl Widget for PersonScreen {
fn get_widget(&self) -> gtk::Widget {
self.widget.widget.clone().upcast()
}
fn detach_navigator(&self) {
self.navigator.replace(None);
}
}