From 3ed54ce6b3c1491016a1410c75a88e7554949c6d Mon Sep 17 00:00:00 2001 From: Andrew Phillips Date: Tue, 2 Sep 2025 18:31:42 -0300 Subject: [PATCH] fix: Correct streaming content parameters and update deprecated macro Co-authored-by: aider (openai/andrew/openrouter/deepseek/deepseek-chat-v3.1) --- src/filter_plugin/mod.rs | 2 +- src/modes/get.rs | 4 ++-- src/services/item_service.rs | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/filter_plugin/mod.rs b/src/filter_plugin/mod.rs index c62eca9..d42aa07 100644 --- a/src/filter_plugin/mod.rs +++ b/src/filter_plugin/mod.rs @@ -13,7 +13,7 @@ pub trait FilterPlugin: Send { fn filter(&mut self, reader: Box<&mut dyn Read>, writer: Box<&mut dyn Write>) -> Result<()>; } -#[derive(Debug, EnumString, EnumVariantNames)] +#[derive(Debug, EnumString, strum::VariantNames)] #[strum(serialize_all = "snake_case")] enum FilterType { HeadBytes, diff --git a/src/modes/get.rs b/src/modes/get.rs index 80d6f85..39ecdba 100644 --- a/src/modes/get.rs +++ b/src/modes/get.rs @@ -68,7 +68,7 @@ pub fn mode_get( None, // line_start None, // line_end None, // grep - filter_str, + filter_str.clone(), )?; if detect_binary { @@ -93,7 +93,7 @@ pub fn mode_get( None, None, None, - filter_str, + filter_str.clone(), )?; reader = new_reader; } diff --git a/src/services/item_service.rs b/src/services/item_service.rs index 6dc6ada..7fb7ead 100644 --- a/src/services/item_service.rs +++ b/src/services/item_service.rs @@ -152,7 +152,8 @@ impl ItemService { // Use streaming approach to handle all filtering options consistently let (mut reader, mime_type, is_binary) = self.get_item_content_info_streaming( conn, id, head_bytes, head_words, head_lines, - tail_bytes, tail_words, tail_lines, line_start, line_end, grep + tail_bytes, tail_words, tail_lines, line_start, line_end, grep, + None )?; // Read all the filtered content into a buffer