populate author in book lookup queries for better search results

Upgrade to rs-plugin-common-interfaces 0.35.0 which adds author field
to RsLookupBook. Resolve first associated person name and pass it in
lookup and lookup_stream handlers so source plugins can search by
title + author instead of title alone.

Author: neckaros

Cargo.lock

@@ -74,7 +74,7 @@ sha2 = "0.10"
 axum-extra = { version = "0.9.2", features = ["query"] }
 http = "1.1.0"
 extism = "1.13.0"
-rs-plugin-common-interfaces = { version = "0.34.4", features = ["rusqlite",] }
+rs-plugin-common-interfaces = { version = "0.35.0", features = ["rusqlite",] }
 async-recursion = "1.1.0"
 async-compression = { version = "0.4.6", features = ["tokio"] }
 youtube_dl = { version = "0.10.0", features = ["tokio", "downloader-rustls-tls"] }

Cargo.toml

@@ -103,6 +103,7 @@ impl ModelController {
                 let lookup_query = RsLookupQuery::Book(RsLookupBook {
                     name: Some(String::new()),
                     ids: Some(ids.clone()),
+                    author: None,
                     page_key: None,
                 });
                 let plugin_results = self
@@ -348,6 +349,7 @@ impl ModelController {
 
         let lookup_query = RsLookupQuery::Book(RsLookupBook {
             name: None,
+            author: None,
             ids: Some(ids.clone()),
             page_key: None,
         });
@@ -508,6 +510,7 @@ impl ModelController {
             }
             let lookup_query = RsLookupQuery::Book(RsLookupBook {
                 name: None,
+                author: None,
                 ids: Some(book_ids),
                 page_key: None,
             });
@@ -563,6 +566,7 @@ impl ModelController {
         let ids: RsIds = book.clone().into();
         let lookup_query = RsLookupQuery::Book(RsLookupBook {
             name: Some(book.name.clone()),
+            author: None,
             ids: Some(ids),
             page_key: None,
         });

src/model/books.rs

@@ -11,9 +11,11 @@ use axum::{
     Json, Router,
 };
 use futures::{Stream, TryStreamExt};
-use rs_plugin_common_interfaces::domain::{rs_ids::RsIds, ItemWithRelations};
+use rs_plugin_common_interfaces::domain::{rs_ids::RsIds, Relations, ItemWithRelations};
 use rs_plugin_common_interfaces::lookup::{RsLookupBook, RsLookupQuery};
 use rs_plugin_common_interfaces::{ElementType, ExternalImage, ImageType};
+
+use crate::tools::log::{log_info, LogServiceType};
 use serde_json::{json, Value};
 use tokio_util::io::{ReaderStream, StreamReader};
 
@@ -26,6 +28,19 @@ use crate::{
     Error, Result,
 };
 
+async fn first_person_name(mc: &ModelController, library_id: &str, relations: &Option<Relations>, user: &ConnectedUser) -> Option<String> {
+    let person_id = relations
+        .as_ref()
+        .and_then(|r| r.people.as_ref())
+        .and_then(|people| people.first())
+        .map(|p| p.id.clone())?;
+    mc.get_person(library_id, person_id, user)
+        .await
+        .ok()
+        .flatten()
+        .map(|p| p.name)
+}
+
 pub fn routes(mc: ModelController) -> Router {
     Router::new()
         .route("/", get(handler_list))
@@ -167,13 +182,15 @@ async fn handler_lookup(
 ) -> Result<Json<Value>> {
     let book = mc.get_book(&library_id, book_id, &user).await?;
     let name = book.item.name.clone();
+    let author = first_person_name(&mc, &library_id, &book.relations, &user).await;
     let ids: RsIds = book.item.into();
     let query = RsLookupQuery::Book(RsLookupBook {
         name: Some(name),
+        author,
         ids: Some(ids),
         page_key: None,
     });
-    print!("Executing lookup with query: {:?}", query);
+    log_info(LogServiceType::Source, format!("Executing lookup with query: {:?}", query));
     let results = mc.exec_lookup(query, Some(library_id), &user, None).await?;
     Ok(Json(json!(results)))
 }
@@ -185,9 +202,11 @@ async fn handler_lookup_stream(
 ) -> Result<Sse<impl Stream<Item = std::result::Result<Event, Infallible>>>> {
     let book = mc.get_book(&library_id, book_id, &user).await?;
     let name = book.item.name.clone();
+    let author = first_person_name(&mc, &library_id, &book.relations, &user).await;
     let ids: RsIds = book.item.into();
     let query = RsLookupQuery::Book(RsLookupBook {
         name: Some(name),
+        author,
         ids: Some(ids),
         page_key: None,
     });
@@ -290,6 +309,7 @@ async fn handler_image_search(
     let ids: RsIds = book.item.into();
     let query = RsLookupBook {
         name: Some(title),
+        author: None,
         ids: Some(ids),
         page_key: None,
     };