Preview

Cargo.toml

@@ -10,23 +10,24 @@ license = "MIT"
 homepage = "https://github.com/chmln/sd"
 repository = "https://github.com/chmln/sd.git"
 categories = ["command-line-utilities", "text-processing", "development-tools"]
+resolver = "2"
 
 [dependencies]
-regex = "1.4.3"
+regex = "1.5.4"
 structopt = "0.3.21"
 rayon = "1.5.0"
 unescape = "0.1.0"
 memmap = "0.7.0"
 tempfile = "3.2.0"
 thiserror = "1.0.24"
-globwalk = "0.8.1"
 atty = "0.2.14"
 ignore = "0.4.17"
 ansi_term = "0.12.1"
+itertools = "0.10.0"
 
 [dev-dependencies]
 assert_cmd = "1.0.3"
-anyhow = "1.0.38"
+anyhow = "1.0.40"
 
 [build-dependencies]
 structopt = "0.3.21"

src/cli.rs

@@ -15,10 +15,6 @@ pub(crate) struct Options {
     /// Treat expressions as non-regex strings.
     pub literal_mode: bool,
 
-    #[structopt(short = "r")]
-    /// Recursively replace files
-    pub recursive: bool,
-
     #[structopt(short = "n")]
     /// Limit the number of replacements
     pub replacements: Option<usize>,

src/input.rs

@@ -69,7 +69,7 @@ impl App {
             (Source::Files(paths), true) => {
                 let stdout = std::io::stdout();
                 let mut handle = stdout.lock();
-                let print_path = paths.len() > 1;
+                let separator = "─".repeat(72);
 
                 paths.iter().try_for_each(|path| {
                     if let Err(_) = Replacer::check_not_empty(File::open(path)?)
@@ -78,18 +78,27 @@ impl App {
                     }
                     let file =
                         unsafe { memmap::Mmap::map(&File::open(path)?)? };
+
                     if self.replacer.has_matches(&file) {
-                        if print_path {
-                            writeln!(
-                                handle,
-                                "----- FILE {} -----",
-                                path.display()
-                            )?;
+                        if paths.len() > 1 {
+                            ansi_term::Color::Blue
+                                .paint(path.display().to_string().as_bytes())
+                                .write_to(&mut handle)?;
+
+                            handle.write(b"\n")?;
+                            ansi_term::Color::Blue
+                                .paint(separator.as_bytes())
+                                .write_to(&mut handle)?;
+
+                            handle.write(b"\n")?;
                         }
 
                         handle
                             .write_all(&self.replacer.replace_preview(&file))?;
-                        writeln!(handle)?;
+
+                        if paths.len() > 1 {
+                            handle.write(b"\n")?;
+                        }
                     }
 
                     Ok(())

src/main.rs

@@ -12,10 +12,10 @@ fn main() -> Result<()> {
     use structopt::StructOpt;
     let options = cli::Options::from_args();
 
-    let source = if options.recursive {
-        Source::recursive()?
-    } else if options.files.len() > 0 {
+    let source = if options.files.len() > 0 {
         Source::Files(options.files)
+    } else if atty::is(atty::Stream::Stdin) {
+        Source::recursive()?
     } else {
         Source::Stdin
     };