格式化代码提高可读性

Doraemonsan · Doraemonsan · commit d955ac183126 · 2025-08-30T16:38:46.000+08:00
diff --git a/src/api.rs b/src/api.rs
@@ -1,6 +1,6 @@
 // src/api.rs
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use reqwest::blocking::Client;
 use serde::Deserialize;
 use std::collections::HashMap;
@@ -59,10 +59,7 @@ impl ApiClient {
                     if response.status().is_success() {
                         return Ok(response);
                     } else {
-                        last_error = Some(anyhow!(
-                            "API 请求失败，状态码: {}",
-                            response.status()
-                        ));
+                        last_error = Some(anyhow!("API 请求失败，状态码: {}", response.status()));
                     }
                 }
                 Err(e) => {
@@ -80,10 +77,8 @@ impl ApiClient {
 
     pub fn list_voices(&self) -> Result<Vec<Voice>> {
         let url = format!("{}/voices", self.base_url);
-        
-        let response = self.send_request_with_retry(|| {
-            self.client.get(&url).build()
-        })?;
+
+        let response = self.send_request_with_retry(|| self.client.get(&url).build())?;
 
         let parsed_response = response
             .json::<VoicesResponse>()
@@ -113,17 +108,23 @@ impl ApiClient {
     ) -> Result<Vec<u8>> {
         let mut url = url::Url::parse(&format!("{}/forward", self.base_url))
             .context("无法解析 /forward API 地址")?;
-        
+
         url.query_pairs_mut().append_pair("text", text);
-        if let Some(v) = voice { url.query_pairs_mut().append_pair("voice", v); }
-        if let Some(v) = volume { url.query_pairs_mut().append_pair("volume", &v.to_string()); }
-        if let Some(v) = speed { url.query_pairs_mut().append_pair("speed", &v.to_string()); }
-        if let Some(v) = pitch { url.query_pairs_mut().append_pair("pitch", &v.to_string()); }
+        if let Some(v) = voice {
+            url.query_pairs_mut().append_pair("voice", v);
+        }
+        if let Some(v) = volume {
+            url.query_pairs_mut().append_pair("volume", &v.to_string());
+        }
+        if let Some(v) = speed {
+            url.query_pairs_mut().append_pair("speed", &v.to_string());
+        }
+        if let Some(v) = pitch {
+            url.query_pairs_mut().append_pair("pitch", &v.to_string());
+        }
 
         let request_url = url.to_string();
-        let response = self.send_request_with_retry(|| {
-            self.client.get(&request_url).build()
-        })?;
+        let response = self.send_request_with_retry(|| self.client.get(&request_url).build())?;
 
         let bytes = response.bytes().context("读取音频响应体失败")?.to_vec();
         Ok(bytes)
diff --git a/src/lrc.rs b/src/lrc.rs
@@ -15,7 +15,10 @@ pub fn generate_lrc(
     let mut lrc_content = String::new();
 
     // 歌词文件最上方添加 LRC 元数据标签
-    let file_name = output_path.file_stem().unwrap_or_default().to_string_lossy();
+    let file_name = output_path
+        .file_stem()
+        .unwrap_or_default()
+        .to_string_lossy();
     lrc_content.push_str("[ar:Generated by BaiTTS CLI-rs]\n");
     lrc_content.push_str("[al:Audio]\n");
     lrc_content.push_str(&format!("[ti:{}]\n\n", file_name));
@@ -53,7 +56,7 @@ pub fn generate_lrc(
         // 为每个小行生成带时间戳的歌词
         for (j, chunk) in chunks.iter().enumerate() {
             let chunk_start_time = line_start_time + chunk_duration * j as u32;
-            
+
             let minutes = chunk_start_time.as_secs() / 60;
             let seconds = chunk_start_time.as_secs() % 60;
             let millis = chunk_start_time.subsec_millis() / 10;
@@ -64,16 +67,16 @@ pub fn generate_lrc(
     }
 
     let lrc_path = PathBuf::from(output_path).with_extension("lrc");
-    fs::write(&lrc_path, lrc_content)
-        .context(format!("无法写入 LRC 文件到 {:?}", lrc_path))?;
-    
+    fs::write(&lrc_path, lrc_content).context(format!("无法写入 LRC 文件到 {:?}", lrc_path))?;
+
     println!("成功生成 LRC 文件: {:?}", lrc_path);
     Ok(())
 }
 
 // 查找理想的分割点（各类标点符号或空格）。
 fn is_break_character(c: char) -> bool {
-    matches!(c,
+    matches!(
+        c,
         // 中文常用标点 (全角)
         '，' | '。' | '？' | '！' | '；' | '：' | '、' |
         // 英文常用标点 (半角)
@@ -98,7 +101,9 @@ fn split_line_intelligently(line: &str, max_chars: usize) -> Vec<String> {
     let mut current_pos = 0;
 
     // 循环前，先跳过所有行首的无效字符
-    while current_pos < chars.len() && (chars[current_pos].is_whitespace() || is_break_character(chars[current_pos])) {
+    while current_pos < chars.len()
+        && (chars[current_pos].is_whitespace() || is_break_character(chars[current_pos]))
+    {
         current_pos += 1;
     }
 
@@ -107,47 +112,66 @@ fn split_line_intelligently(line: &str, max_chars: usize) -> Vec<String> {
             let chunk = chars[current_pos..].iter().collect::<String>();
             let trimmed_chunk = chunk.trim();
             if !trimmed_chunk.is_empty() {
-                 chunks.push(trimmed_chunk.to_string());
+                chunks.push(trimmed_chunk.to_string());
             }
             break;
         }
 
         let search_end = current_pos + max_chars;
         let search_range = &chars[current_pos..search_end];
 
-        if let Some(split_pos_relative) = search_range.iter().rposition(|&c| is_break_character(c)) {
+        if let Some(split_pos_relative) = search_range.iter().rposition(|&c| is_break_character(c))
+        {
             // 找到了理想的分割点（在max_chars范围内）
             let split_pos_absolute = current_pos + split_pos_relative;
-            let chunk = chars[current_pos..=split_pos_absolute].iter().collect::<String>().trim().to_string();
+            let chunk = chars[current_pos..=split_pos_absolute]
+                .iter()
+                .collect::<String>()
+                .trim()
+                .to_string();
             if !chunk.is_empty() {
                 chunks.push(chunk);
             }
-            
+
             let mut next_pos = split_pos_absolute + 1;
-            while next_pos < chars.len() && (chars[next_pos].is_whitespace() || is_break_character(chars[next_pos])) {
+            while next_pos < chars.len()
+                && (chars[next_pos].is_whitespace() || is_break_character(chars[next_pos]))
+            {
                 next_pos += 1;
             }
             current_pos = next_pos;
-
         } else {
             // 在max_chars范围内未找到分割点，因此向前查找下一个分割点
             // 从 search_end 开始向字符串末尾搜索
-            if let Some(next_break_relative) = chars[search_end..].iter().position(|&c| is_break_character(c)) {
+            if let Some(next_break_relative) = chars[search_end..]
+                .iter()
+                .position(|&c| is_break_character(c))
+            {
                 // 找到了下一个分割点
                 let split_pos_absolute = search_end + next_break_relative;
-                let chunk = chars[current_pos..=split_pos_absolute].iter().collect::<String>().trim().to_string();
+                let chunk = chars[current_pos..=split_pos_absolute]
+                    .iter()
+                    .collect::<String>()
+                    .trim()
+                    .to_string();
                 if !chunk.is_empty() {
                     chunks.push(chunk);
                 }
 
                 let mut next_pos = split_pos_absolute + 1;
-                while next_pos < chars.len() && (chars[next_pos].is_whitespace() || is_break_character(chars[next_pos])) {
+                while next_pos < chars.len()
+                    && (chars[next_pos].is_whitespace() || is_break_character(chars[next_pos]))
+                {
                     next_pos += 1;
                 }
                 current_pos = next_pos;
             } else {
                 // 从 search_end 到字符串末尾都没有任何分割点，将剩余部分全部作为一块
-                let chunk = chars[current_pos..].iter().collect::<String>().trim().to_string();
+                let chunk = chars[current_pos..]
+                    .iter()
+                    .collect::<String>()
+                    .trim()
+                    .to_string();
                 if !chunk.is_empty() {
                     chunks.push(chunk);
                 }
diff --git a/src/main.rs b/src/main.rs
@@ -6,7 +6,7 @@ mod lrc;
 mod process;
 mod utils;
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use clap::Parser;
 use std::io;
 use std::path::Path;
@@ -20,7 +20,7 @@ fn main() -> Result<()> {
         let api_url = args.api.as_ref().unwrap();
         let client = api::ApiClient::new(api_url.clone())?;
         let voices = client.list_voices()?;
-        
+
         println!("可用的声音列表：");
         for voice in voices {
             println!("{}", "=".repeat(50));
@@ -31,7 +31,6 @@ fn main() -> Result<()> {
             println!("类型: {}", voice.voice_type);
         }
         println!("{}", "=".repeat(50));
-
     } else if let Some(file_path) = &args.file {
         // --- 单文件处理逻辑也采用新的预扫描流程 ---
         let api_url = args.api.as_ref().unwrap();
@@ -47,9 +46,13 @@ fn main() -> Result<()> {
 
         if let Some(info) = files_to_convert.first() {
             println!("警告：文件 {:?} 的编码可能不是 UTF-8。", info.path);
-            println!("检测为: {} (置信度: {:.1}%)", info.encoding, info.confidence * 100.0);
+            println!(
+                "检测为: {} (置信度: {:.1}%)",
+                info.encoding,
+                info.confidence * 100.0
+            );
             println!("是否要将其转换为 UTF-8 编码？(此操作将覆盖原文件) (y/N)");
-            
+
             let mut input = String::new();
             io::stdin().read_line(&mut input)?;
             if input.trim().to_lowercase() == "y" {
@@ -58,9 +61,8 @@ fn main() -> Result<()> {
                 return Err(anyhow!("用户取消了编码转换，终止操作。"));
             }
         }
-        
-        process::process_file(file_path, &args, &client, &blacklist)?;
 
+        process::process_file(file_path, &args, &client, &blacklist)?;
     } else if let Some(dir_path) = &args.dir {
         let api_url = args.api.as_ref().unwrap();
         let client = api::ApiClient::new(api_url.clone())?;
@@ -69,7 +71,6 @@ fn main() -> Result<()> {
             None => None,
         };
         process::process_directory(dir_path, &args, &client, &blacklist)?;
-
     } else {
         println!("错误：没有指定操作 (使用 -h 或 --help 获取帮助)");
     }
@@ -81,7 +82,14 @@ fn validate_args(args: &args::Cli) -> Result<()> {
     let has_file_op = args.file.is_some() || args.dir.is_some();
 
     if args.list {
-        if has_file_op || args.voice.is_some() || args.volume.is_some() || args.speed.is_some() || args.pitch.is_some() || args.sub.is_some() || args.blacklist.is_some() {
+        if has_file_op
+            || args.voice.is_some()
+            || args.volume.is_some()
+            || args.speed.is_some()
+            || args.pitch.is_some()
+            || args.sub.is_some()
+            || args.blacklist.is_some()
+        {
             return Err(anyhow!("使用 --list 时，只允许提供 --api 参数。"));
         }
         if args.api.is_none() {
@@ -92,12 +100,16 @@ fn validate_args(args: &args::Cli) -> Result<()> {
             return Err(anyhow!("使用 --file 或 --dir 时，必须提供 --api 参数。"));
         }
         if let Some(file) = &args.file {
-            if !Path::new(file).exists() { return Err(anyhow!("文件不存在: {:?}", file)); }
+            if !Path::new(file).exists() {
+                return Err(anyhow!("文件不存在: {:?}", file));
+            }
         }
-        if let Some(file) = &args.file && !Path::new(file).exists() { 
-            return Err(anyhow!("文件不存在: {:?}", file)); 
+        if let Some(file) = &args.file
+            && !Path::new(file).exists()
+        {
+            return Err(anyhow!("文件不存在: {:?}", file));
         }
     }
-    
+
     Ok(())
 }
diff --git a/src/process.rs b/src/process.rs
@@ -4,7 +4,7 @@ use crate::api::ApiClient;
 use crate::args::Cli;
 use crate::lrc;
 use crate::utils;
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use hound::{WavReader, WavWriter};
 use indicatif::{ProgressBar, ProgressStyle};
 use regex::Regex;
@@ -22,8 +22,8 @@ pub fn process_file(
 ) -> Result<()> {
     println!("正在处理文件: {:?}", file_path);
 
-    let content = fs::read_to_string(file_path)
-        .context(format!("无法读取文件内容: {:?}", file_path))?;
+    let content =
+        fs::read_to_string(file_path).context(format!("无法读取文件内容: {:?}", file_path))?;
     let mut lines: Vec<String> = content.lines().map(String::from).collect();
 
     if lines.is_empty() {
@@ -42,9 +42,13 @@ pub fn process_file(
     let mut original_lines_for_lrc = Vec::new();
 
     let pb = ProgressBar::new(lines.len() as u64);
-    pb.set_style(ProgressStyle::default_bar()
-        .template("{spinner:.green} [{elapsed_precise}] [{bar:40.cyan/blue}] {pos}/{len} ({eta})")?
-        .progress_chars("#>-"));
+    pb.set_style(
+        ProgressStyle::default_bar()
+            .template(
+                "{spinner:.green} [{elapsed_precise}] [{bar:40.cyan/blue}] {pos}/{len} ({eta})",
+            )?
+            .progress_chars("#>-"),
+    );
 
     for (i, line) in lines.iter().enumerate() {
         if line.trim().is_empty() {
@@ -72,7 +76,7 @@ pub fn process_file(
         let reader = WavReader::new(BufReader::new(File::open(&chunk_path)?))?;
         let duration_ms = (reader.len() as f64 / reader.spec().sample_rate as f64) * 1000.0;
         durations.push(Duration::from_millis(duration_ms as u64));
-        
+
         audio_chunks.push(chunk_path);
         if args.sub.is_some() {
             original_lines_for_lrc.push(line.clone());
@@ -83,14 +87,19 @@ pub fn process_file(
 
     let output_filename = file_path.file_stem().unwrap().to_str().unwrap();
     let output_path = args.out.join(format!("{}.wav", output_filename));
-    
+
     fs::create_dir_all(&args.out).context("创建输出目录失败")?;
-    
+
     combine_wav_files(&audio_chunks, &output_path)?;
     println!("成功合成音频文件: {:?}", output_path);
 
     if let Some(chars_per_line) = args.sub {
-        lrc::generate_lrc(&output_path, &original_lines_for_lrc, &durations, chars_per_line)?;
+        lrc::generate_lrc(
+            &output_path,
+            &original_lines_for_lrc,
+            &durations,
+            chars_per_line,
+        )?;
     }
 
     Ok(())
@@ -107,7 +116,7 @@ pub fn process_directory(
         .map(|e| e.path())
         .filter(|p| p.is_file() && p.extension().is_some_and(|ext| ext == "txt"))
         .collect();
-    
+
     entries.sort();
 
     if entries.is_empty() {
@@ -152,7 +161,7 @@ pub fn process_directory(
         process_file(&entry, args, client, blacklist)?;
         println!("--------------------------------------------------");
     }
-    
+
     println!("所有文件处理完毕。");
     Ok(())
 }
@@ -170,7 +179,10 @@ fn combine_wav_files(files: &[PathBuf], output_path: &Path) -> Result<()> {
     for file in files {
         let mut reader = WavReader::open(file)?;
         if reader.spec() != spec {
-            eprintln!("警告: 文件 {:?} 的 WAV 格式与第一个文件不同，跳过合并。", file);
+            eprintln!(
+                "警告: 文件 {:?} 的 WAV 格式与第一个文件不同，跳过合并。",
+                file
+            );
             continue;
         }
         let samples = reader.samples::<i16>().collect::<Result<Vec<_>, _>>()?;
diff --git a/src/utils.rs b/src/utils.rs
