tegakituesday/tegakituesday.com
tegakituesday/tegakituesday.com
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Show formatted challenge content text

Browse source
This commit is contained in:
Elnu 2023-07-01 13:21:55 -07:00
parent 0620607c6d
commit e54ce5b52e
4 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/models/challenge.rs
View file

@ -1,13 +1,15 @@
use core::panic;
use std::str::FromStr;
use comrak::format_html;
use serde::{Deserialize, Deserializer, Serialize};
use serde_yaml::Value;
use crate::{prelude::*};
use crate::{prelude::*, utils::furigana_to_html};
#[derive(Serialize, Deserialize)]
pub struct Challenge {
pub text: Option<String>,
pub japanese: Option<Vec<Vec<Vec<ChallengeWord>>>>,
pub english: Option<Vec<String>>,
pub song: Option<Song>,
@ -29,10 +31,11 @@ impl Challenge {
options
};
let arena = Arena::new();
let challenge_text = fs::read_to_string(format!("content/challenges/{number}.md"))
.expect("Couldn't find challenge file");
let root = parse_document(
&arena,
& (fs::read_to_string(format!("content/challenges/{number}.md"))
.expect("Couldn't find challenge file")
&(challenge_text.clone()
// comrak can't find frontmatter if there's only frontmatter and no newline at end
// TODO: Open issue in comrak
+ "\n"),
@ -45,7 +48,13 @@ impl Challenge {
let lines: Vec<&str> = frontmatter.trim().lines().collect();
lines[1..lines.len() - 1].join("\n")
};
let challenge: Challenge = serde_yaml::from_str(&frontmatter).unwrap();
let mut challenge: Challenge = serde_yaml::from_str(&frontmatter).unwrap();
//challenge.text = Some(challenge_text.replace(&frontmatter, "").trim().to_owned());
let mut html = vec![];
format_html(root, &ComrakOptions::default(), &mut html)
.expect("Failed to format HTML");
challenge.text = Some(furigana_to_html(&gh_emoji::Replacer::new()
.replace_all(&String::from_utf8(html).unwrap())));
challenge
} else {
panic!("No frontmatter!")