X-Git-Url: https://git.r.bdr.sh/rbdr/page/blobdiff_plain/0e3bcda2ce1ba4bff5d457e48a82db6e6289aad6..9e6d4cf2e3feb2a9e526c36139257bae1252f344:/src/gemini_parser.rs diff --git a/src/gemini_parser.rs b/src/gemini_parser.rs index d0715f1..a7c752e 100644 --- a/src/gemini_parser.rs +++ b/src/gemini_parser.rs @@ -1,13 +1,15 @@ -pub fn parse(source: &str) -> String { + pub fn parse(source: &str) -> String { let lines = source.split("\n"); let mut is_preformatted = false; - let mut html:String = "".to_owned(); + let mut block_label: Option = None; + let mut html: String = "".to_owned(); let mut current_line_type: Option = None; + let mut heading_stack: Vec = Vec::new(); for line in lines { - let mut line_type = LineType::Text; + let mut line_type = LineType::Blank; if line.char_indices().count() > 2 { let mut end = line.len(); if line.char_indices().count() > 3 { @@ -16,7 +18,14 @@ pub fn parse(source: &str) -> String { line_type = identify_line(&line[..end], is_preformatted); } match line_type { - LineType::PreformattedToggle => is_preformatted = !is_preformatted, + LineType::PreformattedToggle => { + is_preformatted = !is_preformatted; + if is_preformatted && line.char_indices().count() > 3 { + block_label = Some(get_partial_line_content(&line_type, line)); + } else { + block_label = None; + } + }, _ => { // Close previous block if needed if let Some(line) = ¤t_line_type { @@ -29,17 +38,17 @@ pub fn parse(source: &str) -> String { if is_block(&line_type) { if let Some(line) = ¤t_line_type { if line != &line_type { - html.push_str(get_line_opener(&line_type)); + html.push_str(&get_line_opener(&line_type, block_label.as_ref())); } } else { - html.push_str(get_line_opener(&line_type)); + html.push_str(&get_line_opener(&line_type, None)); } let line_content = get_partial_line_content(&line_type, line); html.push_str(&line_content); } else { - let line_content = get_full_line_content(&line_type, line); - html.push_str(&line_content); + html.push_str(&get_heading_wrapper(&mut heading_stack, &line_type)); + html.push_str(&get_full_line_content(&line_type, line)); } current_line_type = Some(line_type); }, @@ -50,31 +59,33 @@ pub fn parse(source: &str) -> String { html.push_str(get_line_closer(line)); } } + html.push_str(&close_heading_wrapper(&mut heading_stack)); html } fn is_block(line_type: &LineType) -> bool { return match line_type { - LineType::PreformattedText => true, - LineType::ListItem => true, - LineType::Quote => true, + LineType::PreformattedText | LineType::ListItem | LineType::Quote => true, _ => false, } } fn get_partial_line_content(line_type: &LineType, line: &str) -> String { + let encoded_line = line.replace("<", "<").replace(">", ">"); return match line_type { - LineType::ListItem => format!("
  • {}
  • ", line[2..].trim()), - LineType::Quote => line[1..].trim().to_string(), - LineType::PreformattedText => format!("{}\n", line), + LineType::ListItem => format!("
  • {}
  • ", encoded_line[2..].trim()), + LineType::Quote => encoded_line[1..].trim().to_string(), + LineType::PreformattedText => format!("{}\n", encoded_line), + LineType::PreformattedToggle => encoded_line[3..].trim().to_string(), _ => "".to_string(), } } fn get_full_line_content(line_type: &LineType, line: &str) -> String { + let encoded_line = line.replace("<", "<").replace(">", ">"); match line_type { - LineType::Text => format!("

    {}

    \n", line.trim()), - LineType::Blank => "
    \n".to_string(), + LineType::Text => format!("

    {}

    \n", encoded_line.trim()), + LineType::Blank => "
    \n".to_string(), LineType::Link => { let url = get_link_address(line); if url.starts_with("gemini:") { @@ -83,19 +94,64 @@ fn get_full_line_content(line_type: &LineType, line: &str) -> String { format!("
    {}
    \n", url.replace(".gmi", ".html"), get_link_content(line)) } }, - LineType::Heading1 => format!("

    {}

    \n", line[1..].trim()), - LineType::Heading2 => format!("

    {}

    \n", line[2..].trim()), - LineType::Heading3 => format!("

    {}

    \n", line[3..].trim()), + LineType::Heading1 => format!("

    {}

    \n", encoded_line[1..].trim()), + LineType::Heading2 => format!("

    {}

    \n", encoded_line[2..].trim()), + LineType::Heading3 => format!("

    {}

    \n", encoded_line[3..].trim()), _ => "".to_string(), } } -fn get_line_opener(line_type: &LineType) -> &'static str { +fn get_heading_wrapper(heading_stack: &mut Vec, line_type: &LineType) -> String { + let mut string = String::new(); + let current_heading: u8 = match line_type { + LineType::Heading1 => 1, + LineType::Heading2 => 2, + LineType::Heading3 => 3, + _ => 255 + }; + + if current_heading < 255 { + while let Some(open_heading) = heading_stack.pop() { + // You just encountered a more important heading. + // Put it back. Desist. + if open_heading < current_heading { + heading_stack.push(open_heading); + break; + } + + string.push_str(""); + + if open_heading == current_heading { + break; + } + } + heading_stack.push(current_heading); + string.push_str(&format!("
    ", current_heading)); + } + + return string; +} + +fn close_heading_wrapper(heading_stack: &mut Vec) -> String { + let mut string = String::new(); + while let Some(_open_heading) = heading_stack.pop() { + string.push_str("
    "); + } + return string; +} + +fn get_line_opener(line_type: &LineType, block_label: Option<&String>) -> String { match line_type { - LineType::ListItem => "
      ", - LineType::Quote => "
      ", - LineType::PreformattedText => "
      ",
      -        _ => "",
      +        LineType::ListItem => "
        ".to_string(), + LineType::Quote => "
        ".to_string(), + LineType::PreformattedText => { + if let Some(label) = &block_label { + return format!("
        ", label);
        +            } else {
        +                return "
        ".to_string();
        +            }
        +        },
        +        _ => "".to_string(),
             }
         }