asp/keep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: optimize item service creation by creating it once per connection

Browse Source 
Co-authored-by: aider (openai/andrew/openrouter/qwen/qwen3-coder) <aider@aider.chat>
This commit is contained in:
Andrew Phillips
2025-08-25 20:27:21 -03:00
parent 7eefb64d15
commit 1f11351d9b
4 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/services/async_item_service.rs
View File

@@ -17,21 +17,21 @@ use tokio_util::io::ReaderStream;
pub struct AsyncItemService {
pub data_dir: PathBuf,
db: Arc<Mutex<Connection>>,
item_service: Arc<ItemService>,
}
#[allow(dead_code)]
impl AsyncItemService {
pub fn new(data_dir: PathBuf, db: Arc<Mutex<Connection>>) -> Self {
Self { data_dir, db }
pub fn new(data_dir: PathBuf, db: Arc<Mutex<Connection>>, item_service: Arc<ItemService>) -> Self {
Self { data_dir, db, item_service }
}
pub async fn get_item(&self, id: i64) -> Result<ItemWithMeta, CoreError> {
let data_dir = self.data_dir.clone();
let db = self.db.clone();
let item_service = self.item_service.clone();
tokio::task::spawn_blocking(move || {
let conn = db.blocking_lock();
let item_service = ItemService::new(data_dir);
item_service.get_item(&conn, id)
})
.await
@@ -39,12 +39,11 @@ impl AsyncItemService {
}
pub async fn get_item_content(&self, id: i64) -> Result<ItemWithContent, CoreError> {
let data_dir = self.data_dir.clone();
let db = self.db.clone();
let item_service = self.item_service.clone();
tokio::task::spawn_blocking(move || {
let conn = db.blocking_lock();
let item_service = ItemService::new(data_dir);
item_service.get_item_content(&conn, id)
})
.await
@@ -59,13 +58,12 @@ impl AsyncItemService {
offset: u64,
length: u64,
) -> Result<(std::pin::Pin<Box<dyn tokio_stream::Stream<Item = Result<tokio_util::bytes::Bytes, std::io::Error>> + Send>>, String), CoreError> {
let data_dir = self.data_dir.clone();
let db = self.db.clone();
let item_service = self.item_service.clone();
// Get item metadata first to check binary status and get MIME type
let item_with_content = tokio::task::spawn_blocking(move || {
let conn = db.blocking_lock();
let item_service = ItemService::new(data_dir);
item_service.get_item_content(&conn, item_id)
})
.await
@@ -120,12 +118,11 @@ impl AsyncItemService {
tags: Vec<String>,
meta: HashMap<String, String>,
) -> Result<ItemWithMeta, CoreError> {
let data_dir = self.data_dir.clone();
let db = self.db.clone();
let item_service = self.item_service.clone();
tokio::task::spawn_blocking(move || {
let conn = db.blocking_lock();
let item_service = ItemService::new(data_dir);
item_service.find_item(&conn, &ids, &tags, &meta)
})
.await
@@ -137,12 +134,11 @@ impl AsyncItemService {
tags: Vec<String>,
meta: HashMap<String, String>,
) -> Result<Vec<ItemWithMeta>, CoreError> {
let data_dir = self.data_dir.clone();
let db = self.db.clone();
let item_service = self.item_service.clone();
tokio::task::spawn_blocking(move || {
let conn = db.blocking_lock();
let item_service = ItemService::new(data_dir);
item_service.list_items(&conn, &tags, &meta)
})
.await
@@ -150,12 +146,11 @@ impl AsyncItemService {
}
pub async fn delete_item(&self, id: i64) -> Result<(), CoreError> {
let data_dir = self.data_dir.clone();
let db = self.db.clone();
let item_service = self.item_service.clone();
tokio::task::spawn_blocking(move || {
let mut conn = db.blocking_lock();
let item_service = ItemService::new(data_dir);
item_service.delete_item(&mut conn, id)
})
.await
@@ -168,12 +163,11 @@ impl AsyncItemService {
tags: Vec<String>,
metadata: HashMap<String, String>,
) -> Result<ItemWithMeta, CoreError> {
let data_dir = self.data_dir.clone();
let db = self.db.clone();
let item_service = self.item_service.clone();
tokio::task::spawn_blocking(move || {
let mut conn = db.blocking_lock();
let item_service = ItemService::new(data_dir);
item_service.save_item_from_mcp(&content, &tags, &metadata, &mut conn)
})
.await