Remove the last use of walkdir.

src/intermediate/blog_post.rs

@@ -3,13 +3,16 @@ use std::path::PathBuf;
 use std::sync::Arc;
 use std::sync::Mutex;
 
+use tokio::fs::DirEntry;
 use tokio::task::JoinHandle;
-use walkdir::WalkDir;
 
 use crate::error::CustomError;
 use crate::intermediate::blog_post_page::BlogPostPageInput;
 use crate::intermediate::registry::Registry;
 use crate::intermediate::IntermediateContext;
+use crate::walk_fs::walk_fs;
+use crate::walk_fs::WalkAction;
+use crate::walk_fs::WalkFsFilterResult;
 
 use super::BlogPostPage;
 
@@ -34,7 +37,7 @@ impl BlogPost {
 
             let org_files = {
                 let mut ret = Vec::new();
-                let org_files_iter = get_org_files(post_dir)?;
+                let org_files_iter = get_org_files(post_dir).await?;
                 for entry in org_files_iter {
                     ret.push(entry.await??);
                 }
@@ -122,25 +125,33 @@ async fn read_file(path: PathBuf) -> std::io::Result<(PathBuf, String)> {
     Ok((path, contents))
 }
 
-pub(crate) fn get_org_files<P: AsRef<Path>>(
+pub(crate) async fn get_org_files<P: AsRef<Path>>(
     root_dir: P,
-) -> Result<impl Iterator<Item = JoinHandle<std::io::Result<(PathBuf, String)>>>, walkdir::Error> {
-    let org_files = WalkDir::new(root_dir)
-        .into_iter()
-        .filter(|e| match e {
-            Ok(dir_entry) => {
-                dir_entry.file_type().is_file()
-                    && Path::new(dir_entry.file_name())
-                        .extension()
-                        .map(|ext| ext.to_ascii_lowercase() == "org")
-                        .unwrap_or(false)
-            }
-            Err(_) => true,
-        })
-        .collect::<Result<Vec<_>, _>>()?;
+) -> Result<impl Iterator<Item = JoinHandle<std::io::Result<(PathBuf, String)>>>, CustomError> {
+    let org_files = walk_fs(root_dir.as_ref(), filter_to_org_files).await?;
     let org_files = org_files
         .into_iter()
-        .map(walkdir::DirEntry::into_path)
+        .map(|entry| entry.path())
         .map(|path| tokio::spawn(read_file(path)));
     Ok(org_files)
 }
+
+async fn filter_to_org_files(entry: &DirEntry) -> WalkFsFilterResult {
+    let file_type = entry.file_type().await?;
+    if file_type.is_dir() {
+        return Ok(WalkAction::Recurse);
+    }
+    if file_type.is_file() {
+        if entry
+            .path()
+            .extension()
+            .map(|ext| ext.eq_ignore_ascii_case("org"))
+            .unwrap_or(false)
+        {
+            return Ok(WalkAction::HaltAndCapture);
+        }
+        return Ok(WalkAction::Halt);
+    }
+
+    unreachable!("Unhandled file type.");
+}