From 18f53568b43380665686dc9e7785790f9921ce8f Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 29 Aug 2022 16:10:49 +0200 Subject: a --- tools/src/main.rs | 57 ++++++++++++++++++++++++++++++++++++++++++++++++--- tools/src/markdown.rs | 54 ------------------------------------------------ 2 files changed, 54 insertions(+), 57 deletions(-) delete mode 100644 tools/src/markdown.rs (limited to 'tools/src') diff --git a/tools/src/main.rs b/tools/src/main.rs index 396d148..3f3c065 100644 --- a/tools/src/main.rs +++ b/tools/src/main.rs @@ -1,11 +1,11 @@ - use std::{ fs::{read_to_string, File}, io::Write, }; use clap::{Parser, Subcommand}; -use laby::{html, internal::Buffer, Render}; +use laby::{html, internal::Buffer, raw, Render}; +use markdown::{Block, Span}; #[derive(Parser)] struct Args { @@ -45,6 +45,57 @@ fn scaffold(title: String, body: impl Render) -> impl Render { html!(head!(title!(title)), body!(body)) } -fn article(md_source: String) { +fn article(md_source: String) -> impl Render { + scaffold( + "blub".to_string(), + raw!(blocks_to_html(markdown::tokenize(&md_source))), + ) +} + +fn span_to_html(ss: Vec) -> String { + let mut out = String::new(); + for s in ss { + out += match s { + Span::Break => format!("
"), + Span::Text(t) => escape(&t), + Span::Code(c) => format!("
{}
", escape(&c)), + Span::Link(text, url, _) => { + format!("{}", escape(&url), escape(&text)) + } + Span::Image(_, _, _) => todo!(), + Span::Emphasis(c) => format!("{}", span_to_html(c)), + Span::Strong(c) => format!("{}", span_to_html(c)), + } + .as_str() + } + out +} +fn blocks_to_html(blocks: Vec) -> String { + let mut out = String::new(); + for e in blocks { + out += match e { + markdown::Block::Header(text, level) => { + format!("{}", span_to_html(text)) + } + markdown::Block::Paragraph(p) => span_to_html(p), + markdown::Block::Blockquote(q) => format!("{}", blocks_to_html(q)), + markdown::Block::CodeBlock(_syntax, content) => { + format!("
{}
", escape(&content)) // TODO syntax highlighting + } + markdown::Block::OrderedList(_, _) => todo!(), + markdown::Block::UnorderedList(_) => todo!(), + markdown::Block::Raw(r) => r, + markdown::Block::Hr => format!("
"), + } + .as_str(); + } + out +} +fn escape(text: &str) -> String { + text.replace("&", "&") + .replace("<", "<") + .replace(">", ">") + .replace("'", "’") + .replace("\"", """) } diff --git a/tools/src/markdown.rs b/tools/src/markdown.rs deleted file mode 100644 index af3798e..0000000 --- a/tools/src/markdown.rs +++ /dev/null @@ -1,54 +0,0 @@ -pub struct Markdown(Vec); - -pub enum MdElement { - Heading(u8, Vec), - Paragraph(Vec), - Code { syntax: String, content: String }, -} - -pub enum RichText { - Text(String), - Bold(Box), - Strike(Box), - Italic(Box), - Code(Box), - Link(String, Vec), -} - -impl Markdown { - pub fn parse(s: &str) -> anyhow::Result { - let mut c = vec![]; - let mut lines = s.lines(); - while let Some(line) = lines.next() { - if line.starts_with("#") { - let (hashes, h) = line.split_once(' ').unwrap(); - c.push(MdElement::Heading(hashes.len() as u8, RichText::parse(h)?)); - } else if line.starts_with("```") { - todo!() - } else { - let mut block = line.to_string(); - while let Some(line) = lines.next() { - if line == "" { - break; - } - block += line; - } - c.push(MdElement::Paragraph(RichText::parse(&block)?)) - } - } - Ok(Markdown(c)) - } -} -impl RichText { - pub fn parse(s: &str) -> anyhow::Result> { - let mut before = String::new(); - let mut after = String::new(); - let mut after_el = false; - for c in s.chars() { - match c { - _ => {} - } - } - Ok(segs) - } -} -- cgit v1.2.3-70-g09d2