mirror of
https://github.com/johrpan/musicus.git
synced 2025-10-27 04:07:25 +01:00
New search page
This commit is contained in:
parent
a6e0935df8
commit
cff489f43e
12 changed files with 830 additions and 793 deletions
|
|
@ -72,8 +72,8 @@ impl Library {
|
|||
.build()
|
||||
}
|
||||
|
||||
pub fn query(&self, query: &LibraryQuery) -> Result<LibraryResults> {
|
||||
let search = format!("%{}%", query.search);
|
||||
pub fn search(&self, query: &LibraryQuery, search: &str) -> Result<LibraryResults> {
|
||||
let search = format!("%{}%", search);
|
||||
let mut binding = self.imp().connection.borrow_mut();
|
||||
let connection = &mut *binding.as_mut().unwrap();
|
||||
|
||||
|
|
@ -1541,14 +1541,13 @@ impl Library {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Default, Debug)]
|
||||
#[derive(Clone, Default, Debug)]
|
||||
pub struct LibraryQuery {
|
||||
pub composer: Option<Person>,
|
||||
pub performer: Option<Person>,
|
||||
pub ensemble: Option<Ensemble>,
|
||||
pub instrument: Option<Instrument>,
|
||||
pub work: Option<Work>,
|
||||
pub search: String,
|
||||
}
|
||||
|
||||
impl LibraryQuery {
|
||||
|
|
@ -1558,7 +1557,6 @@ impl LibraryQuery {
|
|||
&& self.ensemble.is_none()
|
||||
&& self.instrument.is_none()
|
||||
&& self.work.is_none()
|
||||
&& self.search.is_empty()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue