slonk/bingus-blog
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix html, css and markdown post listing

Browse source
This commit is contained in:
slonkazoid 2025-01-29 18:00:57 +03:00
parent 9b482858f4
commit 10a05dad15
Signed by: slonk
SSH key fingerprint: SHA256:tbZfJX4IOvZ0LGWOWu5Ijo8jfMPi78TU7x1VoEeCIjM
4 changed files with 58 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
src/post/markdown_posts.rs
View file

@ -19,7 +19,7 @@ use serde::Deserialize;
use serde_value::Value; use serde_value::Value;
use tokio::fs; use tokio::fs;
use tokio::io::AsyncReadExt; use tokio::io::AsyncReadExt;
use tracing::{info, instrument, warn}; use tracing::{error, info, instrument};
use crate::config::MarkdownConfig; use crate::config::MarkdownConfig;
use crate::markdown_render::{build_syntect, render}; use crate::markdown_render::{build_syntect, render};
@ -168,27 +168,36 @@ where
let mut read_dir = fs::read_dir(&self.config.load().root).await?; let mut read_dir = fs::read_dir(&self.config.load().root).await?;
while let Some(entry) = read_dir.next_entry().await? { while let Some(entry) = read_dir.next_entry().await? {
let path = entry.path(); if let Err(err) = async {
let stat = fs::metadata(&path).await?; let path = entry.path();
let stat = fs::metadata(&path).await?;
if stat.is_file() && path.extension().is_some_and(|ext| ext == "md") { if stat.is_file() && path.extension().is_some_and(|ext| ext == "md") {
let name = path let name = path
.clone() .clone()
.file_stem() .file_stem()
.unwrap() .unwrap()
.to_string_lossy() .to_string_lossy()
.to_string() .to_string()
.into(); .into();
let post = self.get_post(Arc::clone(&name), query).await?; let post = self.get_post(Arc::clone(&name), query).await?;
if let ReturnedPost::Rendered { if let ReturnedPost::Rendered {
meta, body, perf, .. meta, body, perf, ..
} = post } = post
&& meta.apply_filters(filters) && meta.apply_filters(filters)
{ {
posts.push((meta, body, perf)); posts.push((meta, body, perf));
}
} }
color_eyre::eyre::Ok(())
} }
.await
{
error!("error while getting post: {err}");
continue;
};
} }
Ok(posts) Ok(posts)
@ -203,39 +212,37 @@ where
let mut read_dir = fs::read_dir(&self.config.load().root).await?; let mut read_dir = fs::read_dir(&self.config.load().root).await?;
while let Some(entry) = read_dir.next_entry().await? { while let Some(entry) = read_dir.next_entry().await? {
let path = entry.path(); if let Err(err) = async {
let stat = fs::metadata(&path).await?; let path = entry.path();
let stat = fs::metadata(&path).await?;
if stat.is_file() && path.extension().is_some_and(|ext| ext == "md") { if stat.is_file() && path.extension().is_some_and(|ext| ext == "md") {
let mtime = as_secs(stat.modified()?); let mtime = as_secs(stat.modified()?);
let name: Arc<str> = let name: Arc<str> =
String::from(path.file_stem().unwrap().to_string_lossy()).into(); String::from(path.file_stem().unwrap().to_string_lossy()).into();
if let Some(cache) = &self.cache if let Some(cache) = &self.cache
&& let Some(hit) = cache && let Some(hit) = cache
.lookup_metadata(name.clone(), mtime, self.render_hash) .lookup_metadata(name.clone(), mtime, self.render_hash)
.await .await
&& hit.apply_filters(filters) && hit.apply_filters(filters)
{ {
posts.push(hit); posts.push(hit);
} else { } else {
match self.parse_and_render(name, path).await { let (metadata, ..) = self.parse_and_render(name, path).await?;
Ok((metadata, ..)) => { if metadata.apply_filters(filters) {
if metadata.apply_filters(filters) { posts.push(metadata);
posts.push(metadata);
}
} }
Err(err) => match err {
PostError::IoError(ref io_err)
if matches!(io_err.kind(), io::ErrorKind::NotFound) =>
{
warn!("TOCTOU: {}", err)
}
_ => return Err(err),
},
} }
} }
color_eyre::eyre::Ok(())
} }
.await
{
error!("error while getting post metadata: {err}");
continue;
};
} }
Ok(posts) Ok(posts)

2
templates/index.hbs
View file

@ -1,3 +1,4 @@
<!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
@ -11,6 +12,7 @@
{{/if}} {{/if}}
<title>{{style.title}}</title> <title>{{style.title}}</title>
<link rel="stylesheet" href="/static/style.css" /> <link rel="stylesheet" href="/static/style.css" />
<link rel="stylesheet" href="/static/custom/style.css" />
{{#if rss}} {{#if rss}}
<link rel="alternate" type="application/rss+xml" title="{{style.title}}" href="/feed.xml" /> <link rel="alternate" type="application/rss+xml" title="{{style.title}}" href="/feed.xml" />
{{/if}} {{/if}}

3
templates/post.hbs
View file

@ -1,3 +1,4 @@
<!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
@ -33,7 +34,7 @@
<script src="/static/main.js" defer></script> <script src="/static/main.js" defer></script>
{{/if}} {{/if}}
</head> </head>
<body> <body class="cool">
<main> <main>
<h1 class="post-title"> <h1 class="post-title">
{{meta.title}} {{meta.title}}

2
templates/posts.hbs
View file

@ -1,9 +1,11 @@
<!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>{{title}}</title> <title>{{title}}</title>
<link rel="stylesheet" href="/static/style.css" /> <link rel="stylesheet" href="/static/style.css" />
<link rel="stylesheet" href="/static/custom/style.css" />
{{#if rss}} {{#if rss}}
<link rel="alternate" type="application/rss+xml" title="{{style.title}}" href="/feed.xml" /> <link rel="alternate" type="application/rss+xml" title="{{style.title}}" href="/feed.xml" />
{{/if}} {{/if}}