Respect the .gitignore and .mdbookignore files

Cargo.toml

@@ -19,6 +19,7 @@ anyhow = "1.0.47"
 env_logger = "0.11.0"
 genawaiter = { version = "0.99.1", default-features = false }
 html5gum = "0.5.7"
+ignore = "0.4"
 log = "0.4.0"
 mdbook = { version = "0.4.35", default-features = false }
 normpath = "1.0.0"
@@ -33,7 +34,6 @@ serde_yaml = "0.9.0"
 tempfile = "3.0.0"
 toml = "0.8.0"
 ureq = "2.0.0"
-walkdir = "2.0.0"
 
 # Increase minimum version requirements of transitive dependencies
 thiserror = "1.0.2"

src/pandoc/renderer.rs

@@ -288,7 +288,7 @@ impl Renderer {
         }
 
         if log::log_enabled!(log::Level::Trace) {
-            log::trace!("Running pandoc with profile: {profile:#?}");
+            log::trace!("Running pandoc with profile: {profile:#?} - {pandoc:#?}");
         } else {
             log::debug!("Running pandoc");
         }

src/preprocess.rs

@@ -14,6 +14,7 @@ use std::{
 
 use aho_corasick::AhoCorasick;
 use anyhow::{anyhow, Context as _};
+use ignore::gitignore::{Gitignore, GitignoreBuilder};
 use log::log;
 use mdbook::{
     book::{BookItems, Chapter},
@@ -23,9 +24,9 @@ use normpath::PathExt;
 use once_cell::sync::Lazy;
 use pulldown_cmark::{CodeBlockKind, CowStr, HeadingLevel, LinkType};
 use regex::Regex;
-use walkdir::WalkDir;
 
 use crate::{
+    book::Book,
     latex,
     pandoc::{self, OutputFormat, RenderContext},
 };
@@ -102,22 +103,8 @@ impl<'book> Preprocessor<'book> {
         }
         fs::create_dir_all(&preprocessed)?;
 
-        for entry in WalkDir::new(&ctx.book.source_dir).follow_links(true) {
-            let entry = entry?;
-            let src = entry.path();
-            if src.starts_with(ctx.book.destination.as_path()) {
-                continue;
-            }
-            let dest = preprocessed.join(src.strip_prefix(&ctx.book.source_dir).unwrap());
-            if entry.file_type().is_dir() {
-                fs::create_dir_all(&dest)
-                    .with_context(|| format!("Unable to create directory '{}'", dest.display()))?
-            } else {
-                fs::copy(src, &dest).with_context(|| {
-                    format!("Unable to copy '{}' -> '{}'", src.display(), dest.display())
-                })?;
-            }
-        }
+        let ignore = build_ignore(ctx.book)?;
+        copy_recursive(ctx.book.destination.as_path(), &ctx.book.source_dir, &preprocessed, &ignore)?;
 
         let mut chapters = HashMap::new();
         for section in ctx.book.book.iter() {
@@ -751,7 +738,7 @@ impl<'book, 'preprocessor> PreprocessChapter<'book, 'preprocessor> {
         let Some(level) = iter::successors(Some(level), |level| shift_smaller(*level))
             .nth(self.chapter.parent_names.len())
         else {
-            log::warn!(
+            log::info!(
                 "Heading (level {level}) converted to paragraph in chapter: {}",
                 self.chapter.name
             );
@@ -1288,6 +1275,75 @@ impl fmt::Debug for IndexedChapter<'_> {
     }
 }
 
+fn copy_recursive(dest_dir: &Path, src: &Path, dst: &Path, ignore: &Gitignore) -> anyhow::Result<()> {
+    for e in src
+        .read_dir()
+        .with_context(|| format!("Unable to read directory {src:#?}"))?
+    {
+        let cur = e?.path();
+
+        if cur.starts_with(dest_dir) {
+            continue;
+        }
+
+        if ignore.matched(&cur, cur.is_dir()).is_ignore() {
+            continue;
+        }
+
+        if cur.is_dir() {
+            let dir = dst.join(cur.strip_prefix(src).unwrap());
+
+            fs::create_dir_all(&dir)
+                .with_context(|| format!("Unable to create directory {dir:#?}"))?;
+
+            copy_recursive(dest_dir, &cur, &dir, ignore)?;
+        } else {
+            let dst = dst.join(cur.strip_prefix(src).unwrap());
+
+            fs::copy(cur, &dst).with_context(|| {
+                format!("Unable to copy '{}' -> '{}'", src.display(), dst.display())
+            })?;
+        }
+    }
+
+    Ok(())
+}
+
+fn build_ignore(book: &Book) -> anyhow::Result<Gitignore> {
+    let root = book.root.canonicalize()?;
+    let mut src = book.source_dir.canonicalize()?;
+
+    let mut builder = GitignoreBuilder::new(&src);
+
+    let mdbook_ignore = src.join(".mdbookignore");
+    if mdbook_ignore.exists() {
+        if let Some(err) = builder.add(mdbook_ignore) {
+            log::warn!("Unable to load '.mdbookignore' file: {}", err);
+        }
+    }
+
+    loop {
+        let git_ignore = src.join(".gitignore");
+        if git_ignore.exists() {
+            if let Some(err) = builder.add(git_ignore) {
+                log::warn!("Unable to load '.gitignore' file: {}", err);
+            }
+        }
+
+        if src == root {
+            break;
+        }
+
+        let Some(parent) = src.parent() else {
+            break;
+        };
+
+        src = parent.canonicalize()?;
+    }
+
+    Ok(builder.build()?)
+}
+
 #[cfg(test)]
 mod tests {
     use super::Preprocessor;