YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2026-04-01 17:15:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

delegate default search providers init to the db api

Browse source
This commit is contained in:
yggverse 2025-01-30 16:46:41 +02:00
parent b8a8fb49de
commit 9945002efa
2 changed files with 57 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/profile/search.rs
View file

@ -19,16 +19,10 @@ impl Search {
/// Create new `Self`
pub fn build(connection: &Rc<RwLock<Connection>>, profile_id: &Rc<i64>) -> Result<Self, Error> {
// Init children components
let database = Database::init(connection, profile_id);
let memory = Memory::init();
match database.records() {
Ok(records) => {
// Init default search providers list on database empty
if records.is_empty() {
restore_defaults(&database)?
}
match Database::init(connection, profile_id) {
Ok(database) => {
// Init fast search index
let memory = Memory::init();
// Build initial index
index(&database, &memory)?;
@ -46,15 +40,16 @@ impl Search {
/// * requires valid [Uri](https://docs.gtk.org/glib/struct.Uri.html)
pub fn add(&self, query: &Uri, is_default: bool) -> Result<(), Error> {
match self.database.add(query.to_string(), is_default) {
Ok(_) => Ok(index(&self.database, &self.memory)?),
Ok(_) => index(&self.database, &self.memory),
Err(e) => Err(Error::Database(e)),
}
}
/// Add new search provider record
/// * requires valid [Uri](https://docs.gtk.org/glib/struct.Uri.html)
pub fn set_default(&self, profile_search_id: i64) -> Result<(), Error> {
match self.database.set_default(profile_search_id) {
Ok(_) => Ok(index(&self.database, &self.memory)?),
Ok(_) => index(&self.database, &self.memory),
Err(e) => Err(Error::Database(e)),
}
}
@ -67,15 +62,7 @@ impl Search {
/// Delete record from `database` and `memory` index
pub fn delete(&self, id: i64) -> Result<(), Error> {
match self.database.delete(id) {
Ok(_) => match self.database.records() {
Ok(records) => {
if records.is_empty() {
restore_defaults(&self.database)?
}
Ok(index(&self.database, &self.memory)?)
}
Err(e) => Err(Error::Database(e)),
},
Ok(_) => index(&self.database, &self.memory),
Err(e) => Err(Error::Database(e)),
}
}
@ -116,16 +103,3 @@ fn index(database: &Database, memory: &Memory) -> Result<(), Error> {
}
Ok(())
}
/// Create default search providers list for given profile
fn restore_defaults(database: &Database) -> Result<(), Error> {
for (provider, is_default) in &[
("gemini://kennedy.gemi.dev/search", true),
("gemini://tlgs.one/search/search", false),
] {
if let Err(e) = database.add(provider.to_string(), *is_default) {
return Err(Error::Database(e));
}
}
Ok(())
}