From 3b15caade07e8fbe351fed9aceb3f435bf58368e Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 26 May 2025 18:24:16 +0200 Subject: move all direct database access to logic crate --- logic/src/search.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'logic/src/search.rs') diff --git a/logic/src/search.rs b/logic/src/search.rs index 68975f1..304676b 100644 --- a/logic/src/search.rs +++ b/logic/src/search.rs @@ -3,23 +3,17 @@ which is licensed under the GNU Affero General Public License (version 3); see /COPYING. Copyright (C) 2025 metamuffin */ -use crate::{node::DatabaseNodeUserDataExt, session::Session}; +use crate::{DATABASE, node::DatabaseNodeUserDataExt, session::Session}; use anyhow::Result; use jellycommon::{Visibility, api::ApiSearchResponse}; -use jellydb::Database; use std::time::Instant; -pub fn search( - db: &Database, - session: &Session, - query: &str, - page: Option, -) -> Result { +pub fn search(session: &Session, query: &str, page: Option) -> Result { let timing = Instant::now(); - let (count, ids) = db.search(query, 32, page.unwrap_or_default() * 32)?; + let (count, ids) = DATABASE.search(query, 32, page.unwrap_or_default() * 32)?; let mut results = ids .into_iter() - .map(|id| db.get_node_with_userdata(id, &session)) + .map(|id| DATABASE.get_node_with_userdata(id, &session)) .collect::, anyhow::Error>>()?; results.retain(|(n, _)| n.visibility >= Visibility::Reduced); let duration = timing.elapsed(); -- cgit v1.2.3-70-g09d2