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

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

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| {