accepts a list of paths

Author: dcodesdev

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "clipcat"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 description = "A command line tool for copying the contents to clipboard of multiple files in one go."
 repository = "https://github.com/dcodesdev/clipcat"

Cargo.toml

@@ -5,7 +5,7 @@ use clap::Parser;
 #[command(version, about, long_about = None)]
 pub struct Opts {
     #[clap(default_value = "./")]
-    pub path: String,
+    pub path: Vec<String>,
 
     #[clap(short, long)]
     pub token: bool,

src/cli.rs

@@ -2,22 +2,30 @@ use std::fs;
 use std::io::Read;
 use std::path::Path;
 
-pub fn read_directory_contents(dir: &Path) -> anyhow::Result<String> {
+pub fn read_contents(path: &Path) -> anyhow::Result<String> {
     let mut combined_content = String::new();
 
-    if dir.is_file() {
-        read_file(dir, &mut combined_content)?;
+    if path.is_file() {
+        read_file(path, &mut combined_content)?;
     } else {
-        read_directory_contents_recursive(dir, dir, &mut combined_content)?;
+        read_directory_contents_recursive(path, path, &mut combined_content)?;
     }
 
     Ok(combined_content)
 }
 
-pub fn read_file(path: &Path, content: &mut String) -> anyhow::Result<()> {
-    let file_content = std::fs::read_to_string(path)?;
+pub fn read_file(path: &Path, combined_content: &mut String) -> anyhow::Result<()> {
+    combined_content.push_str(&format!("File: {}\n", path.display()));
 
-    *content = file_content;
+    let mut file_content = String::new();
+    let mut file = fs::File::open(&path)?;
+
+    if let Err(_) = file.read_to_string(&mut file_content) {
+        return Ok(());
+    }
+
+    combined_content.push_str(&file_content);
+    combined_content.push('\n');
 
     Ok(())
 }
@@ -32,18 +40,7 @@ fn read_directory_contents_recursive(
         let path = entry.path();
 
         if path.is_file() {
-            let relative_path = path.strip_prefix(base_path).unwrap().to_string_lossy();
-            combined_content.push_str(&format!("File: {}\n", relative_path));
-
-            let mut file_content = String::new();
-            let mut file = fs::File::open(&path)?;
-
-            if let Err(_) = file.read_to_string(&mut file_content) {
-                return Ok(());
-            }
-
-            combined_content.push_str(&file_content);
-            combined_content.push('\n');
+            read_file(&path, combined_content)?;
         } else if path.is_dir() {
             read_directory_contents_recursive(base_path, &path, combined_content)?;
         }

src/fs.rs

@@ -2,16 +2,19 @@ use clap::Parser;
 use std::path::Path;
 
 use crate::{
-    cli, clip::copy_to_clipboard, fs::read_directory_contents, num::format_number,
-    tiktoken::count_tokens,
+    cli, clip::copy_to_clipboard, fs::read_contents, num::format_number, tiktoken::count_tokens,
 };
 
 pub fn run() -> anyhow::Result<()> {
     let opts = cli::Opts::parse();
-    let (path, token) = (opts.path, opts.token);
+    let (files, token) = (opts.path, opts.token);
 
-    let path = Path::new(&path);
-    let contents = read_directory_contents(path)?;
+    let mut contents = String::new();
+    for path in files.iter() {
+        let path = Path::new(&path);
+        let content = read_contents(&path)?;
+        contents.push_str(&content);
+    }
 
     copy_to_clipboard(&contents)?;