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

Move database access to background thread

Browse source
This commit is contained in:
Elias Projahn 2020-10-09 12:22:02 +02:00
parent 96188929d4
commit c2d40fe56e
10 changed files with 542 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/dialogs/ensemble_editor.rs
View file

@ -1,18 +1,26 @@
use crate::backend::*;
use crate::database::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use std::rc::Rc;
pub struct EnsembleEditor {
pub struct EnsembleEditor<F>
where
F: Fn(Ensemble) -> () + 'static,
{
window: gtk::Window,
callback: F,
id: i64,
name_entry: gtk::Entry,
}
impl EnsembleEditor {
pub fn new<F: Fn(Ensemble) -> () + 'static, P: IsA<gtk::Window>>(
db: Rc<Database>,
impl<F> EnsembleEditor<F>
where
F: Fn(Ensemble) -> () + 'static,
{
pub fn new<P: IsA<gtk::Window>>(
backend: Rc<Backend>,
parent: &P,
ensemble: Option<Ensemble>,
callback: F,
@ -34,8 +42,9 @@ impl EnsembleEditor {
};
let result = Rc::new(EnsembleEditor {
id: id,
window: window,
callback: callback,
id: id,
name_entry: name_entry,
});
@ -44,15 +53,15 @@ impl EnsembleEditor {
}));
save_button.connect_clicked(clone!(@strong result => move |_| {
result.window.close();
let ensemble = Ensemble {
id: result.id,
name: result.name_entry.get_text().to_string(),
};
db.update_ensemble(ensemble.clone());
callback(ensemble);
backend.update_ensemble(ensemble.clone(), clone!(@strong result => move |_| {
result.window.close();
(result.callback)(ensemble.clone());
}));
}));
result.window.set_transient_for(Some(parent));

27
src/dialogs/instrument_editor.rs
View file

@ -1,18 +1,26 @@
use crate::backend::*;
use crate::database::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use std::rc::Rc;
pub struct InstrumentEditor {
pub struct InstrumentEditor<F>
where
F: Fn(Instrument) -> () + 'static,
{
window: gtk::Window,
callback: F,
id: i64,
name_entry: gtk::Entry,
}
impl InstrumentEditor {
pub fn new<F: Fn(Instrument) -> () + 'static, P: IsA<gtk::Window>>(
db: Rc<Database>,
impl<F> InstrumentEditor<F>
where
F: Fn(Instrument) -> () + 'static,
{
pub fn new<P: IsA<gtk::Window>>(
backend: Rc<Backend>,
parent: &P,
instrument: Option<Instrument>,
callback: F,
@ -34,8 +42,9 @@ impl InstrumentEditor {
};
let result = Rc::new(InstrumentEditor {
id: id,
window: window,
callback: callback,
id: id,
name_entry: name_entry,
});
@ -44,15 +53,15 @@ impl InstrumentEditor {
}));
save_button.connect_clicked(clone!(@strong result => move |_| {
result.window.close();
let instrument = Instrument {
id: result.id,
name: result.name_entry.get_text().to_string(),
};
db.update_instrument(instrument.clone());
callback(instrument);
backend.update_instrument(instrument.clone(), clone!(@strong result => move |_| {
result.window.close();
(result.callback)(instrument.clone());
}));
}));
result.window.set_transient_for(Some(parent));

72
src/dialogs/instrument_selector.rs
View file

@ -1,11 +1,11 @@
use super::selector_row::SelectorRow;
use super::InstrumentEditor;
use crate::backend::Backend;
use crate::database::*;
use gio::prelude::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use std::cell::RefCell;
use std::convert::TryInto;
use std::rc::Rc;
@ -13,10 +13,9 @@ pub struct InstrumentSelector<F>
where
F: Fn(Instrument) -> () + 'static,
{
db: Rc<Database>,
backend: Rc<Backend>,
window: gtk::Window,
callback: F,
instruments: RefCell<Vec<Instrument>>,
list: gtk::ListBox,
search_entry: gtk::SearchEntry,
}
@ -25,7 +24,7 @@ impl<F> InstrumentSelector<F>
where
F: Fn(Instrument) -> () + 'static,
{
pub fn new<P: IsA<gtk::Window>>(db: Rc<Database>, parent: &P, callback: F) -> Rc<Self> {
pub fn new<P: IsA<gtk::Window>>(backend: Rc<Backend>, parent: &P, callback: F) -> Rc<Self> {
let builder =
gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/instrument_selector.ui");
@ -34,47 +33,48 @@ where
get_widget!(builder, gtk::SearchEntry, search_entry);
get_widget!(builder, gtk::ListBox, list);
let instruments = db.get_instruments();
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();
list.insert(&row, -1);
}
let result = Rc::new(InstrumentSelector {
db: db,
backend: backend,
window: window,
callback: callback,
instruments: RefCell::new(instruments),
search_entry: search_entry,
list: list,
});
result
.list
.connect_row_activated(clone!(@strong result => 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)(result.instruments.borrow()[index].clone());
.backend
.get_instruments(clone!(@strong result => move |instruments| {
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);
}
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());
}));
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();
search.is_empty() || instruments[index]
.name
.to_lowercase()
.contains(&result.search_entry.get_text().to_string().to_lowercase())
}))));
}));
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();
search.is_empty() || result.instruments.borrow()[index]
.name
.to_lowercase()
.contains(&result.search_entry.get_text().to_string().to_lowercase())
}))));
result
.search_entry
.connect_search_changed(clone!(@strong result => move |_| {
@ -83,7 +83,7 @@ where
add_button.connect_clicked(clone!(@strong result => move |_| {
let editor = InstrumentEditor::new(
result.db.clone(),
result.backend.clone(),
&result.window,
None,
clone!(@strong result => move |instrument| {

11
src/dialogs/part_editor.rs
View file

@ -1,5 +1,6 @@
use super::selector_row::SelectorRow;
use super::{InstrumentSelector, PersonSelector};
use crate::backend::*;
use crate::database::*;
use glib::clone;
use gtk::prelude::*;
@ -9,7 +10,7 @@ use std::convert::TryInto;
use std::rc::Rc;
pub struct PartEditor {
db: Rc<Database>,
backend: Rc<Backend>,
window: gtk::Window,
title_entry: gtk::Entry,
composer: RefCell<Option<Person>>,
@ -20,7 +21,7 @@ pub struct PartEditor {
impl PartEditor {
pub fn new<F: Fn(WorkPartDescription) -> () + 'static, P: IsA<gtk::Window>>(
db: Rc<Database>,
backend: Rc<Backend>,
parent: &P,
part: Option<WorkPartDescription>,
callback: F,
@ -63,7 +64,7 @@ impl PartEditor {
});
let result = Rc::new(PartEditor {
db: db,
backend: backend,
window: window,
title_entry: title_entry,
composer: composer,
@ -86,7 +87,7 @@ impl PartEditor {
}));
composer_button.connect_clicked(clone!(@strong result => move |_| {
PersonSelector::new(result.db.clone(), &result.window, clone!(@strong result => move |person| {
PersonSelector::new(result.backend.clone(), &result.window, clone!(@strong result => move |person| {
result.composer.replace(Some(person.clone()));
result.composer_label.set_text(&person.name_fl());
})).show();
@ -98,7 +99,7 @@ impl PartEditor {
}));
add_instrument_button.connect_clicked(clone!(@strong result => move |_| {
InstrumentSelector::new(result.db.clone(), &result.window, clone!(@strong result => move |instrument| {
InstrumentSelector::new(result.backend.clone(), &result.window, clone!(@strong result => move |instrument| {
{
let mut instruments = result.instruments.borrow_mut();
instruments.push(instrument);

27
src/dialogs/person_editor.rs
View file

@ -1,19 +1,27 @@
use crate::backend::Backend;
use crate::database::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use std::rc::Rc;
pub struct PersonEditor {
pub struct PersonEditor<F>
where
F: Fn(Person) -> () + 'static,
{
window: gtk::Window,
callback: F,
id: i64,
first_name_entry: gtk::Entry,
last_name_entry: gtk::Entry,
}
impl PersonEditor {
pub fn new<F: Fn(Person) -> () + 'static, P: IsA<gtk::Window>>(
db: Rc<Database>,
impl<F> PersonEditor<F>
where
F: Fn(Person) -> () + 'static,
{
pub fn new<P: IsA<gtk::Window>>(
backend: Rc<Backend>,
parent: &P,
person: Option<Person>,
callback: F,
@ -36,8 +44,9 @@ impl PersonEditor {
};
let result = Rc::new(PersonEditor {
id: id,
window: window,
callback: callback,
id: id,
first_name_entry: first_name_entry,
last_name_entry: last_name_entry,
});
@ -47,16 +56,16 @@ impl PersonEditor {
}));
save_button.connect_clicked(clone!(@strong result => move |_| {
result.window.close();
let person = Person {
id: result.id,
first_name: result.first_name_entry.get_text().to_string(),
last_name: result.last_name_entry.get_text().to_string(),
};
db.update_person(person.clone());
callback(person);
backend.update_person(person.clone(), clone!(@strong result => move |_| {
result.window.close();
(result.callback)(person.clone());
}));
}));
result.window.set_transient_for(Some(parent));

71
src/dialogs/person_selector.rs
View file

@ -1,11 +1,11 @@
use super::selector_row::SelectorRow;
use super::PersonEditor;
use crate::backend::Backend;
use crate::database::*;
use gio::prelude::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use std::cell::RefCell;
use std::convert::TryInto;
use std::rc::Rc;
@ -13,10 +13,9 @@ pub struct PersonSelector<F>
where
F: Fn(Person) -> () + 'static,
{
db: Rc<Database>,
backend: Rc<Backend>,
window: gtk::Window,
callback: F,
persons: RefCell<Vec<Person>>,
list: gtk::ListBox,
search_entry: gtk::SearchEntry,
}
@ -25,7 +24,7 @@ impl<F> PersonSelector<F>
where
F: Fn(Person) -> () + 'static,
{
pub fn new<P: IsA<gtk::Window>>(db: Rc<Database>, parent: &P, callback: F) -> Rc<Self> {
pub fn new<P: IsA<gtk::Window>>(backend: Rc<Backend>, parent: &P, callback: F) -> Rc<Self> {
let builder =
gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/person_selector.ui");
@ -34,47 +33,47 @@ where
get_widget!(builder, gtk::SearchEntry, search_entry);
get_widget!(builder, gtk::ListBox, list);
let persons = db.get_persons();
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();
list.insert(&row, -1);
}
let result = Rc::new(PersonSelector {
db: db,
backend: backend,
window: window,
callback: callback,
persons: RefCell::new(persons),
search_entry: search_entry,
list: list,
});
result
.list
.connect_row_activated(clone!(@strong result => 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)(result.persons.borrow()[index].clone());
.backend
.get_persons(clone!(@strong result => move |persons| {
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);
}
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());
}));
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)
}))));
}));
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() || result.persons.borrow()[index]
.name_lf()
.to_lowercase()
.contains(&search)
}))));
result
.search_entry
.connect_search_changed(clone!(@strong result => move |_| {
@ -83,7 +82,7 @@ where
add_button.connect_clicked(clone!(@strong result => move |_| {
let editor = PersonEditor::new(
result.db.clone(),
result.backend.clone(),
&result.window,
None,
clone!(@strong result => move |person| {

35
src/dialogs/work_editor.rs
View file

@ -1,5 +1,6 @@
use super::selector_row::SelectorRow;
use super::{InstrumentSelector, PersonSelector, PartEditor, SectionEditor};
use crate::backend::*;
use crate::database::*;
use glib::clone;
use gtk::prelude::*;
@ -49,9 +50,12 @@ impl PartOrSection {
}
}
pub struct WorkEditor {
db: Rc<Database>,
pub struct WorkEditor<F>
where
F: Fn(WorkDescription) -> () + 'static, {
backend: Rc<Backend>,
window: gtk::Window,
callback: F,
save_button: gtk::Button,
id: i64,
title_entry: gtk::Entry,
@ -63,9 +67,11 @@ pub struct WorkEditor {
part_list: gtk::ListBox,
}
impl WorkEditor {
pub fn new<F: Fn(WorkDescription) -> () + 'static, P: IsA<gtk::Window>>(
db: Rc<Database>,
impl<F> WorkEditor<F>
where
F: Fn(WorkDescription) -> () + 'static, {
pub fn new<P: IsA<gtk::Window>>(
backend: Rc<Backend>,
parent: &P,
work: Option<WorkDescription>,
callback: F,
@ -134,8 +140,9 @@ impl WorkEditor {
});
let result = Rc::new(WorkEditor {
db: db,
backend: backend,
window: window,
callback: callback,
save_button: save_button,
id: id,
title_entry: title_entry,
@ -152,8 +159,6 @@ impl WorkEditor {
}));
result.save_button.connect_clicked(clone!(@strong result => move |_| {
result.window.close();
let mut section_count: i64 = 0;
let mut parts: Vec<WorkPartDescription> = Vec::new();
let mut sections: Vec<WorkSectionDescription> = Vec::new();
@ -179,12 +184,14 @@ impl WorkEditor {
sections: sections,
};
result.db.update_work(work.clone().into());
callback(work);
result.backend.update_work(work.clone().into(), clone!(@strong result => move |_| {
result.window.close();
(result.callback)(work.clone());
}));
}));
composer_button.connect_clicked(clone!(@strong result => move |_| {
PersonSelector::new(result.db.clone(), &result.window, clone!(@strong result => move |person| {
PersonSelector::new(result.backend.clone(), &result.window, clone!(@strong result => move |person| {
result.composer.replace(Some(person.clone()));
result.composer_label.set_text(&person.name_fl());
result.save_button.set_sensitive(true);
@ -192,7 +199,7 @@ impl WorkEditor {
}));
add_instrument_button.connect_clicked(clone!(@strong result => move |_| {
InstrumentSelector::new(result.db.clone(), &result.window, clone!(@strong result => move |instrument| {
InstrumentSelector::new(result.backend.clone(), &result.window, clone!(@strong result => move |instrument| {
{
let mut instruments = result.instruments.borrow_mut();
instruments.push(instrument);
@ -216,7 +223,7 @@ impl WorkEditor {
}));
add_part_button.connect_clicked(clone!(@strong result => move |_| {
PartEditor::new(result.db.clone(), &result.window, None, clone!(@strong result => move |part| {
PartEditor::new(result.backend.clone(), &result.window, None, clone!(@strong result => move |part| {
{
let mut structure = result.structure.borrow_mut();
structure.push(PartOrSection::part(part));
@ -247,7 +254,7 @@ impl WorkEditor {
if pos.is_part() {
let editor =
PartEditor::new(result.db.clone(), &result.window, Some(pos.unwrap_part()), clone!(@strong result => move |part| {
PartEditor::new(result.backend.clone(), &result.window, Some(pos.unwrap_part()), clone!(@strong result => move |part| {
result.structure.borrow_mut()[index] = PartOrSection::part(part);
result.show_parts();
}));