Skip to content

Require frontmatter, throw error message otherwise #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Require frontmatter, throw error message otherwise #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified docs/modules/bartholomew.wasm
View file
Open in desktop
Binary file not shown.
16 changes: 10 additions & 6 deletions src/content.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,13 +394,17 @@ impl FromStr for Content {
// This is a heavy-handed way of normalizing the document to only use "\n"
// for line endings. This simplifies a number of things, including Rhai scripting.
let doc = full_document.replace("\r\n", "\n");
let (toml_text, body) = doc
.split_once(DOC_SEPARATOR)
.unwrap_or(("title = 'Untitled'", &doc));
let head: Head =
toml::from_str(toml_text).map_err(|e| anyhow::anyhow!("TOML parsing error: {}", e))?;
let parsed_doc = doc.split_once(DOC_SEPARATOR);

Ok(Content::new(head, body.to_owned()))
if let Some(val) = parsed_doc {
let (toml_text, body) = val;
let head: Head = toml::from_str(toml_text)
.map_err(|e| anyhow::anyhow!("TOML parsing error: {}", e))?;
return Ok(Content::new(head, body.to_owned()));
}
Err(anyhow::anyhow!(
"Frontmatter is required. Separate frontmatter from content using \"---\""
))
}
}

Expand Down