Merge pull request #59 from essential-contributions/documentation

bug fix

Author: pixelcircuits

docs/readme-sync/src/main.rs

@@ -12,7 +12,7 @@ use serde_json::{self, Value};
 // Centralized constants for hardcoded project paths and filenames
 const DOCS_DIR: &str = "docs";
 const READMES_DIR: &str = "docs/content/readmes";
-const EXPANDED_DIR: &str = "docs/content/expanded";
+const CONTENT_DIR: &str = "docs/content";
 const README_MD: &str = "README.md";
 // Link rewriting target for other README.md files
 const READMES_LINK_DIR: &str = "../readmes";
@@ -61,7 +61,7 @@ fn main() -> Result<()> {
 
 fn sync_repo_readmes(repo_root: &Path) -> Result<()> {
     let dest_dir = repo_root.join(READMES_DIR);
-    let expanded_dir = repo_root.join(EXPANDED_DIR);
+    let content_dir = repo_root.join(CONTENT_DIR);
 
     fs::create_dir_all(&dest_dir).context("creating destination directory")?;
 
@@ -102,7 +102,7 @@ fn sync_repo_readmes(repo_root: &Path) -> Result<()> {
             let src = dent.path().to_path_buf();
             // Skip root README.md
             if src == repo_root.join(README_MD) { continue; }
-            process_readme(repo_root, &src, &dest_dir, &expanded_dir)
+            process_readme(repo_root, &src, &dest_dir, &content_dir)
                 .with_context(|| format!("processing {}", rel(repo_root, &src)))?;
             count += 1;
         }
@@ -119,7 +119,7 @@ fn rel(root: &Path, path: &Path) -> String {
         .replace('\\', "/")
 }
 
-fn process_readme(repo_root: &Path, src_path: &Path, dest_dir: &Path, expanded_dir: &Path) -> Result<()> {
+fn process_readme(repo_root: &Path, src_path: &Path, dest_dir: &Path, content_dir: &Path) -> Result<()> {
     let src_dir = src_path.parent().ok_or_else(|| anyhow!("no parent for src"))?;
     let rel_dir = diff_paths(src_dir, repo_root).ok_or_else(|| anyhow!("rel path failed"))?;
     let slug = rel_dir.to_string_lossy().replace('\\', "/").replace('/', "-");
@@ -134,7 +134,7 @@ fn process_readme(repo_root: &Path, src_path: &Path, dest_dir: &Path, expanded_d
             let prefix = &caps[1];
             let href = &caps[2];
             let rest = &caps[3];
-            let new_href = rewrite_href(repo_root, src_dir, dest_dir, expanded_dir, href);
+            let new_href = rewrite_href(repo_root, src_dir, dest_dir, content_dir, href);
             format!("{}{}{})", prefix, new_href, rest)
         })
         .into_owned();
@@ -146,7 +146,7 @@ fn process_readme(repo_root: &Path, src_path: &Path, dest_dir: &Path, expanded_d
             let start = &caps[1];
             let href = &caps[2];
             let end = &caps[3];
-            let new_href = rewrite_href(repo_root, src_dir, dest_dir, expanded_dir, href);
+            let new_href = rewrite_href(repo_root, src_dir, dest_dir, content_dir, href);
             format!("{}{}{}", start, new_href, end)
         })
         .into_owned();
@@ -159,16 +159,16 @@ fn process_readme(repo_root: &Path, src_path: &Path, dest_dir: &Path, expanded_d
     Ok(())
 }
 
-fn rewrite_href(repo_root: &Path, src_dir: &Path, dest_dir: &Path, expanded_dir: &Path, raw: &str) -> String {
+fn rewrite_href(repo_root: &Path, src_dir: &Path, dest_dir: &Path, content_dir: &Path, raw: &str) -> String {
     let href = raw.trim();
     if href.is_empty() { return raw.to_string(); }
     if is_external(href) { return raw.to_string(); }
 
     let (base_no_q_anchor, suffix) = split_query_anchor(href);
     let abs_target = normalize_join(src_dir, &base_no_q_anchor);
 
-    // If inside docs/content/expanded, make it relative to dest_dir
-    if starts_with_path(&abs_target, expanded_dir) {
+    // If inside docs/content, make it relative to dest_dir
+    if starts_with_path(&abs_target, content_dir) {
         let rel_to_dest = diff_paths(&abs_target, dest_dir).unwrap_or(abs_target.clone());
         return path_to_unix(&rel_to_dest) + &suffix;
     }