refactor: 重构 convert_with_cache 方法，使用结构体封装参数

- 新增 ConvertWithCacheOptions 结构体封装转换参数
- 解决 clippy::too_many_arguments 警告
- 改进代码可维护性和可读性
- 导出 ConvertWithCacheOptions 以便外部使用

Author: Peng-YM

src/converter.rs

@@ -7,6 +7,16 @@ use std::collections::HashMap;
 use std::path::Path;
 use std::sync::Arc;
 
+/// 带缓存转换的参数
+pub struct ConvertWithCacheOptions<'a> {
+    pub input_path: &'a Path,
+    pub input_identifier: &'a str,
+    pub output_dir: &'a Path,
+    pub config: &'a dyn ProviderConfig,
+    pub provider_name: &'a str,
+    pub page_ranges: Option<Vec<(u32, u32)>>,
+}
+
 pub struct Converter {
     provider: Arc<dyn DocumentProvider>,
     cache_manager: Option<CacheManager>,
@@ -22,14 +32,17 @@ impl Converter {
     /// 带缓存的转换方法
     pub async fn convert_with_cache(
         &self,
-        input_path: &Path,
-        input_identifier: &str, // 原始输入路径或 URL
-        output_dir: &Path,
-        config: &dyn ProviderConfig,
-        provider_name: &str,
-        page_ranges: Option<Vec<(u32, u32)>>,
+        options: ConvertWithCacheOptions<'_>,
         progress_cb: impl FnMut(ProgressUpdate) + Send + 'static,
     ) -> Result<ParseResult> {
+        let ConvertWithCacheOptions {
+            input_path,
+            input_identifier,
+            output_dir,
+            config,
+            provider_name,
+            page_ranges,
+        } = options;
         // 首先尝试从缓存获取
         if let Some(cache_manager) = &self.cache_manager {
             // 计算哈希
@@ -64,7 +77,7 @@ impl Converter {
 
                 // 更新 Markdown 中的图片引用
                 let mut markdown = result.markdown.clone();
-                for (img_name, _) in &result.images {
+                for img_name in result.images.keys() {
                     let relative_path = format!("images/{}", img_name);
                     let original_ref = img_name;
                     markdown = markdown.replace(original_ref, &relative_path);

src/lib.rs

@@ -15,7 +15,7 @@ pub mod provider;
 pub mod utils;
 
 pub use cache::{CacheManager, CACHE_DISABLE_ENV_VAR};
-pub use converter::Converter;
+pub use converter::{ConvertWithCacheOptions, Converter};
 pub use error::{anyhow, Result};
 pub use provider::{DocumentProvider, ParseResult, ProgressUpdate, ProviderType, ZhipuModel};
 pub use utils::{download_pdf, is_url, normalize_arxiv_url, PdfMetadata};

src/main.rs

@@ -4,6 +4,7 @@ use clap::Parser;
 use colored::Colorize;
 use indicatif::{ProgressBar, ProgressStyle};
 use pdf_to_markdown::cache::{CacheManager, CACHE_DISABLE_ENV_VAR};
+use pdf_to_markdown::converter::ConvertWithCacheOptions;
 use pdf_to_markdown::error::{anyhow, Result};
 use pdf_to_markdown::provider::traits::*;
 use pdf_to_markdown::provider::ProviderType;
@@ -630,23 +631,23 @@ async fn handle_parse(
                 poll_interval_secs: 3,
                 page_ranges: page_ranges_clone.clone(),
             };
+            let options = ConvertWithCacheOptions {
+                input_path: &pdf_path,
+                input_identifier: input,
+                output_dir: &output_dir,
+                config: &config,
+                provider_name: &provider_str,
+                page_ranges,
+            };
             converter
-                .convert_with_cache(
-                    &pdf_path,
-                    input,
-                    &output_dir,
-                    &config,
-                    &provider_str,
-                    page_ranges,
-                    move |update| {
-                        let pb = pb_clone.lock().unwrap();
-                        pb.set_message(update.message);
-                        if let Some(total) = update.total {
-                            pb.set_length(total);
-                        }
-                        pb.set_position(update.current);
-                    },
-                )
+                .convert_with_cache(options, move |update| {
+                    let pb = pb_clone.lock().unwrap();
+                    pb.set_message(update.message);
+                    if let Some(total) = update.total {
+                        pb.set_length(total);
+                    }
+                    pb.set_position(update.current);
+                })
                 .await
         }
         ProviderType::PaddleOcr => {
@@ -655,19 +656,19 @@ async fn handle_parse(
                 // 使用默认配置：打开布局检查，关闭图片方向矫正和扭曲矫正
                 ..Default::default()
             };
+            let options = ConvertWithCacheOptions {
+                input_path: &pdf_path,
+                input_identifier: input,
+                output_dir: &output_dir,
+                config: &config,
+                provider_name: &provider_str,
+                page_ranges,
+            };
             converter
-                .convert_with_cache(
-                    &pdf_path,
-                    input,
-                    &output_dir,
-                    &config,
-                    &provider_str,
-                    page_ranges,
-                    move |update| {
-                        let pb = pb_clone.lock().unwrap();
-                        pb.set_message(update.message);
-                    },
-                )
+                .convert_with_cache(options, move |update| {
+                    let pb = pb_clone.lock().unwrap();
+                    pb.set_message(update.message);
+                })
                 .await
         }
     }?;