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

fix: resolve lifetime issues and remove unused imports

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 18:50:21 -03:00
parent e364bd072a
commit 7ef2ac670b
2 changed files with 14 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modes/server/api/item.rs
View File

@@ -10,10 +10,6 @@ use std::collections::HashMap;
use crate::services::async_item_service::AsyncItemService;
use crate::services::error::CoreError;
use crate::modes::server::common::{AppState, ApiResponse, ItemInfo, TagsQuery, ListItemsQuery, ItemInfoListResponse, ItemInfoResponse, MetadataResponse, ItemQuery, ItemContentQuery};
use crate::common::is_binary::is_binary;
use tokio::io::{AsyncReadExt, AsyncSeekExt};
use tokio_util::io::ReaderStream;
use tokio_util::bytes::Bytes;
#[utoipa::path(
get,

76
src/services/async_item_service.rs
View File

@@ -52,13 +52,14 @@ impl AsyncItemService {
.unwrap()
}
pub async fn stream_item_content(
pub async fn stream_item_content_by_id(
&self,
item_id: i64,
allow_binary: bool,
offset: u64,
length: u64,
) -> Result<(impl tokio_stream::Stream<Item = Result<tokio_util::bytes::Bytes, std::io::Error>>, String), CoreError> {
) -> Result<(std::pin::Pin<Box<dyn tokio_stream::Stream<Item = Result<tokio_util::bytes::Bytes, std::io::Error>> + Send>>, String), CoreError> {
let item_with_content = self.get_item_content(item_id).await?;
let metadata = item_with_content.item_with_meta.meta_as_map();
@@ -68,7 +69,7 @@ impl AsyncItemService {
binary_val == "true"
} else {
// If binary metadata not available, check the actual content
is_binary(&item_with_content.content)
crate::common::is_binary::is_binary(&item_with_content.content)
};
if is_content_binary {
@@ -83,75 +84,26 @@ impl AsyncItemService {
// Open the file for streaming
let file_path = self.data_dir.join(format!("{}.dat", item_id));
let file = tokio::fs::File::open(&file_path).await?;
let file = tokio::fs::File::open(&file_path).await
.map_err(|e| CoreError::Io(e))?;
let mut buffered_file = tokio::io::BufReader::new(file);
// Seek to the requested offset if needed
if offset > 0 {
buffered_file.seek(std::io::SeekFrom::Start(offset)).await?;
buffered_file.seek(std::io::SeekFrom::Start(offset)).await
.map_err(|e| CoreError::Io(e))?;
}
// Create a reader stream with optional length limit
// Create a reader stream with optional length limit
let stream = if length > 0 {
// Limit the stream to the specified length
Box::pin(ReaderStream::new(buffered_file.take(length))) as std::pin::Pin<Box<dyn tokio_stream::Stream<Item = Result<Bytes, std::io::Error>> + Send>>
} else {
// Stream the entire file from the offset
Box::pin(ReaderStream::new(buffered_file)) as std::pin::Pin<Box<dyn tokio_stream::Stream<Item = Result<Bytes, std::io::Error>> + Send>>
};
Ok((stream, mime_type))
}
pub async fn stream_item_content_by_id(
&self,
item_id: i64,
allow_binary: bool,
offset: u64,
length: u64,
) -> anyhow::Result<(impl tokio_stream::Stream<Item = Result<tokio_util::bytes::Bytes, std::io::Error>>, String)> {
let item_with_content = self.get_item_content(item_id).await?;
let metadata = item_with_content.item_with_meta.meta_as_map();
// Check if content is binary when allow_binary is false
if !allow_binary {
let is_content_binary = if let Some(binary_val) = metadata.get("binary") {
binary_val == "true"
let stream: std::pin::Pin<Box<dyn tokio_stream::Stream<Item = Result<tokio_util::bytes::Bytes, std::io::Error>> + Send>> =
if length > 0 {
// Limit the stream to the specified length
Box::pin(ReaderStream::new(buffered_file.take(length)))
} else {
// If binary metadata not available, check the actual content
is_binary(&item_with_content.content)
// Stream the entire file from the offset
Box::pin(ReaderStream::new(buffered_file))
};
if is_content_binary {
return Err(anyhow::anyhow!("Binary content not allowed"));
}
}
let mime_type = metadata
.get("mime_type")
.map(|s| s.to_string())
.unwrap_or_else(|| "application/octet-stream".to_string());
// Open the file for streaming
let file_path = self.data_dir.join(format!("{}.dat", item_id));
let file = tokio::fs::File::open(&file_path).await?;
let mut buffered_file = tokio::io::BufReader::new(file);
// Seek to the requested offset if needed
if offset > 0 {
buffered_file.seek(std::io::SeekFrom::Start(offset)).await?;
}
// Create a reader stream with optional length limit
let stream = if length > 0 {
// Limit the stream to the specified length
Box::pin(ReaderStream::new(buffered_file.take(length))) as std::pin::Pin<Box<dyn tokio_stream::Stream<Item = Result<Bytes, std::io::Error>> + Send>>
} else {
// Stream the entire file from the offset
Box::pin(ReaderStream::new(buffered_file)) as std::pin::Pin<Box<dyn tokio_stream::Stream<Item = Result<Bytes, std::io::Error>> + Send>>
};
Ok((stream, mime_type))
}