feat: next-file & prev-file headers

Teajey · Feb 6, 2024 · 6e38104 · 6e38104
1 parent 1141288
commit 6e38104
Show file tree

Hide file tree

Showing 7 changed files with 441 additions and 167 deletions.
diff --git a/src/frontmatter_file.rs b/src/frontmatter_file.rs
@@ -9,11 +9,11 @@ pub use keeper::Keeper;
 
 #[derive(Debug, Clone, Serialize, PartialEq, Eq)]
 pub struct FrontmatterFile {
-    name: String,
-    frontmatter: Option<serde_yaml::Mapping>,
-    body: String,
-    modified: DateTime<Utc>,
-    created: DateTime<Utc>,
+    pub name: String,
+    pub frontmatter: Option<serde_yaml::Mapping>,
+    pub body: String,
+    pub modified: DateTime<Utc>,
+    pub created: DateTime<Utc>,
 }
 
 impl PartialOrd for FrontmatterFile {

diff --git a/src/frontmatter_file/keeper.rs b/src/frontmatter_file/keeper.rs
@@ -40,7 +40,7 @@ impl From<notify::EventKind> for FsEvent {
 }
 
 pub struct Keeper {
-    inner: HashMap<Utf8PathBuf, FrontmatterFile>,
+    pub inner: HashMap<Utf8PathBuf, FrontmatterFile>,
 }
 
 #[derive(Debug, thiserror::Error)]

diff --git a/src/frontmatter_query.rs b/src/frontmatter_query.rs
@@ -44,7 +44,7 @@ impl QueryValue {
 }
 
 #[derive(Deserialize, Debug)]
-pub struct FrontmatterQuery(HashMap<String, QueryValue>);
+pub struct FrontmatterQuery(pub HashMap<String, QueryValue>);
 
 impl FrontmatterQuery {
     pub fn is_subset(&self, json_frontmatter: &serde_json::Map<String, serde_json::Value>) -> bool {

diff --git a/src/main.rs b/src/main.rs
@@ -11,23 +11,7 @@ use axum::{
     routing, Json, Router,
 };
 use camino::Utf8PathBuf;
-use chrono::{DateTime, TimeZone};
 use notify::{RecursiveMode, Watcher};
-use serde_yaml::Mapping;
-
-fn get_sort_value<Tz: TimeZone>(
-    mapping: Option<&Mapping>,
-    sort_key: &str,
-    created: &DateTime<Tz>,
-) -> String {
-    mapping
-        .and_then(|m| m.get(sort_key))
-        .map(serde_yaml::to_string)
-        .transpose()
-        .ok()
-        .flatten()
-        .unwrap_or_else(|| serde_yaml::to_string(created).expect("DateTime<Utc> must serialize"))
-}
 
 async fn frontmatter_collate_strings_get(
     State(markdown_files): State<frontmatter_file::keeper::ArcMutex>,
@@ -86,7 +70,7 @@ async fn run() -> Result<()> {
         )
         .route(
             "/frontmatter/file/:name",
-            routing::get(route::frontmatter_file::get).post(route::frontmatter_file::post),
+            routing::post(route::frontmatter_file::post).get(route::frontmatter_file::get),
         )
         .route(
             "/frontmatter/collate_strings/:key",