mirror of
https://github.com/sbrow/thor.git
synced 2026-08-26 11:23:32 -04:00
refactor: Created Open_Graph struct for og data.
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
- [ ] Content-hash fingerprinting for CSS and JS cache busting
|
||||
- [ ] Clean up the default layouts
|
||||
- [ ] Memory
|
||||
- [ ] Not sure whether to use temp allocator or site_allocator in opengraph.odin.
|
||||
- [ ] Performance
|
||||
- [ ] See if we can disable bounds checks in `write_indented` and elsewhere.
|
||||
- [ ] Instead of loading the site fresh each time in watch mode, create a
|
||||
|
||||
+5
-5
@@ -7,18 +7,16 @@ Open_Graph :: struct {
|
||||
type: string,
|
||||
image: string,
|
||||
url: string,
|
||||
|
||||
description: string,
|
||||
locale: string,
|
||||
site_name: string,
|
||||
|
||||
is_article: bool,
|
||||
published_time: string,
|
||||
modified_time: string,
|
||||
section: string,
|
||||
}
|
||||
|
||||
og_init :: proc(site: ^Site) -> Open_Graph {
|
||||
og_init :: proc(site: Site) -> Open_Graph {
|
||||
return {
|
||||
site_name = site.title,
|
||||
description = site.description,
|
||||
@@ -27,14 +25,16 @@ og_init :: proc(site: ^Site) -> Open_Graph {
|
||||
}
|
||||
}
|
||||
|
||||
og_for_page :: proc(site: ^Site, page: Page, base: Open_Graph) -> Open_Graph {
|
||||
og_for_page :: proc(site: Site, page: Page, base: Open_Graph) -> Open_Graph {
|
||||
og := base
|
||||
is_article := page.section != ""
|
||||
og.url = fmt.tprintf("%s%s", site.base_url, page.permalink)
|
||||
og.title = strip_html_tags(page.title)
|
||||
og.title = strip_html_tags(page.title, context.temp_allocator)
|
||||
og.type = "article" if is_article else "website"
|
||||
og.is_article = is_article
|
||||
og.section = page.section
|
||||
og.published_time = page.date
|
||||
|
||||
return og
|
||||
}
|
||||
|
||||
|
||||
+5
-15
@@ -60,8 +60,8 @@ build_page_context :: proc(page: Page) -> Page_Context {
|
||||
}
|
||||
}
|
||||
|
||||
strip_html_tags :: proc(s: string) -> string {
|
||||
sb := strings.builder_make()
|
||||
strip_html_tags :: proc(s: string, allocator := context.allocator) -> string {
|
||||
sb := strings.builder_make(allocator)
|
||||
defer strings.builder_destroy(&sb)
|
||||
|
||||
in_tag := false
|
||||
@@ -117,7 +117,7 @@ get_template :: proc(
|
||||
chain[n] = "base"; n += 1
|
||||
}
|
||||
|
||||
for i in 0..<n {
|
||||
for i in 0 ..< n {
|
||||
candidate := chain[i]
|
||||
if cached, ok := cache[candidate]; ok {
|
||||
return cached
|
||||
@@ -179,12 +179,7 @@ render_site :: proc(site: ^Site) {
|
||||
now = now,
|
||||
author = site.author,
|
||||
params = site.params,
|
||||
og = {
|
||||
site_name = site.title,
|
||||
description = site.description,
|
||||
image = fmt.tprintf("%s/avatar.jpg", site.base_url),
|
||||
locale = "en_US",
|
||||
},
|
||||
og = og_init(site^),
|
||||
}
|
||||
|
||||
// Find home page
|
||||
@@ -297,12 +292,7 @@ render_page_html :: proc(
|
||||
data.body = page.body_html
|
||||
data.date_iso = page.date
|
||||
data.date_display = format_date(page.date)
|
||||
data.og.url = fmt.tprintf("%s%s", site.base_url, page.permalink)
|
||||
data.og.title = strip_html_tags(page.title)
|
||||
data.og.type = "article" if is_article else "website"
|
||||
data.og.is_article = is_article
|
||||
data.og.section = page.section
|
||||
data.og.published_time = page.date
|
||||
data.og = og_for_page(site^, page, base.og)
|
||||
return render_template(content_tpl, data, partials)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user