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

Use async functions for backend

Browse source
This commit is contained in:
Elias Projahn 2020-10-11 21:13:15 +02:00
parent 95f939cb07
commit 711b6d97ff
12 changed files with 346 additions and 420 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/dialogs/ensemble_editor.rs
View file

@ -9,6 +9,7 @@ pub struct EnsembleEditor<F>
where
F: Fn(Ensemble) -> () + 'static,
{
backend: Rc<Backend>,
window: gtk::Window,
callback: F,
id: i64,
@ -42,6 +43,7 @@ where
};
let result = Rc::new(EnsembleEditor {
backend: backend,
window: window,
callback: callback,
id: id,
@ -58,10 +60,13 @@ where
name: result.name_entry.get_text().to_string(),
};
backend.update_ensemble(ensemble.clone(), clone!(@strong result => move |_| {
result.window.close();
(result.callback)(ensemble.clone());
}));
let clone = result.clone();
let c = glib::MainContext::default();
c.spawn_local(async move {
clone.backend.update_ensemble(ensemble.clone()).await.unwrap();
clone.window.close();
(clone.callback)(ensemble.clone());
});
}));
result.window.set_transient_for(Some(parent));

62
src/dialogs/ensemble_selector.rs
View file

@ -41,40 +41,40 @@ where
list: list,
});
result
.backend
.get_ensembles(clone!(@strong result => move |ensembles| {
let ensembles = ensembles.unwrap();
let c = glib::MainContext::default();
let clone = result.clone();
c.spawn_local(async move {
let ensembles = clone.backend.get_ensembles().await.unwrap();
for (index, ensemble) in ensembles.iter().enumerate() {
let label = gtk::Label::new(Some(&ensemble.name));
label.set_halign(gtk::Align::Start);
let row = SelectorRow::new(index.try_into().unwrap(), &label);
row.show_all();
result.list.insert(&row, -1);
}
for (index, ensemble) in ensembles.iter().enumerate() {
let label = gtk::Label::new(Some(&ensemble.name));
label.set_halign(gtk::Align::Start);
let row = SelectorRow::new(index.try_into().unwrap(), &label);
row.show_all();
clone.list.insert(&row, -1);
}
result
.list
.connect_row_activated(clone!(@strong result, @strong ensembles => move |_, row| {
result.window.close();
let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
let index: usize = row.get_index().try_into().unwrap();
(result.callback)(ensembles[index].clone());
}));
clone.list.connect_row_activated(
clone!(@strong clone, @strong ensembles => move |_, row| {
clone.window.close();
let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
let index: usize = row.get_index().try_into().unwrap();
(clone.callback)(ensembles[index].clone());
}),
);
result
.list
.set_filter_func(Some(Box::new(clone!(@strong result => move |row| {
let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
let index: usize = row.get_index().try_into().unwrap();
let search = result.search_entry.get_text().to_string().to_lowercase();
search.is_empty() || ensembles[index]
.name
.to_lowercase()
.contains(&search)
}))));
}));
clone
.list
.set_filter_func(Some(Box::new(clone!(@strong clone => move |row| {
let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
let index: usize = row.get_index().try_into().unwrap();
let search = clone.search_entry.get_text().to_string().to_lowercase();
search.is_empty() || ensembles[index]
.name
.to_lowercase()
.contains(&search)
}))));
});
result
.search_entry

13
src/dialogs/instrument_editor.rs
View file

@ -9,6 +9,7 @@ pub struct InstrumentEditor<F>
where
F: Fn(Instrument) -> () + 'static,
{
backend: Rc<Backend>,
window: gtk::Window,
callback: F,
id: i64,
@ -42,6 +43,7 @@ where
};
let result = Rc::new(InstrumentEditor {
backend: backend,
window: window,
callback: callback,
id: id,
@ -58,10 +60,13 @@ where
name: result.name_entry.get_text().to_string(),
};
backend.update_instrument(instrument.clone(), clone!(@strong result => move |_| {
result.window.close();
(result.callback)(instrument.clone());
}));
let c = glib::MainContext::default();
let clone = result.clone();
c.spawn_local(async move {
clone.backend.update_instrument(instrument.clone()).await.unwrap();
clone.window.close();
(clone.callback)(instrument.clone());
});
}));
result.window.set_transient_for(Some(parent));

62
src/dialogs/instrument_selector.rs
View file

@ -41,41 +41,41 @@ where
list: list,
});
result
.backend
.get_instruments(clone!(@strong result => move |instruments| {
let instruments = instruments.unwrap();
let c = glib::MainContext::default();
let clone = result.clone();
c.spawn_local(async move {
let instruments = clone.backend.get_instruments().await.unwrap();
for (index, instrument) in instruments.iter().enumerate() {
let label = gtk::Label::new(Some(&instrument.name));
label.set_halign(gtk::Align::Start);
let row = SelectorRow::new(index.try_into().unwrap(), &label);
row.show_all();
result.list.insert(&row, -1);
}
for (index, instrument) in instruments.iter().enumerate() {
let label = gtk::Label::new(Some(&instrument.name));
label.set_halign(gtk::Align::Start);
let row = SelectorRow::new(index.try_into().unwrap(), &label);
row.show_all();
clone.list.insert(&row, -1);
}
result
.list
.connect_row_activated(clone!(@strong result, @strong instruments => move |_, row| {
result.window.close();
let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
let index: usize = row.get_index().try_into().unwrap();
(result.callback)(instruments[index].clone());
}));
clone.list.connect_row_activated(
clone!(@strong clone, @strong instruments => move |_, row| {
clone.window.close();
let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
let index: usize = row.get_index().try_into().unwrap();
(clone.callback)(instruments[index].clone());
}),
);
result
.list
.set_filter_func(Some(Box::new(clone!(@strong result => move |row| {
let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
let index: usize = row.get_index().try_into().unwrap();
let search = result.search_entry.get_text().to_string();
clone
.list
.set_filter_func(Some(Box::new(clone!(@strong clone => move |row| {
let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
let index: usize = row.get_index().try_into().unwrap();
let search = clone.search_entry.get_text().to_string();
search.is_empty() || instruments[index]
.name
.to_lowercase()
.contains(&result.search_entry.get_text().to_string().to_lowercase())
}))));
}));
search.is_empty() || instruments[index]
.name
.to_lowercase()
.contains(&clone.search_entry.get_text().to_string().to_lowercase())
}))));
});
result
.search_entry

13
src/dialogs/person_editor.rs
View file

@ -9,6 +9,7 @@ pub struct PersonEditor<F>
where
F: Fn(Person) -> () + 'static,
{
backend: Rc<Backend>,
window: gtk::Window,
callback: F,
id: i64,
@ -44,6 +45,7 @@ where
};
let result = Rc::new(PersonEditor {
backend: backend,
window: window,
callback: callback,
id: id,
@ -62,10 +64,13 @@ where
last_name: result.last_name_entry.get_text().to_string(),
};
backend.update_person(person.clone(), clone!(@strong result => move |_| {
result.window.close();
(result.callback)(person.clone());
}));
let c = glib::MainContext::default();
let clone = result.clone();
c.spawn_local(async move {
clone.backend.update_person(person.clone()).await.unwrap();
clone.window.close();
(clone.callback)(person.clone());
});
}));
result.window.set_transient_for(Some(parent));

62
src/dialogs/person_selector.rs
View file

@ -41,40 +41,40 @@ where
list: list,
});
result
.backend
.get_persons(clone!(@strong result => move |persons| {
let persons = persons.unwrap();
let c = glib::MainContext::default();
let clone = result.clone();
c.spawn_local(async move {
let persons = clone.backend.get_persons().await.unwrap();
for (index, person) in persons.iter().enumerate() {
let label = gtk::Label::new(Some(&person.name_lf()));
label.set_halign(gtk::Align::Start);
let row = SelectorRow::new(index.try_into().unwrap(), &label);
row.show_all();
result.list.insert(&row, -1);
}
for (index, person) in persons.iter().enumerate() {
let label = gtk::Label::new(Some(&person.name_lf()));
label.set_halign(gtk::Align::Start);
let row = SelectorRow::new(index.try_into().unwrap(), &label);
row.show_all();
clone.list.insert(&row, -1);
}
result
.list
.connect_row_activated(clone!(@strong result, @strong persons => move |_, row| {
result.window.close();
let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
let index: usize = row.get_index().try_into().unwrap();
(result.callback)(persons[index].clone());
}));
clone.list.connect_row_activated(
clone!(@strong clone, @strong persons => move |_, row| {
clone.window.close();
let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
let index: usize = row.get_index().try_into().unwrap();
(clone.callback)(persons[index].clone());
}),
);
result
.list
.set_filter_func(Some(Box::new(clone!(@strong result => move |row| {
let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
let index: usize = row.get_index().try_into().unwrap();
let search = result.search_entry.get_text().to_string().to_lowercase();
search.is_empty() || persons[index]
.name_lf()
.to_lowercase()
.contains(&search)
}))));
}));
clone
.list
.set_filter_func(Some(Box::new(clone!(@strong clone => move |row| {
let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
let index: usize = row.get_index().try_into().unwrap();
let search = clone.search_entry.get_text().to_string().to_lowercase();
search.is_empty() || persons[index]
.name_lf()
.to_lowercase()
.contains(&search)
}))));
});
result
.search_entry

13
src/dialogs/recording_editor.rs
View file

@ -84,11 +84,14 @@ where
comment: result.comment_entry.get_text().to_string(),
performances: result.performers.borrow().to_vec(),
};
result.backend.update_recording(recording.clone().into(), clone!(@strong result => move |_| {
result.window.close();
(result.callback)(recording.clone());
}));
let c = glib::MainContext::default();
let clone = result.clone();
c.spawn_local(async move {
clone.backend.update_recording(recording.clone().into()).await.unwrap();
clone.window.close();
(clone.callback)(recording.clone());
});
}));
work_button.connect_clicked(clone!(@strong result => move |_| {

11
src/dialogs/work_editor.rs
View file

@ -185,10 +185,13 @@ where
sections: sections,
};
result.backend.update_work(work.clone().into(), clone!(@strong result => move |_| {
result.window.close();
(result.callback)(work.clone());
}));
let c = glib::MainContext::default();
let clone = result.clone();
c.spawn_local(async move {
clone.backend.update_work(work.clone().into()).await.unwrap();
clone.window.close();
(clone.callback)(work.clone());
});
}));
composer_button.connect_clicked(clone!(@strong result => move |_| {

26
src/dialogs/work_selector.rs
View file

@ -122,10 +122,12 @@ where
match state {
Loading => {
self.backend
.get_persons(clone!(@strong self as self_ => move |persons| {
self_.clone().set_state(Persons(persons.unwrap()));
}));
let c = glib::MainContext::default();
let clone = self.clone();
c.spawn_local(async move {
let persons = clone.backend.get_persons().await.unwrap();
clone.clone().set_state(Persons(persons));
});
self.sidebar_stack.set_visible_child_name("loading");
self.stack.set_visible_child_name("empty_screen");
@ -181,12 +183,16 @@ where
PersonLoading(person) => {
self.header.set_title(Some(&person.name_fl()));
self.backend.get_work_descriptions(
person.id,
clone!(@strong self as self_ => move |works| {
self_.clone().set_state(Person(works.unwrap()));
}),
);
let c = glib::MainContext::default();
let clone = self.clone();
c.spawn_local(async move {
let works = clone
.backend
.get_work_descriptions(person.id)
.await
.unwrap();
clone.clone().set_state(Person(works));
});
self.content_stack.set_visible_child_name("loading");
self.stack.set_visible_child_name("person_screen");