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 --- server/src/ui/search.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'server/src/ui/search.rs') diff --git a/server/src/ui/search.rs b/server/src/ui/search.rs index 750c8bd..e4afdd8 100644 --- a/server/src/ui/search.rs +++ b/server/src/ui/search.rs @@ -8,18 +8,17 @@ use crate::helper::{accept::AcceptJson, language::AcceptLanguage, A}; use anyhow::anyhow; use jellycommon::api::ApiSearchResponse; use jellyimport::is_importing; -use jellylogic::{search::search, session::Session, Database}; +use jellylogic::{search::search, session::Session}; use jellyui::{ render_page, scaffold::{RenderInfo, SessionInfo}, search::SearchPage, }; -use rocket::{get, response::content::RawHtml, serde::json::Json, Either, State}; +use rocket::{get, response::content::RawHtml, serde::json::Json, Either}; #[get("/search?&")] pub async fn r_search<'a>( session: A, - db: &State, aj: AcceptJson, query: Option<&str>, page: Option, @@ -28,7 +27,7 @@ pub async fn r_search<'a>( let AcceptLanguage(lang) = lang; let r = query - .map(|query| search(db, &session.0, query, page)) + .map(|query| search(&session.0, query, page)) .transpose()?; Ok(if *aj { -- cgit v1.2.3-70-g09d2