Anri/mylloon.fr
1
0
Fork 0
Code Issues 21 Pull requests 2 Releases Packages 1 Activity Actions

feat: allow subdirs in posts directory #86

Merged
Anri merged 4 commits from posts-subdir into main 2024-11-14 17:48:08 +01:00
Conversation 0 Commits 4 Files changed 9 +21 -19
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e8f69a34b1 - Show all commits

40
src/utils/routes/blog.rs
View file

@ -71,31 +71,33 @@ pub fn get_posts(location: &str) -> Vec<Post> {
let filename = fname.to_string_lossy(); let filename = fname.to_string_lossy();
let file_without_ext = filename.split_at(filename.len() - 3).0; let file_without_ext = filename.split_at(filename.len() - 3).0;
let file_metadata = std::fs::read_to_string(format!("{location}/{filename}")) let file_metadata = std::fs::read_to_string(f.path()).map_or_else(
.map_or_else( |_| FileMetadataBlog {
|_| FileMetadataBlog { title: Some(file_without_ext.into()),
title: Some(file_without_ext.into()), ..FileMetadataBlog::default()
..FileMetadataBlog::default() },
}, |text| {
|text| { let arena = Arena::new();
let arena = Arena::new();
let options = get_options(); let options = get_options();
let root = parse_document(&arena, &text, &options); let root = parse_document(&arena, &text, &options);
let mut metadata = get(root, MType::Blog).blog.unwrap(); let mut metadata = get(root, MType::Blog).blog.unwrap();
// Always have a title // Always have a title
metadata.title = metadata metadata.title = metadata
.title .title
.map_or_else(|| Some(file_without_ext.into()), Some); .map_or_else(|| Some(file_without_ext.into()), Some);
metadata metadata
}, },
); );
if file_metadata.publish == Some(true) && file_metadata.draft != Some(true) { if file_metadata.publish == Some(true) && file_metadata.draft != Some(true) {
let url =
f.path().to_string_lossy().strip_prefix(location).unwrap()[1..].to_owned();
Some(Post { Some(Post {
url: file_without_ext.into(), url: url[..url.len() - 3].to_owned(),
title: file_metadata.title.unwrap(), title: file_metadata.title.unwrap(),
date: file_metadata.date.unwrap_or({ date: file_metadata.date.unwrap_or({
let m = f.metadata().unwrap(); let m = f.metadata().unwrap();