refactor(build): extract common file path and extraction logic to lib

Move repeated file path construction and extraction checks into shared library functions
Add new utility functions for target path generation and line ending normalization

Author: wang-q

src/cmd_cbp/build/font.rs

@@ -60,11 +60,7 @@ pub fn execute(args: &ArgMatches) -> anyhow::Result<()> {
             .ok_or_else(|| anyhow::anyhow!("Download configuration not found"))?;
 
         let temp_dir = tempfile::tempdir()?;
-        let temp_file = if let Some(name) = dl_obj.get("download_name").and_then(|v| v.as_str()) {
-            temp_dir.path().join(name)
-        } else {
-            temp_dir.path().join("download.tmp")
-        };
+        let temp_file = cbp::temp_download_path(&temp_dir, dl_obj);
 
         // Download font file
         let url = dl_obj["url"]
@@ -74,11 +70,7 @@ pub fn execute(args: &ArgMatches) -> anyhow::Result<()> {
         cbp::download_file(url, &temp_file, &agent)?;
 
         // Check if extraction is needed
-        let needs_extract = url.ends_with(".zip")
-            || url.ends_with(".tar.gz")
-            || url.ends_with(".tar.xz")
-            || url.ends_with(".tar.bz2")
-            || dl_obj.get("extract").is_some();
+        let needs_extract = cbp::needs_extract(url, dl_obj);
 
         if needs_extract {
             cbp::extract_archive(&temp_dir, &temp_file, dl_obj)?;
@@ -101,17 +93,10 @@ pub fn execute(args: &ArgMatches) -> anyhow::Result<()> {
         // Find binary files
         let binary_paths = cbp::find_binary_files(temp_dir.path(), dl_obj)?;
 
-        // Create final font package
-        let target_path = base_dir
-            .canonicalize()?
-            .join("binaries")
-            .join(format!("{}.font.tar.gz", pkg))
-            .display()
-            .to_string();
+        let target_path = cbp::target_font_path(&base_dir, pkg)?;
         let temp_path = temp_dir.path().canonicalize()?;
 
-        // Create binaries directory if it doesn't exist
-        std::fs::create_dir_all(base_dir.join("binaries"))?;
+        
 
         // Change to temp directory and collect files
         run_cmd!(

src/cmd_cbp/build/prebuild.rs

@@ -89,24 +89,13 @@ pub fn execute(args: &ArgMatches) -> anyhow::Result<()> {
                 .as_str()
                 .ok_or_else(|| anyhow::anyhow!("URL not found"))?;
 
-            let temp_file = if let Some(name) =
-                dl_obj.get("download_name").and_then(|v| v.as_str())
-            {
-                // Use specified download name
-                temp_dir.path().join(name)
-            } else {
-                temp_dir.path().join("download.tmp")
-            };
+            let temp_file = cbp::temp_download_path(&temp_dir, dl_obj);
 
             println!("-> Downloading from {}", url);
             cbp::download_file(url, &temp_file, &agent)?;
 
             // Check if extraction is needed
-            let needs_extract = url.ends_with(".zip")
-                || url.ends_with(".tar.gz")
-                || url.ends_with(".tar.xz")
-                || url.ends_with(".tar.bz2")
-                || dl_obj.get("extract").is_some();
+            let needs_extract = cbp::needs_extract(url, dl_obj);
 
             if needs_extract {
                 cbp::extract_archive(&temp_dir, &temp_file, dl_obj)?;
@@ -132,14 +121,7 @@ pub fn execute(args: &ArgMatches) -> anyhow::Result<()> {
                 std::fs::remove_file(&temp_file)?;
             }
 
-            // Create final package
-            std::fs::create_dir_all(base_dir.join("binaries"))?;
-            let target_path = base_dir
-                .canonicalize()?
-                .join("binaries")
-                .join(format!("{}.{}.tar.gz", pkg, os_type))
-                .display()
-                .to_string();
+            let target_path = cbp::target_binary_path(&base_dir, pkg, os_type)?;
             let temp_path = temp_dir.path().canonicalize()?;
 
             // Add shebang option if enabled

src/cmd_cbp/build/source.rs

@@ -65,25 +65,13 @@ pub fn execute(args: &ArgMatches) -> anyhow::Result<()> {
             .as_str()
             .ok_or_else(|| anyhow::anyhow!("Font URL not found"))?;
 
-        let temp_file =
-            if let Some(name) = dl_obj.get("download_name").and_then(|v| v.as_str()) {
-                // Use specified download name
-                temp_dir.path().join(name)
-            } else {
-                temp_dir.path().join("download.tmp")
-            };
+        let temp_file = cbp::temp_download_path(&temp_dir, dl_obj);
 
         // Process file after download
         println!("-> Downloading from {}", url);
         cbp::download_file(url, &temp_file, &agent)?;
 
-        let target_path = base_dir
-            .canonicalize()?
-            .join("sources")
-            .join(format!("{}.tar.gz", pkg))
-            .display()
-            .to_string();
-        std::fs::create_dir_all(base_dir.join("sources"))?;
+        let target_path = cbp::target_source_path(&base_dir, pkg)?;
 
         if dl_obj.len() == 1 {
             cbp::move_file_or_dir(&temp_file, std::path::Path::new(&target_path))?;
@@ -92,17 +80,13 @@ pub fn execute(args: &ArgMatches) -> anyhow::Result<()> {
         }
 
         // Check if extraction is needed
-        let needs_extract = url.ends_with(".zip")
-            || url.ends_with(".tar.gz")
-            || url.ends_with(".tar.xz")
-            || url.ends_with(".tar.bz2")
-            || dl_obj.get("extract").is_some();
+        let needs_extract = cbp::needs_extract(url, dl_obj);
 
         if needs_extract {
             println!("-> Processing source archive");
             cbp::extract_archive(&temp_dir, &temp_file, dl_obj)?;
         } else {
-            normalize_line_endings(&temp_file)?;
+            cbp::normalize_line_endings(&temp_file)?;
         }
 
         let temp_path = temp_dir.path().canonicalize()?;
@@ -127,14 +111,7 @@ pub fn execute(args: &ArgMatches) -> anyhow::Result<()> {
     Ok(())
 }
 
-/// Convert CRLF to LF for text files
-fn normalize_line_endings(path: &std::path::Path) -> anyhow::Result<()> {
-    let content = std::fs::read_to_string(path)?;
-    let normalized = content.replace("\r\n", "\n");
-    std::fs::write(path, normalized)?;
-    println!("  -> Normalized line endings: {}", path.display());
-    Ok(())
-}
+ 
 
 // /// Get target directory name for archive
 // fn get_target_name(

src/libs/build.rs

@@ -91,6 +91,28 @@ pub fn extract_archive(
     Ok(())
 }
 
+pub fn needs_extract(
+    url: &str,
+    json_obj: &serde_json::Map<String, serde_json::Value>,
+) -> bool {
+    url.ends_with(".zip")
+        || url.ends_with(".tar.gz")
+        || url.ends_with(".tar.xz")
+        || url.ends_with(".tar.bz2")
+        || json_obj.get("extract").is_some()
+}
+
+pub fn temp_download_path(
+    temp_dir: &tempfile::TempDir,
+    json_obj: &serde_json::Map<String, serde_json::Value>,
+) -> std::path::PathBuf {
+    if let Some(name) = json_obj.get("download_name").and_then(|v| v.as_str()) {
+        temp_dir.path().join(name)
+    } else {
+        temp_dir.path().join("download.tmp")
+    }
+}
+
 /// Handle file renaming based on package configuration
 pub fn handle_rename(
     temp_dir: &tempfile::TempDir,
@@ -349,3 +371,50 @@ pub fn fix_shebang(path: &std::path::Path) -> anyhow::Result<()> {
 
     Ok(())
 }
+
+pub fn target_binary_path(
+    base_dir: &std::path::Path,
+    pkg: &str,
+    os_type: &str,
+) -> anyhow::Result<String> {
+    std::fs::create_dir_all(base_dir.join("binaries"))?;
+    let path = base_dir
+        .canonicalize()?
+        .join("binaries")
+        .join(format!("{}.{}.tar.gz", pkg, os_type))
+        .display()
+        .to_string();
+    Ok(path)
+}
+
+pub fn target_font_path(base_dir: &std::path::Path, pkg: &str) -> anyhow::Result<String> {
+    std::fs::create_dir_all(base_dir.join("binaries"))?;
+    let path = base_dir
+        .canonicalize()?
+        .join("binaries")
+        .join(format!("{}.font.tar.gz", pkg))
+        .display()
+        .to_string();
+    Ok(path)
+}
+
+pub fn target_source_path(
+    base_dir: &std::path::Path,
+    pkg: &str,
+) -> anyhow::Result<String> {
+    std::fs::create_dir_all(base_dir.join("sources"))?;
+    let path = base_dir
+        .canonicalize()?
+        .join("sources")
+        .join(format!("{}.tar.gz", pkg))
+        .display()
+        .to_string();
+    Ok(path)
+}
+
+pub fn normalize_line_endings(path: &std::path::Path) -> anyhow::Result<()> {
+    let content = std::fs::read_to_string(path)?;
+    let normalized = content.replace("\r\n", "\n");
+    std::fs::write(path, normalized)?;
+    Ok(())
+}