diff --git a/Cargo.lock b/Cargo.lock index 6983727..b1774c9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -514,4 +514,5 @@ dependencies = [ "serde", "tokio", "toml", + "walkdir", ] diff --git a/Cargo.toml b/Cargo.toml index 44b8f2f..88be60f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,3 +14,4 @@ serde = { version = "1.0.189", default-features = false, features = ["std", "der tokio = { version = "1.30.0", default-features = false, features = ["rt", "rt-multi-thread", "fs", "io-util"] } # display, parse | indexmap, preserve_order toml = "0.8.2" +walkdir = "2.4.0" diff --git a/src/command/build/runner.rs b/src/command/build/runner.rs index c9183a3..46c7a5f 100644 --- a/src/command/build/runner.rs +++ b/src/command/build/runner.rs @@ -1,7 +1,42 @@ +use std::path::Path; +use std::path::PathBuf; + use crate::cli::parameters::BuildArgs; use crate::config::Config; +use tokio::task::JoinHandle; +use walkdir::WalkDir; pub(crate) async fn build_site(args: BuildArgs) -> Result<(), Box> { - let _config = Config::load_from_file(args.config).await?; + let config = Config::load_from_file(args.config).await?; + let org_files = get_org_files(config.get_root_directory())?; + Ok(()) } + +async fn read_file(path: PathBuf) -> std::io::Result<(PathBuf, String)> { + let contents = tokio::fs::read_to_string(&path).await?; + Ok((path, contents)) +} + +fn get_org_files>( + root_dir: P, +) -> Result>>, 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::, _>>()?; + let org_files = org_files + .into_iter() + .map(walkdir::DirEntry::into_path) + .map(|path| tokio::spawn(read_file(path))); + Ok(org_files) +} diff --git a/src/config/full.rs b/src/config/full.rs index 49a0e8f..73837f2 100644 --- a/src/config/full.rs +++ b/src/config/full.rs @@ -44,4 +44,11 @@ impl Config { .await?; Ok(()) } + + pub(crate) fn get_root_directory(&self) -> &Path { + &self + .config_path + .parent() + .expect("Config file must exist inside a directory.") + } }