Merge branch 'personal' into remove-comments

Author: Thompson-Jason

src/main.rs

@@ -84,6 +84,11 @@ struct Opts {
         default = "keep-unchanged"
     )]
     comment_strategy: CommentStrategy,
+        help = "Remove automatic-table-of-contents objects",
+        default = "false"
+    )]
+    remove_table_of_contents: bool,
+
 }
 
 fn frontmatter_strategy_from_str(input: &str) -> Result<FrontmatterStrategy> {
@@ -133,6 +138,11 @@ fn main() {
         exporter.add_postprocessor(&softbreaks_to_hardbreaks);
     }
 
+
+    if args.remove_table_of_contents {
+        exporter.add_postprocessor(&remove_toc);
+    }
+
     if matches!(args.comment_strategy, CommentStrategy::Remove) {
         exporter.add_postprocessor(&remove_obsidian_comments);
     }

src/postprocessors.rs

@@ -1,10 +1,10 @@
 //! A collection of officially maintained [postprocessors][crate::Postprocessor].
 
 use std::cell::LazyCell;
-
-use pulldown_cmark::{CowStr, Event, Tag};
+use pulldown_cmark::{CodeBlockKind, CowStr, Event, Tag};
 use regex::Regex;
 use serde_yaml::Value;
+use std::string::String;
 
 use super::{Context, MarkdownEvents, PostprocessorResult};
 
@@ -55,6 +55,36 @@ fn filter_by_tags_(
     }
 }
 
+pub fn remove_toc(_context: &mut Context, events: &mut MarkdownEvents) -> PostprocessorResult {
+    let mut output = Vec::with_capacity(events.len());
+
+    for event in &mut *events {
+        output.push(event.to_owned());
+        match event {
+            Event::Start(Tag::CodeBlock(CodeBlockKind::Fenced(ref language_tag))) => {
+                if language_tag == &CowStr::from("toc")
+                    || language_tag == &CowStr::from("table-of-contents")
+                {
+                    output.pop(); // Remove codeblock start tag that was pushed onto output
+                }
+            }
+            Event::End(Tag::CodeBlock(CodeBlockKind::Fenced(ref language_tag))) => {
+                if language_tag == &CowStr::from("toc")
+                    || language_tag == &CowStr::from("table-of-contents")
+                {
+                    // The corresponding codeblock start tag for this is replaced with regular
+                    // text (containing the Hugo shortcode), so we must also pop this end tag.
+                    output.pop();
+                }
+            }
+            _ => {}
+        }
+    }
+    eprintln!("OUTPUT ---- {:?}", output);
+    *events = output;
+    PostprocessorResult::Continue
+}
+
 //Available strategies for what to do with comments
 #[derive(Debug)]
 #[non_exhaustive]

tests/postprocessors_test.rs

@@ -1,3 +1,10 @@
+
+use obsidian_export::postprocessors::{
+    filter_by_tags, remove_obsidian_comments, softbreaks_to_hardbreaks,
+};
+use pretty_assertions::assert_eq;
+use pulldown_cmark::{CowStr, Event};
+use serde_yaml::Value;
 use std::collections::HashSet;
 use std::fs::{read_to_string, remove_file};
 use std::path::PathBuf;

tests/testdata/expected/remove-comments/test-comments.md

@@ -0,0 +1,6 @@
+Not a comment
+
+
+````md
+%% Comment in code block should be kept %%
+````

tests/testdata/input/remove-comments/test-comments.md

@@ -0,0 +1,11 @@
+Not a comment
+%% Comment should be removed %%
+```md
+%% Comment in code block should be kept %%
+```
+
+%%
+This is
+a block comment
+that should be removed
+%%