-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Adding Frontmatter Reader: Support summary card (OG. Twitter) #2321
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.
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
sspaeti
wants to merge
4
commits into
rust-lang:master
Choose a base branch
from
sspaeti:adding_frontmatter
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,6 +19,23 @@ use once_cell::sync::Lazy; | |
use regex::{Captures, Regex}; | ||
use serde_json::json; | ||
|
||
use gray_matter::engine::YAML; | ||
use gray_matter::Matter; | ||
use serde::Deserialize; | ||
|
||
fn extract_frontmatter(content: &str) -> Option<&str> { | ||
let start = content.find("---")? + 3; // Find the end of the first `---` + 3 to move past it | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Given that |
||
let end = content[start..].find("---")? + start; // Find the start of the closing `---` | ||
Some(&content[start..end].trim()) | ||
} | ||
|
||
#[derive(Deserialize, Debug)] | ||
struct FrontMatter { | ||
title: String, | ||
description: String, | ||
featured_image_url: String, | ||
} | ||
|
||
#[derive(Default)] | ||
pub struct HtmlHandlebars; | ||
|
||
|
@@ -54,7 +71,45 @@ impl HtmlHandlebars { | |
.insert("git_repository_edit_url".to_owned(), json!(edit_url)); | ||
} | ||
|
||
let content = utils::render_markdown(&ch.content, ctx.html_config.curly_quotes); | ||
// Parse frontmatter and prepare content | ||
let matter = Matter::<YAML>::new(); | ||
let parsed = matter.parse(&ch.content); | ||
let (content, new_content) = if let Some(data) = parsed.data { | ||
debug!("Parsed frontmatter: {:?}", &data); | ||
let yaml_str = extract_frontmatter(&ch.content).unwrap_or_default(); | ||
let front_matter_result: Result<FrontMatter, serde_yaml::Error> = | ||
serde_yaml::from_str(yaml_str); | ||
// let front_matter_result: Result<FrontMatter, serde_yaml::Error> = serde_yaml::from_str(&ch.content); | ||
match front_matter_result { | ||
Ok(front_matter) => { | ||
ctx.data.insert("is_frontmatter".to_owned(), json!("true")); | ||
ctx.data | ||
.insert("og_title".to_owned(), json!(front_matter.title)); | ||
ctx.data | ||
.insert("og_description".to_owned(), json!(front_matter.description)); | ||
ctx.data.insert( | ||
"og_image_url".to_owned(), | ||
json!(front_matter.featured_image_url), | ||
); | ||
} | ||
Err(e) => { | ||
eprintln!("Frontmatter: Deserialization error: {:?}", e); | ||
} | ||
} | ||
|
||
// Prepare new content without frontmatter for rendering | ||
let new_content = parsed.content.trim_start(); | ||
( | ||
utils::render_markdown(&new_content, ctx.html_config.curly_quotes), | ||
Some(new_content), | ||
) | ||
} else { | ||
// No frontmatter, use original content | ||
( | ||
utils::render_markdown(&ch.content, ctx.html_config.curly_quotes), | ||
None, | ||
) | ||
}; | ||
|
||
let fixed_content = | ||
utils::render_markdown_with_path(&ch.content, ctx.html_config.curly_quotes, Some(path)); | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
serde_yaml
was deprecated recently, please useserde_yml