add note when there are no posts

Reviewed-on: heavyweaponsgal/jae-blog#1

.gitignore

@@ -3,5 +3,5 @@
 /media/*
 /posts/*
 !/posts/README.md
-/cache
+/.slbg-cache
 /config.toml

BUILDING.md

@@ -1,51 +0,0 @@
-# Building bingus-blog
-
-this guide assumes you have git and are on linux.  
-at the moment, compiling on windows is supported, but not _for windows_.
-
-1. first, acquire _rust nightly_.  
-   the recommended method is to install [rustup](https://rustup.rs/),
-   and use that to get _rust nightly_. choose "customize installation",
-   and set "default toolchain" to nightly to save time later, provided
-   you do not need _rust stable_ for something else
-2. start your favorite terminal
-3. then, download the repository: `git clone https://git.slonk.ing/slonk/bingus-blog && cd bingus-blog`
-4. finally, build the application: `cargo +nightly build --release`
-5. your executable is `target/release/bingus-blog`, copy it to your server and
-   you're done!
-
-## Building for another architecture
-
-you can use the `--target` flag in `cargo build` for this purpose.  
-examples are for Arch Linux x86_64.
-
-here's how to compile for `aarch64-unknown-linux-gnu`
-(eg. Oracle CI Free Tier ARM VPS):
-
-```sh
-# install the required packages to compile and link aarch64 binaries
-sudo pacman -S aarch64-linux-gnu-gcc
-cargo +nightly build --release --target=aarch64-unknown-linux-gnu
-```
-
-your executable will be `target/aarch64-unkown-linux-gnu/release/bingus-blog`.
-
----
-
-a more tricky example is building for `aarch64-unknown-linux-musl`
-(eg. a Redmi 5 Plus running postmarketOS):
-
-```sh
-# there is no toolchain for aarch64-unknown-linux-musl,
-# so we have to repurpose the GNU toolchain. this doesn't
-# work out of the box so we have to set some environment variables
-sudo pacman -S aarch64-linux-gnu-gcc
-export CC=aarch64-linux-gnu-gcc
-export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=$CC
-cargo +nightly build --release --target=aarch64-unknown-linux-musl
-# the reason we had to do this is because cargo tries to use
-# the same toolchain as the target's name. but we can tell it to use
-# the GNU one like so.
-```
-
-your executable will be `target/aarch64-unkown-linux-musl/release/bingus-blog`.

CONFIG.md

@@ -1,67 +0,0 @@
-# Configuration
-
-the configuration format, with defaults, is documented below:
-
-```toml
-title = "bingus-blog"  # title of the blog
-# description of the blog
-description = "blazingly fast markdown blog software written in rust memory safe"
-markdown_access = true # allow users to see the raw markdown of a post
-                       # endpoint: /posts/<name>.md
-js_enable = true       # enable javascript (required for sorting and dates)
-
-[style]
-date_format = "RFC3339" # format string used to format dates in the backend
-                       # it's highly recommended to leave this as default,
-                       # so the date can be formatted by the browser.
-                       # format: https://docs.rs/chrono/latest/chrono/format/strftime/index.html#specifiers
-default_sort = "date"  # default sorting method ("date" or "name")
-#default_color = "#f5c2e7" # default embed color, optional
-
-[style.display_dates]
-creation = true        # display creation ("written") dates
-modification = true    # display modified ("last modified") dates
-
-[rss]
-enable = false         # serve an rss field under /feed.xml
-                       # this may be a bit resource intensive
-link = "https://..."   # public url of the blog, required if rss is enabled
-
-[dirs]
-posts = "posts"        # where posts are stored
-media = "media"        # directory served under /media/
-custom_templates = "templates" # custom templates dir
-custom_static = "static"       # custom static dir
-                       # see CUSTOM.md for documentation
-[http]
-host = "0.0.0.0"       # ip to listen on
-port = 3000            # port to listen on
-
-[cache]
-enable = true          # save metadata and rendered posts into RAM
-                       # highly recommended, only turn off if absolutely necessary
-cleanup = true         # clean cache, highly recommended
-#cleanup_interval = 86400000 # clean the cache regularly instead of just at startup
-                       # uncomment to enable
-persistence = true     # save the cache to on shutdown and load on startup
-file = "cache"         # file to save the cache to
-compress = true        # compress the cache file
-compression_level = 3  # zstd compression level, 3 is recommended
-
-[render]
-syntect.load_defaults = false      # include default syntect themes
-syntect.themes_dir = "themes"      # directory to include themes from
-syntect.theme = "Catppuccin Mocha" # theme file name (without `.tmTheme`)
-```
-
-configuration is done in [TOML](https://toml.io/)  
-if an option marked "optional" is not set, it will not be initialized with
-a default value  
-you don't have to copy the whole thing from here,  
-it's generated by the program if it doesn't exist
-
-## Specifying the configuration file
-
-the configuration file is loaded from `config.toml` by default, but the path
-can be overriden by setting the environment variable `BINGUS_BLOG_CONFIG`,
-which will make bingus-blog try to read that file or fail and exit.

CUSTOM.md

@@ -1,49 +0,0 @@
-# Custom Content
-
-bingus-blog supports loading custom content such as templates and static files
-at runtime from custom locations.
-
-the configuration options `dirs.custom_templates` and `dirs.custom_static`
-allow you to set where these files are loaded from.
-
-customizing the error page, other than CSS, is not supported at this time.
-
-## Custom Templates
-
-custom templates are written in
-[Handlebars (the rust variant)](https://crates.io/crates/handlebars).
-
-the *custom templates directory* has a non-recursive structure:
-
-```md
-./
-  - index.html # ignored
-  - index.hbs # loaded as `index`
-  - post.hbs # loaded as `post`
-  - [NAME].hbs # loaded as `[NAME]`
-  - ...
-```
-
-templates will be loaded from first, the executable, then, the custom
-templates path, overriding the defaults.
-
-template changes are also processed after startup, any changed template will be
-compiled and will replace the existing template in the registry, or add a
-new one (though that does nothing).  
-if a template is deleted, the default template will be recompiled into
-it's place.  
-note that the watcher only works if the *custom templates directory* existed
-at startup. if you delete/create the directory, you must restart the program.
-
-## Custom Static Files
-
-GET requests to `/static` will first be checked against `dirs.custom_static`.
-if the file is not found in the *custom static directory*, bingus-blog will try
-to serve it from the directory embedded in the executable. this means you can
-add whatever you want in the *custom static directory* and it will be served
-under `/static`.
-
-## Custom Media
-
-the endpoint `/media` is served from `dirs.media`. no other logic or mechanism
-is present.

Cargo.toml

@@ -36,16 +36,10 @@ comrak = { version = "0.22.0", features = [
   "syntect",
 ], default-features = false }
 console-subscriber = { version = "0.2.0", optional = true }
-derive_more = "0.99.17"
 fronma = "0.2.0"
-handlebars = "6.0.0"
-include_dir = "0.7.4"
-mime_guess = "2.0.5"
-notify-debouncer-full = { version = "0.3.1", default-features = false }
 rss = "2.0.7"
 scc = { version = "2.1.0", features = ["serde"] }
 serde = { version = "1.0.197", features = ["derive"] }
-serde_json = { version = "1.0.124", features = ["preserve_order"] }
 syntect = "5.2.0"
 thiserror = "1.0.58"
 tokio = { version = "1.37.0", features = [
@@ -56,7 +50,6 @@ tokio = { version = "1.37.0", features = [
 ] }
 tokio-util = { version = "0.7.10", default-features = false }
 toml = "0.8.12"
-tower = "0.4.13"
 tower-http = { version = "0.5.2", features = [
   "compression-gzip",
   "fs",

README.md

@@ -1,7 +1,7 @@
 ---
-title: README
+title: "README"
-description: the README.md file of this project
+description: "the README.md file of this project"
-author: slonkazoid
+author: "slonkazoid"
 created_at: 2024-04-18T04:15:26+03:00
 ---
 
@@ -9,39 +9,70 @@ created_at: 2024-04-18T04:15:26+03:00
 
 blazingly fast markdown blog software written in rust memory safe
 
-for bingus-blog viewers: [see original document](https://git.slonk.ing/slonk/bingus-blog)
-
-## Features
-
-- posts are written in markdwon and loaded at runtime, meaning you
-  can write posts from anywhere and sync it with the server without headache
-- RSS is supported
-- the look of the blog is extremely customizable, with support for
-  [custom drop-ins](CUSTOM.md) for both templates and static content
-- really easy to deploy (the server is one executable file)
-- blazingly fast
-
 ## TODO
 
-- [ ] blog thumbnail and favicon
+- [x] RSS
-- [ ] sort asc/desc
+- [x] finish writing this document
+- [x] document config
 - [ ] extend syntect options
-- [ ] ^ fix syntect mutex poisoning
+- [ ] general cleanup of code
 - [ ] better error reporting and error pages
 - [ ] better tracing
-- [ ] replace HashMap with HashCache once i implement [this](https://github.com/wvwwvwwv/scalable-concurrent-containers/issues/139)
+- [x] cache cleanup task
+- [ ] ^ replace HashMap with HashCache once i implement [this](https://github.com/wvwwvwwv/scalable-concurrent-containers/issues/139)
+- [x] (de)compress cache with zstd on startup/shutdown
 - [ ] make date parsing less strict
+- [ ] make date formatting better
+- [ ] date formatting respects user timezone
+- [x] clean up imports and require less features
 - [ ] improve home page
+- [x] tags
 - [ ] multi-language support
-- [ ] add credits
 - [x] be blazingly fast
 - [x] 100+ MiB binary size
 
 ## Configuration
 
-see [CONFIG.md](CONFIG.md)
+the default configuration with comments looks like this
 
-## Building
+```toml
+title = "bingus-blog"  # title of the website
+description = "blazingly fast markdown blog software written in rust memory safe" # description of the website
+raw_access = true      # allow users to see the raw markdown of a post
+
+[rss]
+enable = false         # serve an rss field under /feed.xml
+                       # this may be a bit resource intensive
+link = "https://..."   # public url of the blog, required if rss is enabled
+
+[dirs]
+posts = "posts"        # where posts are stored
+media = "media"        # directory served under /media/
+
+[http]
+host = "0.0.0.0"       # ip to listen on
+port = 3000            # port to listen on
+
+[cache]
+enable = true          # save metadata and rendered posts into RAM
+                       # highly recommended, only turn off if absolutely necessary
+cleanup = true         # clean cache, highly recommended
+#cleanup_interval = 86400000 # clean the cache regularly instead of just at startup
+                       # uncomment to enable
+persistence = true     # save the cache to on shutdown and load on startup
+file = "cache"         # file to save the cache to
+compress = true        # compress the cache file
+compression_level = 3  # zstd compression level, 3 is recommended
+
+[render]
+syntect.load_defaults = false      # include default syntect themes
+syntect.themes_dir = "themes"      # directory to include themes from
+syntect.theme = "Catppuccin Mocha" # theme file name (without `.tmTheme`)
+```
+
+you don't have to copy it from here, it's generated if it doesn't exist
+
+## Usage
 
 this project uses nightly-only features.
 make sure you have the nightly toolchain installed.
@@ -54,7 +85,21 @@ cargo +nightly build --release
 
 the executable will be located at `target/release/bingus-blog`.
 
-see [BUILDING.md](BUILDING.md) for more information and detailed instructions.
+### Building for another architecture
+
+you can use the `--target` flag in `cargo build` for this purpose
+
+building for `aarch64-unknown-linux-musl` (for example, a Redmi 5 Plus running postmarketOS):
+
+```sh
+# install the required packages to compile and link aarch64 binaries
+sudo pacman -S aarch64-linux-gnu-gcc
+export CC=aarch64-linux-gnu-gcc
+export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=$CC
+cargo +nightly build --release --target=aarch64-unknown-linux-musl
+```
+
+your executable will be located at `target/<target>/release/bingus-blog` this time.
 
 ## Writing Posts
 
@@ -73,22 +118,15 @@ every post **must** begin with a **valid** front matter. else it wont be listed
 in / & /posts, and when you navigate to it, you will be met with an error page.
 the error page will tell you what the problem is.
 
-full example:
+example:
 
 ```md
 ---
-title: My first post # title of the post
+title: "README"
-description: The first post on this awesome blog! # short description of the post
+description: "the README.md file of this project"
-author: Blubber256 # author of the post
+author: "slonkazoid"
-icon: /media/first-post/icon.png # icon/thumbnail of post used in embeds
+created_at: 2024-04-18T04:15:26+03:00
-icon_alt: Picture of a computer running DOOM
+#modified_at: ... # see above
-color: "#00aacc" # color of post, also used in embeds
-created_at: 2024-04-18T04:15:26+03:00 # date of writing, this is highly
-# recommended if you are on a system which doesnt have btime (like musl),
-# because this is fetched from file stats by default
-#modified_at: ... # see above. this is also fetched from the filesystem
-tags: # tags, or keywords, used in meta and also in the ui
-    - lifestyle
 ---
 ```
 
@@ -107,39 +145,25 @@ standard. examples of valid and invalid dates:
 -                           # everything else is also invalid
 ```
 
-## Non-static Routes
+## Routes
 
 - `GET /`: index page, lists posts
 - `GET /posts`: returns a list of all posts with metadata in JSON format
 - `GET /posts/<name>`: view a post
 - `GET /posts/<name>.md`: view the raw markdown of a post
 - `GET /post/*`: redirects to `/posts/*`
-- `GET /feed.xml`: RSS feed
 
 ## Cache
 
 bingus-blog caches every post retrieved and keeps it permanently in cache.
-there is a toggleable cleanup task that periodically sweeps the cache to
+the only way a cache entry is removed is when it's requested and it does
-remove dead entries, but it can still get quite big.
+not exist in the filesystem. cache entries don't expire, but they get
+invalidated when the mtime of the markdown file changes.
 
-if cache persistence is on, the cache is (compressed &) written to disk on
+if cache persistence is on, the cache is compressed & written on shutdown,
-shutdown, and read (& decompressed) on startup. one may opt to set the cache
+and read & decompressed on startup. one may opt to set the cache location
-location to point to a tmpfs to make it save and load quickly, but not persist
+to point to a tmpfs so it saves and loads really fast, but it doesn't persist
-across reboots at the cost of more RAM usage.
+across boots, also at the cost of even more RAM usage.
 
-in my testing, the compression reduced a 3.21 MB cache to 0.18 MB almost
+the compression reduced a 3.21 MB file cache into 0.18 MB with almost instantly.
-instantly. there is basically no good reason to not have compression on,
+there is basically no good reason to not have compression on.
-unless you have filesystem compression already of course.
-
-## Contributing
-
-make sure your changes don't break firefox, chromium,text-based browsers,
-and webkit support
-
-### Feature Requests
-
-i want this project to be a good and usable piece of software, so i implement
-feature requests provided they fit the project and it's values.
-
-most just ping me on discord with feature requests, but if your request is
-non-trivial, please create an issue [here](https://git.slonk.ing/slonk/bingus-blog/issues).

partials/post_table.hbs

@@ -1,18 +0,0 @@
-<div class="table">
-	{{#if (and (ne this.created_at null) style.display_dates.creation)}}
-		<div class="created">written</div>
-		<div class="created value">{{>span_date dt=this.created_at df=style.date_format}}</div>
-	{{/if}}
-	{{#if (and (ne this.modified_at null) style.display_dates.modification)}}
-		<div class="modified">last modified</div>
-		<div class="modified value">{{>span_date dt=this.modified_at df=style.date_format}}</div>
-	{{/if}}
-	{{#if (gt (len this.tags) 0)}}
-		<div class="tags">tags</div>
-		<div class="tags value">
-			{{#each this.tags}}
-				<a href="/?tag={{this}}" title="view all posts with this tag">{{this}}</a>
-			{{/each}}
-		</div>
-	{{/if}}
-</div>

partials/span_date.hbs

@@ -1 +0,0 @@
-<span class="date {{#if (eq df "RFC3339")}}date-rfc3339{{/if}}">{{date dt df}}</span>

src/app.rs

@@ -1,279 +0,0 @@
-use std::collections::HashMap;
-use std::sync::Arc;
-use std::time::Duration;
-
-use axum::extract::{Path, Query, State};
-use axum::http::header::CONTENT_TYPE;
-use axum::http::Request;
-use axum::response::{IntoResponse, Redirect, Response};
-use axum::routing::get;
-use axum::{Json, Router};
-use handlebars::Handlebars;
-use include_dir::{include_dir, Dir};
-use rss::{Category, ChannelBuilder, ItemBuilder};
-use serde::{Deserialize, Serialize};
-use serde_json::Map;
-use tokio::sync::RwLock;
-use tower::service_fn;
-use tower_http::services::ServeDir;
-use tower_http::trace::TraceLayer;
-use tracing::{info, info_span, Span};
-
-use crate::config::{Config, StyleConfig};
-use crate::error::{AppError, AppResult};
-use crate::post::{MarkdownPosts, PostManager, PostMetadata, RenderStats, ReturnedPost};
-use crate::serve_dir_included::handle;
-
-const STATIC: Dir<'static> = include_dir!("$CARGO_MANIFEST_DIR/static");
-
-#[derive(Clone)]
-#[non_exhaustive]
-pub struct AppState {
-    pub config: Arc<Config>,
-    pub posts: Arc<MarkdownPosts<Arc<Config>>>,
-    pub reg: Arc<RwLock<Handlebars<'static>>>,
-}
-
-#[derive(Serialize)]
-struct IndexTemplate<'a> {
-    title: &'a str,
-    description: &'a str,
-    posts: Vec<PostMetadata>,
-    rss: bool,
-    js: bool,
-    tags: Map<String, serde_json::Value>,
-    joined_tags: String,
-    style: &'a StyleConfig,
-}
-
-#[derive(Serialize)]
-struct PostTemplate<'a> {
-    meta: &'a PostMetadata,
-    rendered: String,
-    rendered_in: RenderStats,
-    markdown_access: bool,
-    js: bool,
-    color: Option<&'a str>,
-    joined_tags: String,
-    style: &'a StyleConfig,
-}
-
-#[derive(Deserialize)]
-struct QueryParams {
-    tag: Option<String>,
-    #[serde(rename = "n")]
-    num_posts: Option<usize>,
-}
-
-fn collect_tags(posts: &Vec<PostMetadata>) -> Map<String, serde_json::Value> {
-    let mut tags = HashMap::new();
-
-    for post in posts {
-        for tag in &post.tags {
-            if let Some((existing_tag, count)) = tags.remove_entry(tag) {
-                tags.insert(existing_tag, count + 1);
-            } else {
-                tags.insert(tag.clone(), 1);
-            }
-        }
-    }
-
-    let mut tags: Vec<(String, u64)> = tags.into_iter().collect();
-
-    tags.sort_unstable_by_key(|(v, _)| v.clone());
-    tags.sort_by_key(|(_, v)| -(*v as i64));
-
-    let mut map = Map::new();
-
-    for tag in tags.into_iter() {
-        map.insert(tag.0, tag.1.into());
-    }
-
-    map
-}
-
-fn join_tags_for_meta(tags: &Map<String, serde_json::Value>, delim: &str) -> String {
-    let mut s = String::new();
-    let tags = tags.keys().enumerate();
-    let len = tags.len();
-    for (i, tag) in tags {
-        s += tag;
-        if i != len - 1 {
-            s += delim;
-        }
-    }
-    s
-}
-
-async fn index<'a>(
-    State(AppState {
-        config, posts, reg, ..
-    }): State<AppState>,
-    Query(query): Query<QueryParams>,
-) -> AppResult<impl IntoResponse> {
-    let posts = posts
-        .get_max_n_post_metadata_with_optional_tag_sorted(query.num_posts, query.tag.as_ref())
-        .await?;
-
-    let tags = collect_tags(&posts);
-    let joined_tags = join_tags_for_meta(&tags, ", ");
-
-    let reg = reg.read().await;
-    let rendered = reg.render(
-        "index",
-        &IndexTemplate {
-            title: &config.title,
-            description: &config.description,
-            posts,
-            rss: config.rss.enable,
-            js: config.js_enable,
-            tags,
-            joined_tags,
-            style: &config.style,
-        },
-    );
-    drop(reg);
-    Ok(([(CONTENT_TYPE, "text/html")], rendered?))
-}
-
-async fn all_posts(
-    State(AppState { posts, .. }): State<AppState>,
-    Query(query): Query<QueryParams>,
-) -> AppResult<Json<Vec<PostMetadata>>> {
-    let posts = posts
-        .get_max_n_post_metadata_with_optional_tag_sorted(query.num_posts, query.tag.as_ref())
-        .await?;
-
-    Ok(Json(posts))
-}
-
-async fn rss(
-    State(AppState { config, posts, .. }): State<AppState>,
-    Query(query): Query<QueryParams>,
-) -> AppResult<Response> {
-    if !config.rss.enable {
-        return Err(AppError::RssDisabled);
-    }
-
-    let posts = posts
-        .get_all_posts(|metadata, _| {
-            !query
-                .tag
-                .as_ref()
-                .is_some_and(|tag| !metadata.tags.contains(tag))
-        })
-        .await?;
-
-    let mut channel = ChannelBuilder::default();
-    channel
-        .title(&config.title)
-        .link(config.rss.link.to_string())
-        .description(&config.description);
-    //TODO: .language()
-
-    for (metadata, content, _) in posts {
-        channel.item(
-            ItemBuilder::default()
-                .title(metadata.title)
-                .description(metadata.description)
-                .author(metadata.author)
-                .categories(
-                    metadata
-                        .tags
-                        .into_iter()
-                        .map(|tag| Category {
-                            name: tag,
-                            domain: None,
-                        })
-                        .collect::<Vec<Category>>(),
-                )
-                .pub_date(metadata.created_at.map(|date| date.to_rfc2822()))
-                .content(content)
-                .link(
-                    config
-                        .rss
-                        .link
-                        .join(&format!("/posts/{}", metadata.name))?
-                        .to_string(),
-                )
-                .build(),
-        );
-    }
-
-    let body = channel.build().to_string();
-    drop(channel);
-
-    Ok(([(CONTENT_TYPE, "text/xml")], body).into_response())
-}
-
-async fn post(
-    State(AppState {
-        config, posts, reg, ..
-    }): State<AppState>,
-    Path(name): Path<String>,
-) -> AppResult<impl IntoResponse> {
-    match posts.get_post(&name).await? {
-        ReturnedPost::Rendered(ref meta, rendered, rendered_in) => {
-            let joined_tags = meta.tags.join(", ");
-
-            let reg = reg.read().await;
-            let rendered = reg.render(
-                "post",
-                &PostTemplate {
-                    meta,
-                    rendered,
-                    rendered_in,
-                    markdown_access: config.markdown_access,
-                    js: config.js_enable,
-                    color: meta
-                        .color
-                        .as_deref()
-                        .or(config.style.default_color.as_deref()),
-                    joined_tags,
-                    style: &config.style,
-                },
-            );
-            drop(reg);
-            Ok(([(CONTENT_TYPE, "text/html")], rendered?).into_response())
-        }
-        ReturnedPost::Raw(body, content_type) => {
-            Ok(([(CONTENT_TYPE, content_type)], body).into_response())
-        }
-    }
-}
-
-pub fn new(config: &Config) -> Router<AppState> {
-    Router::new()
-        .route("/", get(index))
-        .route(
-            "/post/:name",
-            get(
-                |Path(name): Path<String>| async move { Redirect::to(&format!("/posts/{}", name)) },
-            ),
-        )
-        .route("/posts/:name", get(post))
-        .route("/posts", get(all_posts))
-        .route("/feed.xml", get(rss))
-        .nest_service(
-            "/static",
-            ServeDir::new(&config.dirs.custom_static)
-                .precompressed_gzip()
-                .fallback(service_fn(|req| handle(req, &STATIC))),
-        )
-        .nest_service("/media", ServeDir::new(&config.dirs.media))
-        .layer(
-            TraceLayer::new_for_http()
-                .make_span_with(|request: &Request<_>| {
-                    info_span!(
-                        "request",
-                        method = ?request.method(),
-                        path = ?request.uri().path(),
-                    )
-                })
-                .on_response(|response: &Response<_>, duration: Duration, span: &Span| {
-                    let _ = span.enter();
-                    let status = response.status();
-                    info!(?status, ?duration, "response");
-                }),
-        )
-}

src/config.rs

@@ -1,11 +1,11 @@
 use std::env;
-use std::net::{IpAddr, Ipv6Addr};
+use std::net::{IpAddr, Ipv4Addr};
 use std::path::PathBuf;
 
 use color_eyre::eyre::{bail, Context, Result};
 use serde::{Deserialize, Serialize};
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
-use tracing::{error, info, instrument};
+use tracing::{error, info};
 use url::Url;
 
 use crate::ranged_i128_visitor::RangedI128Visitor;
@@ -49,8 +49,6 @@ pub struct HttpConfig {
 pub struct DirsConfig {
     pub posts: PathBuf,
     pub media: PathBuf,
-    pub custom_static: PathBuf,
-    pub custom_templates: PathBuf,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -59,48 +57,13 @@ pub struct RssConfig {
     pub link: Url,
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-pub enum DateFormat {
-    #[default]
-    RFC3339,
-    #[serde(untagged)]
-    Strftime(String),
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Default, Copy, PartialEq, Eq)]
-#[serde(rename_all = "lowercase")]
-#[repr(u8)]
-pub enum Sort {
-    #[default]
-    Date,
-    Name,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(default)]
-#[derive(Default)]
-pub struct StyleConfig {
-    pub display_dates: DisplayDates,
-    pub date_format: DateFormat,
-    pub default_sort: Sort,
-    pub default_color: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(default)]
-pub struct DisplayDates {
-    pub creation: bool,
-    pub modification: bool,
-}
-
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(default)]
 pub struct Config {
     pub title: String,
     pub description: String,
-    pub markdown_access: bool,
+    pub raw_access: bool,
-    pub js_enable: bool,
+    pub num_posts: usize,
-    pub style: StyleConfig,
     pub rss: RssConfig,
     pub dirs: DirsConfig,
     pub http: HttpConfig,
@@ -113,9 +76,8 @@ impl Default for Config {
         Self {
             title: "bingus-blog".into(),
             description: "blazingly fast markdown blog software written in rust memory safe".into(),
-            markdown_access: true,
+            raw_access: true,
-            js_enable: true,
+            num_posts: 5,
-            style: Default::default(),
             // i have a love-hate relationship with serde
             // it was engimatic at first, but then i started actually using it
             // writing my own serialize and deserialize implementations.. spending
@@ -134,23 +96,11 @@ impl Default for Config {
     }
 }
 
-impl Default for DisplayDates {
-    fn default() -> Self {
-        Self {
-            creation: true,
-            modification: true,
-        }
-    }
-}
-
-
 impl Default for DirsConfig {
     fn default() -> Self {
         Self {
             posts: "posts".into(),
             media: "media".into(),
-            custom_static: "static".into(),
-            custom_templates: "templates".into(),
         }
     }
 }
@@ -158,7 +108,7 @@ impl Default for DirsConfig {
 impl Default for HttpConfig {
     fn default() -> Self {
         Self {
-            host: IpAddr::V6(Ipv6Addr::UNSPECIFIED),
+            host: IpAddr::V4(Ipv4Addr::UNSPECIFIED),
             port: 3000,
         }
     }
@@ -188,11 +138,10 @@ impl Default for CacheConfig {
     }
 }
 
-#[instrument(name = "config")]
 pub async fn load() -> Result<Config> {
     let config_file = env::var(format!(
         "{}_CONFIG",
-        env!("CARGO_BIN_NAME").to_uppercase().replace('-', "_")
+        env!("CARGO_BIN_NAME").to_uppercase().replace("-", "_")
     ))
     .unwrap_or(String::from("config.toml"));
     match tokio::fs::OpenOptions::new()

src/error.rs

@@ -53,8 +53,6 @@ pub type AppResult<T> = Result<T, AppError>;
 pub enum AppError {
     #[error("failed to fetch post: {0}")]
     PostError(#[from] PostError),
-    #[error(transparent)]
-    HandlebarsError(#[from] handlebars::RenderError),
     #[error("rss is disabled")]
     RssDisabled,
     #[error(transparent)]
@@ -77,9 +75,12 @@ struct ErrorTemplate {
 impl IntoResponse for AppError {
     fn into_response(self) -> Response {
         let status_code = match &self {
-            AppError::PostError(PostError::NotFound(_)) => StatusCode::NOT_FOUND,
+            AppError::PostError(err) => match err {
-            AppError::RssDisabled => StatusCode::FORBIDDEN,
+                PostError::NotFound(_) => StatusCode::NOT_FOUND,
                 _ => StatusCode::INTERNAL_SERVER_ERROR,
+            },
+            AppError::RssDisabled => StatusCode::FORBIDDEN,
+            AppError::UrlError(_) => StatusCode::INTERNAL_SERVER_ERROR,
         };
         (
             status_code,

src/filters.rs

@@ -0,0 +1,33 @@
+use std::{collections::HashMap, time::Duration};
+
+use chrono::{DateTime, TimeZone};
+
+use crate::post::PostMetadata;
+
+pub fn date<Utc: TimeZone>(date: &DateTime<Utc>) -> Result<String, askama::Error> {
+    Ok(date.to_utc().format("%Y-%m-%d %H:%M:%S UTC").to_string())
+}
+pub fn duration(duration: &&Duration) -> Result<String, askama::Error> {
+    Ok(format!("{:?}", duration))
+}
+
+pub fn collect_tags(posts: &Vec<PostMetadata>) -> Result<Vec<(String, u64)>, askama::Error> {
+    let mut tags = HashMap::new();
+
+    for post in posts {
+        for tag in &post.tags {
+            if let Some((existing_tag, count)) = tags.remove_entry(tag) {
+                tags.insert(existing_tag, count + 1);
+            } else {
+                tags.insert(tag.clone(), 1);
+            }
+        }
+    }
+
+    let mut tags: Vec<(String, u64)> = tags.into_iter().collect();
+
+    tags.sort_unstable_by_key(|(v, _)| v.clone());
+    tags.sort_by_key(|(_, v)| -(*v as i64));
+
+    Ok(tags)
+}

src/helpers.rs

@@ -1,24 +0,0 @@
-use std::fmt::Display;
-use std::time::Duration;
-
-use chrono::{DateTime, TimeZone, Utc};
-use handlebars::handlebars_helper;
-
-use crate::config::DateFormat;
-
-fn date_impl<T>(date_time: &DateTime<T>, date_format: &DateFormat) -> String
-where
-    T: TimeZone,
-    T::Offset: Display,
-{
-    match date_format {
-        DateFormat::RFC3339 => date_time.to_rfc3339_opts(chrono::SecondsFormat::Secs, true),
-        DateFormat::Strftime(ref format_string) => date_time.format(format_string).to_string(),
-    }
-}
-
-handlebars_helper!(date: |date_time: Option<DateTime<Utc>>, date_format: DateFormat| {
-    date_impl(date_time.as_ref().unwrap(), &date_format)
-});
-
-handlebars_helper!(duration: |duration_: Duration| format!("{:?}", duration_));

src/main.rs

@@ -1,123 +1,337 @@
-#![feature(let_chains, pattern)]
+#![feature(let_chains)]
 
-mod app;
 mod config;
 mod error;
+mod filters;
 mod hash_arc_store;
-mod helpers;
 mod markdown_render;
-mod platform;
 mod post;
 mod ranged_i128_visitor;
-mod serve_dir_included;
 mod systemtime_as_secs;
-mod templates;
 
 use std::future::IntoFuture;
+use std::io::Read;
 use std::net::SocketAddr;
 use std::process::exit;
 use std::sync::Arc;
 use std::time::Duration;
 
+use askama_axum::Template;
+use axum::extract::{Path, Query, State};
+use axum::http::{header, Request};
+use axum::response::{IntoResponse, Redirect, Response};
+use axum::routing::{get, Router};
+use axum::Json;
 use color_eyre::eyre::{self, Context};
+use error::AppError;
+use rss::{Category, ChannelBuilder, ItemBuilder};
+use serde::Deserialize;
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpListener;
-use tokio::sync::RwLock;
 use tokio::task::JoinSet;
-use tokio::time::Instant;
 use tokio::{select, signal};
 use tokio_util::sync::CancellationToken;
+use tower_http::services::ServeDir;
+use tower_http::trace::TraceLayer;
 use tracing::level_filters::LevelFilter;
-use tracing::{debug, error, info, info_span, warn, Instrument};
+use tracing::{debug, error, info, info_span, warn, Span};
-use tracing_subscriber::layer::SubscriberExt;
+use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
-use tracing_subscriber::{util::SubscriberInitExt, EnvFilter};
 
-use crate::app::AppState;
+use crate::config::Config;
-use crate::post::{MarkdownPosts, PostManager};
+use crate::error::{AppResult, PostError};
-use crate::templates::new_registry;
+use crate::post::cache::{Cache, CACHE_VERSION};
-use crate::templates::watcher::watch_templates;
+use crate::post::{PostManager, PostMetadata, RenderStats};
+
+type ArcState = Arc<AppState>;
+
+#[derive(Clone)]
+struct AppState {
+    pub config: Config,
+    pub posts: PostManager,
+}
+
+#[derive(Template)]
+#[template(path = "index.html")]
+struct IndexTemplate {
+    title: String,
+    description: String,
+    posts: Vec<PostMetadata>,
+}
+
+#[derive(Template)]
+#[template(path = "post.html")]
+struct PostTemplate {
+    meta: PostMetadata,
+    rendered: String,
+    rendered_in: RenderStats,
+    markdown_access: bool,
+}
+
+#[derive(Deserialize)]
+struct QueryParams {
+    tag: Option<String>,
+    #[serde(rename = "n")]
+    num_posts: Option<usize>,
+}
+
+async fn index(
+    State(state): State<ArcState>,
+    Query(query): Query<QueryParams>,
+) -> AppResult<IndexTemplate> {
+    let posts = state
+        .posts
+        .get_max_n_post_metadata_with_optional_tag_sorted(query.num_posts, query.tag.as_ref())
+        .await?;
+
+    Ok(IndexTemplate {
+        title: state.config.title.clone(),
+        description: state.config.description.clone(),
+        posts,
+    })
+}
+
+async fn all_posts(
+    State(state): State<ArcState>,
+    Query(query): Query<QueryParams>,
+) -> AppResult<Json<Vec<PostMetadata>>> {
+    let posts = state
+        .posts
+        .get_max_n_post_metadata_with_optional_tag_sorted(query.num_posts, query.tag.as_ref())
+        .await?;
+
+    Ok(Json(posts))
+}
+
+async fn rss(
+    State(state): State<ArcState>,
+    Query(query): Query<QueryParams>,
+) -> AppResult<Response> {
+    if !state.config.rss.enable {
+        return Err(AppError::RssDisabled);
+    }
+
+    let posts = state
+        .posts
+        .get_all_posts_filtered(|metadata, _| {
+            !query
+                .tag
+                .as_ref()
+                .is_some_and(|tag| !metadata.tags.contains(tag))
+        })
+        .await?;
+
+    let mut channel = ChannelBuilder::default();
+    channel
+        .title(&state.config.title)
+        .link(state.config.rss.link.to_string())
+        .description(&state.config.description);
+    //TODO: .language()
+
+    for (metadata, content, _) in posts {
+        channel.item(
+            ItemBuilder::default()
+                .title(metadata.title)
+                .description(metadata.description)
+                .author(metadata.author)
+                .categories(
+                    metadata
+                        .tags
+                        .into_iter()
+                        .map(|tag| Category {
+                            name: tag,
+                            domain: None,
+                        })
+                        .collect::<Vec<Category>>(),
+                )
+                .pub_date(metadata.created_at.map(|date| date.to_rfc2822()))
+                .content(content)
+                .link(
+                    state
+                        .config
+                        .rss
+                        .link
+                        .join(&format!("/posts/{}", metadata.name))?
+                        .to_string(),
+                )
+                .build(),
+        );
+    }
+
+    let body = channel.build().to_string();
+    drop(channel);
+
+    Ok(([(header::CONTENT_TYPE, "text/xml")], body).into_response())
+}
+
+async fn post(State(state): State<ArcState>, Path(name): Path<String>) -> AppResult<Response> {
+    if name.ends_with(".md") && state.config.raw_access {
+        let mut file = tokio::fs::OpenOptions::new()
+            .read(true)
+            .open(state.config.dirs.posts.join(&name))
+            .await?;
+
+        let mut buf = Vec::new();
+        file.read_to_end(&mut buf).await?;
+
+        Ok(([("content-type", "text/plain")], buf).into_response())
+    } else {
+        let post = state.posts.get_post(&name).await?;
+        let page = PostTemplate {
+            meta: post.0,
+            rendered: post.1,
+            rendered_in: post.2,
+            markdown_access: state.config.raw_access,
+        };
+
+        Ok(page.into_response())
+    }
+}
 
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
-    color_eyre::install()?;
-    let reg = tracing_subscriber::registry();
     #[cfg(feature = "tokio-console")]
-    let reg = reg
+    console_subscriber::init();
-        .with(
+    color_eyre::install()?;
-            EnvFilter::builder()
-                .with_default_directive(LevelFilter::TRACE.into())
-                .from_env_lossy(),
-        )
-        .with(console_subscriber::spawn());
     #[cfg(not(feature = "tokio-console"))]
-    let reg = reg.with(
+    tracing_subscriber::registry()
+        .with(
             EnvFilter::builder()
                 .with_default_directive(LevelFilter::INFO.into())
                 .from_env_lossy(),
-    );
+        )
-    reg.with(tracing_subscriber::fmt::layer()).init();
+        .with(tracing_subscriber::fmt::layer())
+        .init();
 
-    let config = Arc::new(
+    let config = config::load()
-        config::load()
         .await
-            .context("couldn't load configuration")?,
+        .context("couldn't load configuration")?;
-    );
 
     let socket_addr = SocketAddr::new(config.http.host, config.http.port);
 
     let mut tasks = JoinSet::new();
     let cancellation_token = CancellationToken::new();
 
-    let start = Instant::now();
+    let posts = if config.cache.enable {
-    // NOTE: use tokio::task::spawn_blocking if this ever turns into a concurrent task
+        if config.cache.persistence
-    let mut reg = new_registry(&config.dirs.custom_templates)
+            && tokio::fs::try_exists(&config.cache.file)
-        .context("failed to create handlebars registry")?;
+                .await
-    reg.register_helper("date", Box::new(helpers::date));
+                .with_context(|| {
-    reg.register_helper("duration", Box::new(helpers::duration));
+                    format!("failed to check if {} exists", config.cache.file.display())
-    debug!(duration = ?start.elapsed(), "registered all templates");
+                })?
-
+        {
-    let reg = Arc::new(RwLock::new(reg));
+            info!("loading cache from file");
-
+            let path = &config.cache.file;
-    let watcher_token = cancellation_token.child_token();
+            let load_cache = async {
-
+                let mut cache_file = tokio::fs::File::open(&path)
-    let posts = Arc::new(MarkdownPosts::new(Arc::clone(&config)).await?);
+                    .await
-    let state = AppState {
+                    .context("failed to open cache file")?;
-        config: Arc::clone(&config),
+                let serialized = if config.cache.compress {
-        posts: Arc::clone(&posts),
+                    let cache_file = cache_file.into_std().await;
-        reg: Arc::clone(&reg),
+                    tokio::task::spawn_blocking(move || {
+                        let mut buf = Vec::with_capacity(4096);
+                        zstd::stream::read::Decoder::new(cache_file)?.read_to_end(&mut buf)?;
+                        Ok::<_, std::io::Error>(buf)
+                    })
+                    .await
+                    .context("failed to join blocking thread")?
+                    .context("failed to read cache file")?
+                } else {
+                    let mut buf = Vec::with_capacity(4096);
+                    cache_file
+                        .read_to_end(&mut buf)
+                        .await
+                        .context("failed to read cache file")?;
+                    buf
+                };
+                let mut cache: Cache =
+                    bitcode::deserialize(serialized.as_slice()).context("failed to parse cache")?;
+                if cache.version() < CACHE_VERSION {
+                    warn!("cache version changed, clearing cache");
+                    cache = Cache::default();
                 };
 
-    debug!("setting up watcher");
+                Ok::<PostManager, color_eyre::Report>(PostManager::new_with_cache(
-    tasks.spawn(
+                    config.dirs.posts.clone(),
-        watch_templates(
+                    config.render.clone(),
-            config.dirs.custom_templates.clone(),
+                    cache,
-            watcher_token.clone(),
+                ))
-            reg,
+            }
+            .await;
+            match load_cache {
+                Ok(posts) => posts,
+                Err(err) => {
+                    error!("failed to load cache: {}", err);
+                    info!("using empty cache");
+                    PostManager::new_with_cache(
+                        config.dirs.posts.clone(),
+                        config.render.clone(),
+                        Default::default(),
                     )
-        .instrument(info_span!("custom_template_watcher")),
+                }
-    );
+            }
+        } else {
+            PostManager::new_with_cache(
+                config.dirs.posts.clone(),
+                config.render.clone(),
+                Default::default(),
+            )
+        }
+    } else {
+        PostManager::new(config.dirs.posts.clone(), config.render.clone())
+    };
 
-    if config.cache.enable && config.cache.cleanup {
+    let state = Arc::new(AppState { config, posts });
-        if let Some(millis) = config.cache.cleanup_interval {
+
-            let posts = Arc::clone(&posts);
+    if state.config.cache.enable && state.config.cache.cleanup {
+        if let Some(t) = state.config.cache.cleanup_interval {
+            let state = Arc::clone(&state);
             let token = cancellation_token.child_token();
             debug!("setting up cleanup task");
             tasks.spawn(async move {
-                let mut interval = tokio::time::interval(Duration::from_millis(millis));
+                let mut interval = tokio::time::interval(Duration::from_millis(t));
                 loop {
                     select! {
-                        _ = token.cancelled() => break Ok(()),
+                        _ = token.cancelled() => break,
                         _ = interval.tick() => {
-                            posts.cleanup().await
+                            state.posts.cleanup().await
                         }
                     }
                 }
             });
         } else {
-            posts.cleanup().await;
+            state.posts.cleanup().await;
         }
     }
 
-    let app = app::new(&config).with_state(state.clone());
+    let app = Router::new()
+        .route("/", get(index))
+        .route(
+            "/post/:name",
+            get(
+                |Path(name): Path<String>| async move { Redirect::to(&format!("/posts/{}", name)) },
+            ),
+        )
+        .route("/posts/:name", get(post))
+        .route("/posts", get(all_posts))
+        .route("/feed.xml", get(rss))
+        .nest_service("/static", ServeDir::new("static").precompressed_gzip())
+        .nest_service("/media", ServeDir::new("media"))
+        .layer(
+            TraceLayer::new_for_http()
+                .make_span_with(|request: &Request<_>| {
+                    info_span!(
+                        "request",
+                        method = ?request.method(),
+                        path = ?request.uri().path(),
+                    )
+                })
+                .on_response(|response: &Response<_>, duration: Duration, span: &Span| {
+                    let _ = span.enter();
+                    let status = response.status();
+                    info!(?status, ?duration, "response");
+                }),
+        )
+        .with_state(state.clone());
 
     let listener = TcpListener::bind(socket_addr)
         .await
@@ -128,7 +342,13 @@ async fn main() -> eyre::Result<()> {
     info!("listening on http://{}", local_addr);
 
     let sigint = signal::ctrl_c();
-    let sigterm = platform::sigterm();
+    #[cfg(unix)]
+    let mut sigterm_handler =
+        tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())?;
+    #[cfg(unix)]
+    let sigterm = sigterm_handler.recv();
+    #[cfg(not(unix))] // TODO: kill all windows server users
+    let sigterm = std::future::pending::<()>();
 
     let axum_token = cancellation_token.child_token();
 
@@ -156,18 +376,50 @@ async fn main() -> eyre::Result<()> {
         cancellation_token.cancel();
         server.await.context("failed to serve app")?;
         while let Some(task) = tasks.join_next().await {
-            let res = task.context("failed to join task")?;
+            task.context("failed to join task")?;
-            if let Err(err) = res {
-                error!("task failed with error: {err}");
-            }
         }
 
-        drop(state);
+        // write cache to file
+        let config = &state.config;
+        let posts = &state.posts;
+        if config.cache.enable
+            && config.cache.persistence
+            && let Some(cache) = posts.cache()
+        {
+            let path = &config.cache.file;
+            let serialized = bitcode::serialize(cache).context("failed to serialize cache")?;
+            let mut cache_file = tokio::fs::File::create(path)
+                .await
+                .with_context(|| format!("failed to open cache at {}", path.display()))?;
+            let compression_level = config.cache.compression_level;
+            if config.cache.compress {
+                let cache_file = cache_file.into_std().await;
+                tokio::task::spawn_blocking(move || {
+                    std::io::Write::write_all(
+                        &mut zstd::stream::write::Encoder::new(cache_file, compression_level)?
+                            .auto_finish(),
+                        &serialized,
+                    )
+                })
+                .await
+                .context("failed to join blocking thread")?
+            } else {
+                cache_file.write_all(&serialized).await
+            }
+            .context("failed to write cache to file")?;
+            info!("wrote cache to {}", path.display());
+        }
         Ok::<(), color_eyre::Report>(())
     };
 
     let sigint = signal::ctrl_c();
-    let sigterm = platform::sigterm();
+    #[cfg(unix)]
+    let mut sigterm_handler =
+        tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())?;
+    #[cfg(unix)]
+    let sigterm = sigterm_handler.recv();
+    #[cfg(not(unix))]
+    let sigterm = std::future::pending::<()>();
 
     tokio::select! {
         result = cleanup => {

src/platform.rs

@@ -1,9 +0,0 @@
-pub async fn sigterm() -> Result<Option<()>, std::io::Error> {
-    #[cfg(unix)]
-    let mut sigterm_handler =
-        tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())?;
-    #[cfg(unix)]
-    return Ok(sigterm_handler.recv().await);
-    #[cfg(not(unix))]
-    std::future::pending::<None>().await
-}

src/post/cache.rs

@@ -1,14 +1,12 @@
 use std::hash::{DefaultHasher, Hash, Hasher};
-use std::io::Read;
 
-use crate::config::{Config, RenderConfig};
-use crate::post::PostMetadata;
-use color_eyre::eyre::{self, Context};
 use scc::HashMap;
 use serde::{Deserialize, Serialize};
-use tokio::io::AsyncReadExt;
 use tracing::{debug, instrument};
 
+use crate::config::RenderConfig;
+use crate::post::PostMetadata;
+
 /// do not persist cache if this version number changed
 pub const CACHE_VERSION: u16 = 2;
 
@@ -135,29 +133,3 @@ impl Cache {
         self.1
     }
 }
-
-pub(crate) async fn load_cache(config: &Config) -> Result<Cache, eyre::Report> {
-    let path = &config.cache.file;
-    let mut cache_file = tokio::fs::File::open(&path)
-        .await
-        .context("failed to open cache file")?;
-    let serialized = if config.cache.compress {
-        let cache_file = cache_file.into_std().await;
-        tokio::task::spawn_blocking(move || {
-            let mut buf = Vec::with_capacity(4096);
-            zstd::stream::read::Decoder::new(cache_file)?.read_to_end(&mut buf)?;
-            Ok::<_, std::io::Error>(buf)
-        })
-        .await?
-        .context("failed to read cache file")?
-    } else {
-        let mut buf = Vec::with_capacity(4096);
-        cache_file
-            .read_to_end(&mut buf)
-            .await
-            .context("failed to read cache file")?;
-        buf
-    };
-
-    bitcode::deserialize(serialized.as_slice()).context("failed to parse cache")
-}

src/post/markdown_posts.rs

@@ -1,348 +0,0 @@
-use std::collections::BTreeSet;
-use std::io::{self, Write};
-use std::ops::Deref;
-use std::path::Path;
-use std::time::Duration;
-use std::time::Instant;
-use std::time::SystemTime;
-
-use axum::http::HeaderValue;
-use chrono::{DateTime, Utc};
-use color_eyre::eyre::{self, Context};
-use fronma::parser::{parse, ParsedData};
-use serde::Deserialize;
-use tokio::fs;
-use tokio::io::AsyncReadExt;
-use tracing::{error, info, warn};
-
-use crate::config::Config;
-use crate::markdown_render::render;
-use crate::post::cache::{load_cache, Cache, CACHE_VERSION};
-use crate::post::{PostError, PostManager, PostMetadata, RenderStats, ReturnedPost};
-use crate::systemtime_as_secs::as_secs;
-
-#[derive(Deserialize)]
-struct FrontMatter {
-    pub title: String,
-    pub description: String,
-    pub author: String,
-    pub icon: Option<String>,
-    pub icon_alt: Option<String>,
-    pub color: Option<String>,
-    pub created_at: Option<DateTime<Utc>>,
-    pub modified_at: Option<DateTime<Utc>>,
-    #[serde(default)]
-    pub tags: BTreeSet<String>,
-}
-
-impl FrontMatter {
-    pub fn into_full(
-        self,
-        name: String,
-        created: Option<SystemTime>,
-        modified: Option<SystemTime>,
-    ) -> PostMetadata {
-        PostMetadata {
-            name,
-            title: self.title,
-            description: self.description,
-            author: self.author,
-            icon: self.icon,
-            icon_alt: self.icon_alt,
-            color: self.color,
-            created_at: self.created_at.or_else(|| created.map(|t| t.into())),
-            modified_at: self.modified_at.or_else(|| modified.map(|t| t.into())),
-            tags: self.tags.into_iter().collect(),
-        }
-    }
-}
-pub struct MarkdownPosts<C>
-where
-    C: Deref<Target = Config>,
-{
-    cache: Option<Cache>,
-    config: C,
-}
-
-impl<C> MarkdownPosts<C>
-where
-    C: Deref<Target = Config>,
-{
-    pub async fn new(config: C) -> eyre::Result<MarkdownPosts<C>> {
-        if config.cache.enable {
-            if config.cache.persistence && tokio::fs::try_exists(&config.cache.file).await? {
-                info!("loading cache from file");
-                let mut cache = load_cache(&config).await.unwrap_or_else(|err| {
-                    error!("failed to load cache: {}", err);
-                    info!("using empty cache");
-                    Default::default()
-                });
-
-                if cache.version() < CACHE_VERSION {
-                    warn!("cache version changed, clearing cache");
-                    cache = Default::default();
-                };
-
-                Ok(Self {
-                    cache: Some(cache),
-                    config,
-                })
-            } else {
-                Ok(Self {
-                    cache: Some(Default::default()),
-                    config,
-                })
-            }
-        } else {
-            Ok(Self {
-                cache: None,
-                config,
-            })
-        }
-    }
-
-    async fn parse_and_render(
-        &self,
-        name: String,
-        path: impl AsRef<Path>,
-    ) -> Result<(PostMetadata, String, (Duration, Duration)), PostError> {
-        let parsing_start = Instant::now();
-        let mut file = match tokio::fs::OpenOptions::new().read(true).open(&path).await {
-            Ok(val) => val,
-            Err(err) => match err.kind() {
-                io::ErrorKind::NotFound => return Err(PostError::NotFound(name)),
-                _ => return Err(PostError::IoError(err)),
-            },
-        };
-        let stat = file.metadata().await?;
-        let modified = stat.modified()?;
-        let created = stat.created().ok();
-
-        let mut content = String::with_capacity(stat.len() as usize);
-        file.read_to_string(&mut content).await?;
-
-        let ParsedData { headers, body } = parse::<FrontMatter>(&content)?;
-        let metadata = headers.into_full(name.to_owned(), created, Some(modified));
-        let parsing = parsing_start.elapsed();
-
-        let before_render = Instant::now();
-        let post = render(body, &self.config.render);
-        let rendering = before_render.elapsed();
-
-        if let Some(cache) = self.cache.as_ref() {
-            cache
-                .insert(
-                    name.to_string(),
-                    metadata.clone(),
-                    as_secs(&modified),
-                    post.clone(),
-                    &self.config.render,
-                )
-                .await
-                .unwrap_or_else(|err| warn!("failed to insert {:?} into cache", err.0))
-        };
-
-        Ok((metadata, post, (parsing, rendering)))
-    }
-
-    fn cache(&self) -> Option<&Cache> {
-        self.cache.as_ref()
-    }
-
-    fn try_drop(&mut self) -> Result<(), eyre::Report> {
-        // write cache to file
-        let config = &self.config.cache;
-        if config.enable
-            && config.persistence
-            && let Some(cache) = self.cache()
-        {
-            let path = &config.file;
-            let serialized = bitcode::serialize(cache).context("failed to serialize cache")?;
-            let mut cache_file = std::fs::File::create(path)
-                .with_context(|| format!("failed to open cache at {}", path.display()))?;
-            let compression_level = config.compression_level;
-            if config.compress {
-                std::io::Write::write_all(
-                    &mut zstd::stream::write::Encoder::new(cache_file, compression_level)?
-                        .auto_finish(),
-                    &serialized,
-                )
-            } else {
-                cache_file.write_all(&serialized)
-            }
-            .context("failed to write cache to file")?;
-            info!("wrote cache to {}", path.display());
-        }
-        Ok(())
-    }
-}
-
-impl<C> Drop for MarkdownPosts<C>
-where
-    C: Deref<Target = Config>,
-{
-    fn drop(&mut self) {
-        self.try_drop().unwrap()
-    }
-}
-
-impl<C> PostManager for MarkdownPosts<C>
-where
-    C: Deref<Target = Config>,
-{
-    async fn get_all_post_metadata(
-        &self,
-        filter: impl Fn(&PostMetadata) -> bool,
-    ) -> Result<Vec<PostMetadata>, PostError> {
-        let mut posts = Vec::new();
-
-        let mut read_dir = fs::read_dir(&self.config.dirs.posts).await?;
-        while let Some(entry) = read_dir.next_entry().await? {
-            let path = entry.path();
-            let stat = fs::metadata(&path).await?;
-
-            if stat.is_file() && path.extension().is_some_and(|ext| ext == "md") {
-                let mtime = as_secs(&stat.modified()?);
-                // TODO. this?
-                let name = path
-                    .clone()
-                    .file_stem()
-                    .unwrap()
-                    .to_string_lossy()
-                    .to_string();
-
-                if let Some(cache) = self.cache.as_ref()
-                    && let Some(hit) = cache.lookup_metadata(&name, mtime).await
-                    && filter(&hit)
-                {
-                    posts.push(hit);
-                } else {
-                    match self.parse_and_render(name, path).await {
-                        Ok((metadata, ..)) => {
-                            if filter(&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),
-                        },
-                    }
-                }
-            }
-        }
-
-        Ok(posts)
-    }
-
-    async fn get_all_posts(
-        &self,
-        filter: impl Fn(&PostMetadata, &str) -> bool,
-    ) -> Result<Vec<(PostMetadata, String, RenderStats)>, PostError> {
-        let mut posts = Vec::new();
-
-        let mut read_dir = fs::read_dir(&self.config.dirs.posts).await?;
-        while let Some(entry) = read_dir.next_entry().await? {
-            let path = entry.path();
-            let stat = fs::metadata(&path).await?;
-
-            if stat.is_file() && path.extension().is_some_and(|ext| ext == "md") {
-                let name = path
-                    .clone()
-                    .file_stem()
-                    .unwrap()
-                    .to_string_lossy()
-                    .to_string();
-
-                let post = self.get_post(&name).await?;
-                if let ReturnedPost::Rendered(meta, content, stats) = post
-                    && filter(&meta, &content)
-                {
-                    posts.push((meta, content, stats));
-                }
-            }
-        }
-
-        Ok(posts)
-    }
-
-    async fn get_post(&self, name: &str) -> Result<ReturnedPost, PostError> {
-        if self.config.markdown_access && name.ends_with(".md") {
-            let path = self.config.dirs.posts.join(name);
-
-            let mut file = match tokio::fs::OpenOptions::new().read(true).open(&path).await {
-                Ok(value) => value,
-                Err(err) => match err.kind() {
-                    io::ErrorKind::NotFound => {
-                        if let Some(cache) = self.cache.as_ref() {
-                            cache.remove(name).await;
-                        }
-                        return Err(PostError::NotFound(name.to_string()));
-                    }
-                    _ => return Err(PostError::IoError(err)),
-                },
-            };
-
-            let mut buf = Vec::with_capacity(4096);
-
-            file.read_to_end(&mut buf).await?;
-
-            Ok(ReturnedPost::Raw(
-                buf,
-                HeaderValue::from_static("text/plain"),
-            ))
-        } else {
-            let start = Instant::now();
-            let path = self.config.dirs.posts.join(name.to_owned() + ".md");
-
-            let stat = match tokio::fs::metadata(&path).await {
-                Ok(value) => value,
-                Err(err) => match err.kind() {
-                    io::ErrorKind::NotFound => {
-                        if let Some(cache) = self.cache.as_ref() {
-                            cache.remove(name).await;
-                        }
-                        return Err(PostError::NotFound(name.to_string()));
-                    }
-                    _ => return Err(PostError::IoError(err)),
-                },
-            };
-            let mtime = as_secs(&stat.modified()?);
-
-            if let Some(cache) = self.cache.as_ref()
-                && let Some(hit) = cache.lookup(name, mtime, &self.config.render).await
-            {
-                Ok(ReturnedPost::Rendered(
-                    hit.metadata,
-                    hit.rendered,
-                    RenderStats::Cached(start.elapsed()),
-                ))
-            } else {
-                let (metadata, rendered, stats) =
-                    self.parse_and_render(name.to_string(), path).await?;
-                Ok(ReturnedPost::Rendered(
-                    metadata,
-                    rendered,
-                    RenderStats::ParsedAndRendered(start.elapsed(), stats.0, stats.1),
-                ))
-            }
-        }
-    }
-
-    async fn cleanup(&self) {
-        if let Some(cache) = self.cache.as_ref() {
-            cache
-                .cleanup(|name| {
-                    std::fs::metadata(self.config.dirs.posts.join(name.to_owned() + ".md"))
-                        .ok()
-                        .and_then(|metadata| metadata.modified().ok())
-                        .map(|mtime| as_secs(&mtime))
-                })
-                .await
-        }
-    }
-}

src/post/mod.rs

@@ -1,14 +1,54 @@
 pub mod cache;
-pub mod markdown_posts;
 
-use std::time::Duration;
+use std::collections::BTreeSet;
+use std::io;
+use std::path::{Path, PathBuf};
+use std::time::{Duration, Instant, SystemTime};
 
-use axum::http::HeaderValue;
 use chrono::{DateTime, Utc};
+use fronma::parser::{parse, ParsedData};
 use serde::{Deserialize, Serialize};
+use tokio::fs;
+use tokio::io::AsyncReadExt;
+use tracing::warn;
 
-use crate::error::PostError;
+use crate::config::RenderConfig;
-pub use crate::post::markdown_posts::MarkdownPosts;
+use crate::markdown_render::render;
+use crate::post::cache::Cache;
+use crate::systemtime_as_secs::as_secs;
+use crate::PostError;
+
+#[derive(Deserialize)]
+struct FrontMatter {
+    pub title: String,
+    pub description: String,
+    pub author: String,
+    pub icon: Option<String>,
+    pub created_at: Option<DateTime<Utc>>,
+    pub modified_at: Option<DateTime<Utc>>,
+    #[serde(default)]
+    pub tags: BTreeSet<String>,
+}
+
+impl FrontMatter {
+    pub fn into_full(
+        self,
+        name: String,
+        created: Option<SystemTime>,
+        modified: Option<SystemTime>,
+    ) -> PostMetadata {
+        PostMetadata {
+            name,
+            title: self.title,
+            description: self.description,
+            author: self.author,
+            icon: self.icon,
+            created_at: self.created_at.or_else(|| created.map(|t| t.into())),
+            modified_at: self.modified_at.or_else(|| modified.map(|t| t.into())),
+            tags: self.tags.into_iter().collect(),
+        }
+    }
+}
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct PostMetadata {
@@ -17,48 +57,173 @@ pub struct PostMetadata {
     pub description: String,
     pub author: String,
     pub icon: Option<String>,
-    pub icon_alt: Option<String>,
-    pub color: Option<String>,
     pub created_at: Option<DateTime<Utc>>,
     pub modified_at: Option<DateTime<Utc>>,
     pub tags: Vec<String>,
 }
 
-#[derive(Serialize)]
+#[allow(unused)]
 pub enum RenderStats {
     Cached(Duration),
     // format: Total, Parsed in, Rendered in
     ParsedAndRendered(Duration, Duration, Duration),
 }
 
-#[allow(clippy::large_enum_variant)] // Raw will be returned very rarely
+#[derive(Clone)]
-pub enum ReturnedPost {
+pub struct PostManager {
-    Rendered(PostMetadata, String, RenderStats),
+    dir: PathBuf,
-    Raw(Vec<u8>, HeaderValue),
+    cache: Option<Cache>,
+    config: RenderConfig,
 }
 
-pub trait PostManager {
+impl PostManager {
-    async fn get_all_post_metadata(
+    pub fn new(dir: PathBuf, config: RenderConfig) -> PostManager {
+        PostManager {
+            dir,
+            cache: None,
+            config,
+        }
+    }
+
+    pub fn new_with_cache(dir: PathBuf, config: RenderConfig, cache: Cache) -> PostManager {
+        PostManager {
+            dir,
+            cache: Some(cache),
+            config,
+        }
+    }
+
+    async fn parse_and_render(
+        &self,
+        name: String,
+        path: impl AsRef<Path>,
+    ) -> Result<(PostMetadata, String, (Duration, Duration)), PostError> {
+        let parsing_start = Instant::now();
+        let mut file = match tokio::fs::OpenOptions::new().read(true).open(&path).await {
+            Ok(val) => val,
+            Err(err) => match err.kind() {
+                io::ErrorKind::NotFound => return Err(PostError::NotFound(name)),
+                _ => return Err(PostError::IoError(err)),
+            },
+        };
+        let stat = file.metadata().await?;
+        let modified = stat.modified()?;
+        let created = stat.created().ok();
+
+        let mut content = String::with_capacity(stat.len() as usize);
+        file.read_to_string(&mut content).await?;
+
+        let ParsedData { headers, body } = parse::<FrontMatter>(&content)?;
+        let metadata = headers.into_full(name.to_owned(), created, Some(modified));
+        let parsing = parsing_start.elapsed();
+
+        let before_render = Instant::now();
+        let post = render(body, &self.config);
+        let rendering = before_render.elapsed();
+
+        if let Some(cache) = self.cache.as_ref() {
+            cache
+                .insert(
+                    name.to_string(),
+                    metadata.clone(),
+                    as_secs(&modified),
+                    post.clone(),
+                    &self.config,
+                )
+                .await
+                .unwrap_or_else(|err| warn!("failed to insert {:?} into cache", err.0))
+        };
+
+        Ok((metadata, post, (parsing, rendering)))
+    }
+
+    pub async fn get_all_post_metadata_filtered(
         &self,
         filter: impl Fn(&PostMetadata) -> bool,
     ) -> Result<Vec<PostMetadata>, PostError> {
-        self.get_all_posts(|m, _| filter(m))
+        let mut posts = Vec::new();
-            .await
+
-            .map(|vec| vec.into_iter().map(|(meta, ..)| meta).collect())
+        let mut read_dir = fs::read_dir(&self.dir).await?;
+        while let Some(entry) = read_dir.next_entry().await? {
+            let path = entry.path();
+            let stat = fs::metadata(&path).await?;
+
+            if stat.is_file() && path.extension().is_some_and(|ext| ext == "md") {
+                let mtime = as_secs(&stat.modified()?);
+                // TODO. this?
+                let name = path
+                    .clone()
+                    .file_stem()
+                    .unwrap()
+                    .to_string_lossy()
+                    .to_string();
+
+                if let Some(cache) = self.cache.as_ref()
+                    && let Some(hit) = cache.lookup_metadata(&name, mtime).await
+                    && filter(&hit)
+                {
+                    posts.push(hit);
+                } else {
+                    match self.parse_and_render(name, path).await {
+                        Ok((metadata, ..)) => {
+                            if filter(&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),
+                        },
+                    }
+                }
+            }
         }
 
-    async fn get_all_posts(
+        Ok(posts)
+    }
+
+    pub async fn get_all_posts_filtered(
         &self,
         filter: impl Fn(&PostMetadata, &str) -> bool,
-    ) -> Result<Vec<(PostMetadata, String, RenderStats)>, PostError>;
+    ) -> Result<Vec<(PostMetadata, String, RenderStats)>, PostError> {
+        let mut posts = Vec::new();
 
-    async fn get_max_n_post_metadata_with_optional_tag_sorted(
+        let mut read_dir = fs::read_dir(&self.dir).await?;
+        while let Some(entry) = read_dir.next_entry().await? {
+            let path = entry.path();
+            let stat = fs::metadata(&path).await?;
+
+            if stat.is_file() && path.extension().is_some_and(|ext| ext == "md") {
+                let name = path
+                    .clone()
+                    .file_stem()
+                    .unwrap()
+                    .to_string_lossy()
+                    .to_string();
+
+                let post = self.get_post(&name).await?;
+                if filter(&post.0, &post.1) {
+                    posts.push(post);
+                }
+            }
+        }
+
+        Ok(posts)
+    }
+
+    pub async fn get_max_n_post_metadata_with_optional_tag_sorted(
         &self,
         n: Option<usize>,
         tag: Option<&String>,
     ) -> Result<Vec<PostMetadata>, PostError> {
         let mut posts = self
-            .get_all_post_metadata(|metadata| !tag.is_some_and(|tag| !metadata.tags.contains(tag)))
+            .get_all_post_metadata_filtered(|metadata| {
+                !tag.is_some_and(|tag| !metadata.tags.contains(tag))
+            })
             .await?;
         // we still want some semblance of order if created_at is None so sort by mtime as well
         posts.sort_unstable_by_key(|metadata| metadata.modified_at.unwrap_or_default());
@@ -71,15 +236,59 @@ pub trait PostManager {
         Ok(posts)
     }
 
-    #[allow(unused)]
+    pub async fn get_post(
-    async fn get_post_metadata(&self, name: &str) -> Result<PostMetadata, PostError> {
+        &self,
-        match self.get_post(name).await? {
+        name: &str,
-            ReturnedPost::Rendered(metadata, ..) => Ok(metadata),
+    ) -> Result<(PostMetadata, String, RenderStats), PostError> {
-            ReturnedPost::Raw(..) => Err(PostError::NotFound(name.to_string())),
+        let start = Instant::now();
+        let path = self.dir.join(name.to_owned() + ".md");
+
+        let stat = match tokio::fs::metadata(&path).await {
+            Ok(value) => value,
+            Err(err) => match err.kind() {
+                io::ErrorKind::NotFound => {
+                    if let Some(cache) = self.cache.as_ref() {
+                        cache.remove(name).await;
+                    }
+                    return Err(PostError::NotFound(name.to_string()));
+                }
+                _ => return Err(PostError::IoError(err)),
+            },
+        };
+        let mtime = as_secs(&stat.modified()?);
+
+        if let Some(cache) = self.cache.as_ref()
+            && let Some(hit) = cache.lookup(name, mtime, &self.config).await
+        {
+            Ok((
+                hit.metadata,
+                hit.rendered,
+                RenderStats::Cached(start.elapsed()),
+            ))
+        } else {
+            let (metadata, rendered, stats) = self.parse_and_render(name.to_string(), path).await?;
+            Ok((
+                metadata,
+                rendered,
+                RenderStats::ParsedAndRendered(start.elapsed(), stats.0, stats.1),
+            ))
         }
     }
 
-    async fn get_post(&self, name: &str) -> Result<ReturnedPost, PostError>;
+    pub fn cache(&self) -> Option<&Cache> {
-
+        self.cache.as_ref()
-    async fn cleanup(&self);
+    }
+
+    pub async fn cleanup(&self) {
+        if let Some(cache) = self.cache.as_ref() {
+            cache
+                .cleanup(|name| {
+                    std::fs::metadata(self.dir.join(name.to_owned() + ".md"))
+                        .ok()
+                        .and_then(|metadata| metadata.modified().ok())
+                        .map(|mtime| as_secs(&mtime))
+                })
+                .await
+        }
+    }
 }

src/serve_dir_included.rs

@@ -1,81 +0,0 @@
-use std::convert::Infallible;
-use std::str::pattern::Pattern;
-
-use axum::extract::Request;
-use axum::http::{header, StatusCode};
-use axum::response::{IntoResponse, Response};
-use include_dir::{Dir, DirEntry};
-use tracing::{debug, trace};
-
-fn if_empty<'a>(a: &'a str, b: &'a str) -> &'a str {
-    if a.is_empty() {
-        b
-    } else {
-        a
-    }
-}
-
-fn remove_prefixes(mut src: &str, pat: (impl Pattern + Copy)) -> &str {
-    while let Some(removed) = src.strip_prefix(pat) {
-        src = removed;
-    }
-    src
-}
-
-fn from_included_file(file: &'static include_dir::File<'static>) -> Response {
-    let mime_type = mime_guess::from_path(file.path()).first_or_octet_stream();
-
-    (
-        [(
-            header::CONTENT_TYPE,
-            header::HeaderValue::try_from(mime_type.essence_str()).expect("invalid mime type"),
-        )],
-        file.contents(),
-    )
-        .into_response()
-}
-
-pub async fn handle(
-    req: Request,
-    included_dir: &'static Dir<'static>,
-) -> Result<Response, Infallible> {
-    #[cfg(windows)]
-    compile_error!("this is not safe");
-
-    let path = req.uri().path();
-
-    let has_dotdot = path.split('/').any(|seg| seg == "..");
-    if has_dotdot {
-        return Ok(StatusCode::NOT_FOUND.into_response());
-    }
-
-    let relative_path = if_empty(remove_prefixes(path, '/'), ".");
-
-    match included_dir.get_entry(relative_path) {
-        Some(DirEntry::Dir(dir)) => {
-            trace!("{relative_path:?} is a directory, trying \"index.html\"");
-            if let Some(file) = dir.get_file("index.html") {
-                debug!("{path:?} (index.html) serving from included dir");
-                return Ok(from_included_file(file));
-            } else {
-                trace!("\"index.html\" not found in {relative_path:?} in included files");
-            }
-        }
-        None if relative_path == "." => {
-            trace!("requested root, trying \"index.html\"");
-            if let Some(file) = included_dir.get_file("index.html") {
-                debug!("{path:?} (index.html) serving from included dir");
-                return Ok(from_included_file(file));
-            } else {
-                trace!("\"index.html\" not found in included files");
-            }
-        }
-        Some(DirEntry::File(file)) => {
-            debug!("{path:?} serving from included dir");
-            return Ok(from_included_file(file));
-        }
-        None => trace!("{relative_path:?} not found in included files"),
-    };
-
-    Ok(StatusCode::NOT_FOUND.into_response())
-}

src/templates/mod.rs

@@ -1,186 +0,0 @@
-pub mod watcher;
-
-use std::{io, path::Path};
-
-use handlebars::{Handlebars, Template};
-use include_dir::{include_dir, Dir};
-use thiserror::Error;
-use tracing::{debug, error, info_span, trace};
-
-const TEMPLATES: Dir<'static> = include_dir!("$CARGO_MANIFEST_DIR/templates");
-const PARTIALS: Dir<'static> = include_dir!("$CARGO_MANIFEST_DIR/partials");
-
-#[derive(Error, Debug)]
-#[allow(clippy::enum_variant_names)]
-pub enum TemplateError {
-    #[error(transparent)]
-    IoError(#[from] std::io::Error),
-    #[error("file doesn't contain valid UTF-8")]
-    UTF8Error,
-    #[error(transparent)]
-    TemplateError(#[from] handlebars::TemplateError),
-}
-
-fn is_ext(path: impl AsRef<Path>, ext: &str) -> bool {
-    match path.as_ref().extension() {
-        Some(path_ext) if path_ext != ext => false,
-        None => false,
-        _ => true,
-    }
-}
-
- fn get_template_name(path: &Path) -> Option<&str> {
-    if !is_ext(path, "hbs") {
-        return None;
-    }
-
-    path.file_stem()?.to_str()
-}
-
-fn register_included_file(
-    file: &include_dir::File<'_>,
-    name: &str,
-    registry: &mut Handlebars,
-) -> Result<(), TemplateError> {
-    let template = compile_included_file(file)?;
-    registry.register_template(name, template);
-    Ok(())
-}
-
-fn register_path(
-    path: impl AsRef<std::path::Path>,
-    name: &str,
-    registry: &mut Handlebars<'_>,
-) -> Result<(), TemplateError> {
-    let template = compile_path(path)?;
-    registry.register_template(name, template);
-    Ok(())
-}
-
-fn register_partial(
-    file: &include_dir::File<'_>,
-    name: &str,
-    registry: &mut Handlebars,
-) -> Result<(), TemplateError> {
-    registry.register_partial(name, file.contents_utf8().ok_or(TemplateError::UTF8Error)?)?;
-    Ok(())
-}
-
-fn compile_included_file(file: &include_dir::File<'_>) -> Result<Template, TemplateError> {
-    let contents = file.contents_utf8().ok_or(TemplateError::UTF8Error)?;
-
-    let template = Template::compile(contents)?;
-    Ok(template)
-}
-
-fn compile_path(path: impl AsRef<std::path::Path>) -> Result<Template, TemplateError> {
-    use std::fs::OpenOptions;
-    use std::io::Read;
-
-    let mut file = OpenOptions::new().read(true).open(path)?;
-    let mut buf = String::new();
-    file.read_to_string(&mut buf)?;
-
-    let template = Template::compile(&buf)?;
-    Ok(template)
-}
-
- async fn compile_path_async_io(
-    path: impl AsRef<std::path::Path>,
-) -> Result<Template, TemplateError> {
-    use tokio::fs::OpenOptions;
-    use tokio::io::AsyncReadExt;
-
-    let mut file = OpenOptions::new().read(true).open(path).await?;
-    let mut buf = String::new();
-    file.read_to_string(&mut buf).await?;
-
-    let template = Template::compile(&buf)?;
-    Ok(template)
-}
-
-pub fn new_registry<'a>(custom_templates_path: impl AsRef<Path>) -> io::Result<Handlebars<'a>> {
-    let mut reg = Handlebars::new();
-
-    for entry in TEMPLATES.entries() {
-        let file = match entry.as_file() {
-            Some(file) => file,
-            None => continue,
-        };
-
-        let span = info_span!("register_included_template", path = ?file.path());
-        let _handle = span.enter();
-
-        let name = match get_template_name(file.path()) {
-            Some(v) => v,
-            None => {
-                trace!("skipping file");
-                continue;
-            }
-        };
-
-        match register_included_file(file, name, &mut reg) {
-            Ok(()) => debug!("registered template {name:?}"),
-            Err(err) => error!("error while registering template: {err}"),
-        };
-    }
-
-    for entry in PARTIALS.entries() {
-        let file = match entry.as_file() {
-            Some(file) => file,
-            None => continue,
-        };
-
-        let span = info_span!("register_partial", path = ?file.path());
-        let _handle = span.enter();
-
-        let name = match get_template_name(file.path()) {
-            Some(v) => v,
-            None => {
-                trace!("skipping file");
-                continue;
-            }
-        };
-
-        match register_partial(file, name, &mut reg) {
-            Ok(()) => debug!("registered partial {name:?}"),
-            Err(err) => error!("error while registering partial: {err}"),
-        };
-    }
-
-    let read_dir = match std::fs::read_dir(custom_templates_path) {
-        Ok(v) => v,
-        Err(err) => match err.kind() {
-            io::ErrorKind::NotFound => return Ok(reg),
-            _ => panic!("{:?}", err),
-        },
-    };
-    for entry in read_dir {
-        let entry = entry.unwrap();
-
-        let file_type = entry.file_type()?;
-        if !file_type.is_file() {
-            continue;
-        }
-
-        let path = entry.path();
-
-        let span = info_span!("register_custom_template", ?path);
-        let _handle = span.enter();
-
-        let name = match get_template_name(&path) {
-            Some(v) => v,
-            None => {
-                trace!("skipping file");
-                continue;
-            }
-        };
-
-        match register_path(&path, name, &mut reg) {
-            Ok(()) => debug!("registered template {name:?}"),
-            Err(err) => error!("error while registering template: {err}"),
-        };
-    }
-
-    Ok(reg)
-}

src/templates/watcher.rs

@@ -1,126 +0,0 @@
-use std::path::Path;
-use std::sync::Arc;
-use std::time::Duration;
-
-use handlebars::{Handlebars, Template};
-use notify_debouncer_full::notify::{self, Watcher};
-use notify_debouncer_full::{new_debouncer, DebouncedEvent};
-use tokio::select;
-use tokio::sync::RwLock;
-use tokio_util::sync::CancellationToken;
-use tracing::{debug, error, info, trace, trace_span};
-
-use crate::templates::*;
-
-async fn process_event(
-    event: DebouncedEvent,
-    templates: &mut Vec<(String, Template)>,
-) -> Result<(), Box<dyn std::error::Error>> {
-    match event.kind {
-        notify::EventKind::Create(notify::event::CreateKind::File)
-        | notify::EventKind::Modify(_) => {
-            for path in &event.paths {
-                let span = trace_span!("modify_event", ?path);
-                let _handle = span.enter();
-
-                let template_name = match get_template_name(path) {
-                    Some(v) => v,
-                    None => {
-                        trace!("skipping event");
-                        continue;
-                    }
-                };
-
-                trace!("processing recompilation");
-                let compiled = compile_path_async_io(path).await?;
-                trace!("compiled template {template_name:?}");
-                templates.push((template_name.to_owned(), compiled));
-            }
-        }
-        notify::EventKind::Remove(notify::event::RemoveKind::File) => {
-            for path in &event.paths {
-                let span = trace_span!("remove_event", ?path);
-                let _handle = span.enter();
-
-                let (file_name, template_name) = match path
-                    .file_name()
-                    .and_then(|o| o.to_str())
-                    .and_then(|file_name| {
-                        get_template_name(Path::new(file_name))
-                            .map(|template_name| (file_name, template_name))
-                    }) {
-                    Some(v) => v,
-                    None => {
-                        trace!("skipping event");
-                        continue;
-                    }
-                };
-
-                trace!("processing removal");
-                let file = TEMPLATES.get_file(file_name);
-                if let Some(file) = file {
-                    let compiled = compile_included_file(file)?;
-                    trace!("compiled template {template_name:?}");
-                    templates.push((template_name.to_owned(), compiled));
-                }
-            }
-        }
-        _ => {}
-    };
-
-    Ok(())
-}
-
-pub async fn watch_templates<'a>(
-    path: impl AsRef<Path>,
-    watcher_token: CancellationToken,
-    reg: Arc<RwLock<Handlebars<'a>>>,
-) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
-    let path = path.as_ref();
-
-    let (tx, mut rx) = tokio::sync::mpsc::channel(1);
-
-    let mut debouncer = new_debouncer(Duration::from_millis(100), None, move |events| {
-        tx.blocking_send(events)
-            .expect("failed to send message over channel")
-    })?;
-
-    debouncer
-        .watcher()
-        .watch(path, notify::RecursiveMode::NonRecursive)?;
-
-    'event_loop: while let Some(events) = select! {
-        _ = watcher_token.cancelled() => {
-            debug!("exiting watcher loop");
-            break 'event_loop;
-        },
-        events = rx.recv() => events
-    } {
-        let events = match events {
-            Ok(events) => events,
-            Err(err) => {
-                error!("error getting events: {err:?}");
-                continue;
-            }
-        };
-
-        let mut templates = Vec::new();
-
-        for event in events {
-            trace!("file event: {event:?}");
-            if let Err(err) = process_event(event, &mut templates).await {
-                error!("error while processing event: {err}");
-            }
-        }
-
-        let mut reg = reg.write().await;
-        for template in templates.into_iter() {
-            debug!("registered template {}", template.0);
-            reg.register_template(&template.0, template.1);
-        }
-        drop(reg);
-        info!("updated custom templates");
-    }
-
-    Ok(())
-}

static/date.js

@@ -1,7 +0,0 @@
-function replaceDates() {
-	for (let el of document.querySelectorAll(".date-rfc3339")) {
-		let date = new Date(Date.parse(el.textContent));
-		el.textContent = date.toLocaleString();
-		el.classList.remove("date-rfc3339");
-	}
-}

static/main.js

@@ -1,12 +0,0 @@
-replaceDates();
-
-let form = document.getElementById("sort");
-if (form) {
-	form.style.display = "block";
-	let postsByDate = document.getElementById("posts");
-	let postsByName = document.createElement("div");
-	populateByName(postsByDate, postsByName);
-	postsByDate.parentNode.appendChild(postsByName);
-	handleSort(form, postsByDate, postsByName);
-	sort(form.sort.value, postsByDate, postsByName);
-}

static/post.css

@@ -54,22 +54,3 @@ th,
 td:nth-child(1) {
 	word-break: keep-all;
 }
-
-blockquote {
-	margin-left: 1em;
-	padding-left: 1.5em;
-	border-left: 0.5em solid;
-	border-color: var(--blue);
-	& > blockquote {
-		border-color: var(--mauve);
-		& > blockquote {
-			border-color: var(--pink);
-			& > blockquote {
-				border-color: var(--rosewater);
-				& > blockquote {
-					border-color: var(--text);
-				}
-			}
-		}
-	}
-}

static/sort.js

@@ -1,32 +0,0 @@
-function populateByName(source, target) {
-	let posts = [];
-	for (let post of source.children) {
-		let title = post.firstElementChild.innerText;
-		posts.push([title, post.cloneNode(true)]);
-	}
-	posts.sort(([a, _1], [b, _2]) => a.toLocaleLowerCase().localeCompare(b.toLocaleLowerCase()));
-	for (let [_, post] of posts) {
-		target.appendChild(post);
-	}
-}
-
-function sort(by, dateEl, nameEl) {
-	console.log("sorting by", by);
-	switch (by) {
-		case "date":
-			dateEl.style.display = "block";
-			nameEl.style.display = "none";
-			break;
-		case "name":
-			nameEl.style.display = "block";
-			dateEl.style.display = "none";
-			break;
-	}
-}
-
-function handleSort(form, dateEl, nameEl) {
-	for (let el of form.sort)
-		el.addEventListener("change", () => {
-			if (el.checked) sort(el.value, dateEl, nameEl);
-		});
-}

static/style.css

@@ -1,5 +1,4 @@
-/* colors from catppuccin https://github.com/catppuccin/catppuccin
+/* colors */
-   licensed under the MIT license, available in the source tree    */
 :root {
 	--base: #1e1e2e;
 	--text: #cdd6f4;
@@ -85,39 +84,6 @@ div.post {
 	margin-bottom: 1em;
 }
 
-.table {
-	display: grid;
-	/*grid-template-columns: auto auto auto;
-	grid-template-rows: auto auto;*/
-	width: max-content;
-}
-
-.table > :not(.value)::after {
-	content: ":";
-}
-
-.table > .value {
-	margin-left: 1em;
-	grid-column: 2;
-}
-
-.table > .created {
-	grid-row: 1;
-}
-
-.table > .modified {
-	grid-row: 2;
-}
-
-.table > .tags {
-	grid-row: 3;
-}
-
-#sort {
-	display: inline-block;
-	margin-bottom: 1rem;
-}
-
 /* BEGIN cool effect everyone liked */
 
 body {

templates/index.hbs

@@ -1,63 +0,0 @@
-<html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<meta name="description" content="{{title}}" />
-		<meta property="og:title" content="{{title}}" />
-		<meta property="og:description" content="{{description}}" />
-		<meta name="keywords" content="{{joined_tags}}" />
-		{{#if (ne color null)}}
-			<meta name="theme-color" content="{{style.color}}" />
-		{{/if}}
-		<title>{{title}}</title>
-		<link rel="stylesheet" href="/static/style.css" />
-		{{#if rss}}
-			<link rel="alternate" type="application/rss+xml" title="{{title}}" href="/feed.xml" />
-		{{/if}}
-		{{#if js}}
-			<script src="/static/date.js" defer></script>
-			<script src="/static/sort.js" defer></script>
-			<script src="/static/main.js" defer></script>
-		{{/if}}
-	</head>
-	<body>
-		<main>
-			<h1>{{title}}</h1>
-			<p>{{description}}</p>
-			<h2>posts</h2>
-			<div>
-				{{#if js}}
-					<form id="sort" style="display: none">
-						sort by: {{sort}}
-						<br />
-						<input type="radio" name="sort" id="sort-date" value="date" {{#if (eq style.default_sort "date")}}checked{{/if}} />
-						<label for="sort-date">date</label>
-						<input type="radio" name="sort" id="sort-name" value="name" {{#if (eq style.default_sort "name")}}checked{{/if}} />
-						<label for="sort-name">name</label>
-					</form>
-				{{/if}}
-				{{#each posts}}
-					<div id="posts">
-						<div class="post">
-							<a href="/posts/{{name}}"><b>{{title}}</b></a>
-							<span class="post-author">- by {{author}}</span>
-							<br />
-							{{description}}<br />
-							{{>post_table post style=@root.style}}
-						</div>
-					</div>
-				{{else}} there are no posts right now. check back later! {{/each}}
-			</div>
-
-			{{#if (gt (len tags) 0)}}
-				<h2>tags</h2>
-				<b><a href="/">clear tags</a></b>
-				<br />
-			{{/if}}
-			{{#each tags}}
-				<a href="/?tag={{@key}}" title="view all posts with this tag">{{@key}}</a>
-				<span class="post-author">- {{this}} post{{#if (ne this 1)}}s{{/if}}</span><br />
-			{{/each}}
-		</main>
-	</body>
-</html>

templates/index.html

@@ -0,0 +1,43 @@
+{%- import "macros.askama" as macros -%}
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta name="description" content="{{ title }}" />
+		<meta property="og:title" content="{{ title }}" />
+		<meta property="og:description" content="{{ description }}" />
+		<title>{{ title }}</title>
+		<link rel="stylesheet" href="/static/style.css" />
+	</head>
+	<body>
+		<main>
+			<h1>{{ title }}</h1>
+			<p>{{ description }}</p>
+			<h2>posts</h2>
+			<!-- prettier-ignore -->
+			<div>
+				{% if posts.is_empty() %}
+				there are no posts right now. check back later!
+				{% endif %}<!-- prettier-br -->
+				{% for post in posts %}
+				<div class="post">
+					<a href="/posts/{{ post.name }}"><b>{{ post.title }}</b></a>
+					<span class="post-author">- by {{ post.author }}</span>
+					<br />
+					{{ post.description }}<br />
+					{% call macros::table(post) %}
+				</div>
+				{% endfor %}
+			</div>
+			{% let tags = posts|collect_tags %}<!-- prettier-br -->
+			{% if !tags.is_empty() %}
+			<h2>tags</h2>
+			{% endif %}<!-- prettier-br -->
+			{% for tag in tags %}
+			<a href="/?tag={{ tag.0 }}" title="view all posts with this tag">{{ tag.0 }}</a>
+			<span class="post-author">- {{ tag.1 }} post{% if tag.1 != 1 %}s{%endif %}</span><br />
+			{% endfor %}
+		</main>
+	</body>
+</html>

templates/macros.askama

@@ -0,0 +1,19 @@
+{% macro table(post) %}
+    {% match post.created_at %}
+        {% when Some(created_at) %}
+            written:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {{ created_at|date }}<br />
+        {% when None %}
+    {% endmatch %}
+    {% match post.modified_at %}
+        {% when Some(modified_at) %}
+            last modified: {{ modified_at|date }}<br />
+        {% when None %}
+    {% endmatch %}
+
+    {% if !post.tags.is_empty() %}
+        tags:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        {% for tag in post.tags %}
+            <a href="/?tag={{ tag }}" title="view all posts with this tag">{{ tag }}</a>
+        {% endfor %}<br />
+    {% endif %}
+{% endmacro %}

templates/post.hbs

@@ -1,71 +0,0 @@
-<html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<meta name="author" content="{{meta.author}}" />
-		<meta name="keywords" content="{{joined_tags}}" />
-		<meta name="description" content="{{meta.title}}" />
-		<!-- you know what I really love? platforms like discord
-			favoring twitter embeds over the open standard. to color
-			your embed or have large images, you have to do _this_. lmao -->
-		<meta property="og:title" content="{{meta.title}}" />
-		<meta property="twitter:title" content="{{meta.title}}" />
-		<meta property="og:description" content="{{meta.description}}" />
-		<meta property="twitter:description" content="{{meta.description}}" />
-		{{#if (ne meta.icon null)}}
-			<meta property="og:image" content="{{meta.icon}}" />
-			<meta name="twitter:card" content="summary_large_image" />
-			<meta property="twitter:image:src" content="{{meta.icon}}" />
-			{{#if (ne meta.icon_alt null)}}
-				<meta property="og:image:alt" content="{{meta.icon_alt}}" />
-				<meta property="twitter:image:alt" content="{{meta.icon_alt}}" />
-			{{/if}}{{/if}}
-		{{#if (ne color null)}}
-			<meta name="theme-color" content="{{color}}" />
-		{{/if}}
-		<title>{{meta.title}}</title>
-		<link rel="stylesheet" href="/static/style.css" />
-		<link rel="stylesheet" href="/static/post.css" />
-		<link rel="stylesheet" href="/static/custom/style.css" />
-		<link rel="stylesheet" href="/static/custom/post.css" />
-		{{#if js}}
-			<script src="/static/date.js" defer></script>
-			<script src="/static/main.js" defer></script>
-		{{/if}}
-	</head>
-	<body>
-		<main>
-			<h1 class="post-title">
-				{{meta.title}}
-				<span class="post-author">- by {{meta.author}}</span>
-			</h1>
-			<p class="post-desc">{{meta.description}}</p>
-			<div class="post">
-				{{>post_table meta style=@root.style}}
-				<a href="/posts/{{meta.name}}">link</a><br />
-				<a href="/">back to home</a>
-			</div>
-			<hr />
-			{{{rendered}}}
-		</main>
-		<footer>
-			{{#each rendered_in}}
-				{{#if (eq @key "ParsedAndRendered")}}
-					<span class="tooltipped" title="parsing took {{duration this.[1]}}">parsed</span>
-					and
-					<span class="tooltipped" title="rendering took {{duration this.[2]}}">rendered</span>
-					in
-					{{duration this.[0]}}
-
-				{{else if (eq @key "Cached")}}
-					retrieved from cache in
-					{{duration this}}
-				{{/if}}
-			{{/each}}
-			{{#if markdown_access}}
-				-
-				<a href="/posts/{{meta.name}}.md">view raw</a>
-			{{/if}}
-		</footer>
-	</body>
-</html>

templates/post.html

@@ -0,0 +1,52 @@
+{%- import "macros.askama" as macros -%}
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<head>
+			<meta charset="UTF-8" />
+			<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+			<meta name="description" content="{{ meta.title }}" />
+			<meta property="og:title" content="{{ meta.title }}" />
+			<meta property="og:description" content="{{ meta.description }}" />
+			{% match meta.icon %} {% when Some with (url) %}
+			<meta property="og:image" content="{{ url }}" />
+			<link rel="shortcut icon" href="{{ url }}" />
+			{% when None %} {% endmatch %}
+			<title>{{ meta.title }}</title>
+			<link rel="stylesheet" href="/static/style.css" />
+			<link rel="stylesheet" href="/static/post.css" />
+		</head>
+	</head>
+	<body>
+		<main>
+			<h1 class="post-title">
+				{{ meta.title }}
+				<span class="post-author">- by {{ meta.author }}</span>
+			</h1>
+			<p class="post-desc">{{ meta.description }}</p>
+			<div class="" post>
+				<!-- prettier-ignore -->
+				<div>
+				{% call macros::table(meta) %}
+				</div>
+				<a href="/posts/{{ meta.name }}">link</a><br />
+				<a href="/">back to home</a>
+			</div>
+			<hr />
+			{{ rendered|escape("none") }}
+		</main>
+		<!-- prettier-ignore -->
+		<footer>
+		{% match rendered_in %}
+		{% when RenderStats::ParsedAndRendered(total, parsing, rendering) %}
+			<span class="tooltipped" title="parsing took {{ parsing|duration }}">parsed</span> and
+			<span class="tooltipped" title="rendering took {{ rendering|duration }}">rendered</span> in {{ total|duration }}
+		{% when RenderStats::Cached(total) %}
+			retrieved from cache in {{ total|duration }}
+		{% endmatch %}
+		{% if markdown_access %}
+			- <a href="/posts/{{ meta.name }}.md">view raw</a>
+		{% endif %}
+		</footer>
+	</body>
+</html>