From 9f341d439f7aa5fd2365024169ead2d6bdc3210c Mon Sep 17 00:00:00 2001 From: "Adam T. Carpenter" Date: Sat, 14 Sep 2024 20:30:05 -0400 Subject: feat: rewrite complete --- src/posts/abstractions.rs | 2 ++ src/posts/abstractions/post.rs | 6 ++++++ src/posts/abstractions/repo.rs | 5 +++++ src/posts/fs_post.rs | 24 ++++++++++++++++++++++++ src/posts/fs_post_repo.rs | 23 +++++++++++++++++++++++ 5 files changed, 60 insertions(+) create mode 100644 src/posts/abstractions.rs create mode 100644 src/posts/abstractions/post.rs create mode 100644 src/posts/abstractions/repo.rs create mode 100644 src/posts/fs_post.rs create mode 100644 src/posts/fs_post_repo.rs (limited to 'src/posts') diff --git a/src/posts/abstractions.rs b/src/posts/abstractions.rs new file mode 100644 index 0000000..96c8ced --- /dev/null +++ b/src/posts/abstractions.rs @@ -0,0 +1,2 @@ +pub mod post; +pub mod repo; diff --git a/src/posts/abstractions/post.rs b/src/posts/abstractions/post.rs new file mode 100644 index 0000000..6d504db --- /dev/null +++ b/src/posts/abstractions/post.rs @@ -0,0 +1,6 @@ +use std::{borrow::Cow, fmt}; + +pub trait Post: fmt::Debug { + fn get_title(&self) -> &str; + fn get_article(&self) -> Cow; +} diff --git a/src/posts/abstractions/repo.rs b/src/posts/abstractions/repo.rs new file mode 100644 index 0000000..6fcb385 --- /dev/null +++ b/src/posts/abstractions/repo.rs @@ -0,0 +1,5 @@ +use crate::posts::abstractions::post::Post; + +pub trait PostRepo { + fn load(&self) -> impl IntoIterator; +} diff --git a/src/posts/fs_post.rs b/src/posts/fs_post.rs new file mode 100644 index 0000000..e767803 --- /dev/null +++ b/src/posts/fs_post.rs @@ -0,0 +1,24 @@ +use crate::posts::abstractions::post::Post; +use std::{borrow::Cow, fs, path::PathBuf}; + +#[derive(Debug)] +pub struct FsPost { + file: PathBuf, +} + +impl FsPost { + pub fn with_path(path: PathBuf) -> Self { + Self { file: path } + } +} + +impl Post for FsPost { + fn get_title(&self) -> &str { + self.file.file_name().unwrap().to_str().unwrap() + } + + fn get_article(&self) -> Cow { + let article = fs::read_to_string(&self.file).unwrap(); + Cow::Owned(article) + } +} diff --git a/src/posts/fs_post_repo.rs b/src/posts/fs_post_repo.rs new file mode 100644 index 0000000..eb37a6a --- /dev/null +++ b/src/posts/fs_post_repo.rs @@ -0,0 +1,23 @@ +use crate::posts::abstractions::repo::PostRepo; +use crate::posts::fs_post::FsPost; +use std::{fs, path::PathBuf}; + +pub struct FsPostRepo { + dir: PathBuf, +} + +impl FsPostRepo { + pub fn with_dir(path: impl Into) -> Self { + Self { dir: path.into() } + } +} + +impl PostRepo for FsPostRepo { + fn load(&self) -> impl IntoIterator { + let files = fs::read_dir(&self.dir).unwrap(); + files + .flatten() + .filter(|d| !d.file_name().to_string_lossy().starts_with('.')) + .map(|d| FsPost::with_path(d.path())) + } +} -- cgit v1.2.3 From 18339f611fd17e1300593edd65adf7604a39ad72 Mon Sep 17 00:00:00 2001 From: "Adam T. Carpenter" Date: Sat, 14 Sep 2024 20:54:44 -0400 Subject: feat: working rudimentary blog presentation --- src/posts/abstractions/repo.rs | 1 + src/posts/fs_post.rs | 2 +- src/posts/fs_post_repo.rs | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'src/posts') diff --git a/src/posts/abstractions/repo.rs b/src/posts/abstractions/repo.rs index 6fcb385..6fd5d08 100644 --- a/src/posts/abstractions/repo.rs +++ b/src/posts/abstractions/repo.rs @@ -2,4 +2,5 @@ use crate::posts::abstractions::post::Post; pub trait PostRepo { fn load(&self) -> impl IntoIterator; + fn by_id(&self, post_id: &str) -> impl Post; } diff --git a/src/posts/fs_post.rs b/src/posts/fs_post.rs index e767803..f83ff4a 100644 --- a/src/posts/fs_post.rs +++ b/src/posts/fs_post.rs @@ -14,7 +14,7 @@ impl FsPost { impl Post for FsPost { fn get_title(&self) -> &str { - self.file.file_name().unwrap().to_str().unwrap() + self.file.file_stem().unwrap().to_str().unwrap() } fn get_article(&self) -> Cow { diff --git a/src/posts/fs_post_repo.rs b/src/posts/fs_post_repo.rs index eb37a6a..13f797b 100644 --- a/src/posts/fs_post_repo.rs +++ b/src/posts/fs_post_repo.rs @@ -1,3 +1,4 @@ +use crate::posts::abstractions::post::Post; use crate::posts::abstractions::repo::PostRepo; use crate::posts::fs_post::FsPost; use std::{fs, path::PathBuf}; @@ -20,4 +21,12 @@ impl PostRepo for FsPostRepo { .filter(|d| !d.file_name().to_string_lossy().starts_with('.')) .map(|d| FsPost::with_path(d.path())) } + + fn by_id(&self, post_id: &str) -> FsPost { + let posts = self.load(); + posts + .into_iter() + .find(|p| p.get_title() == post_id) + .unwrap() + } } -- cgit v1.2.3 From aad33fee01abe817d82c094f83ffd44ca36c8456 Mon Sep 17 00:00:00 2001 From: "Adam T. Carpenter" Date: Sat, 14 Sep 2024 21:11:51 -0400 Subject: feat: reverse sort posts by modify datetime --- src/posts/abstractions/post.rs | 2 +- src/posts/fs_post.rs | 25 ++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) (limited to 'src/posts') diff --git a/src/posts/abstractions/post.rs b/src/posts/abstractions/post.rs index 6d504db..a941281 100644 --- a/src/posts/abstractions/post.rs +++ b/src/posts/abstractions/post.rs @@ -1,6 +1,6 @@ use std::{borrow::Cow, fmt}; -pub trait Post: fmt::Debug { +pub trait Post: fmt::Debug + Ord { fn get_title(&self) -> &str; fn get_article(&self) -> Cow; } diff --git a/src/posts/fs_post.rs b/src/posts/fs_post.rs index f83ff4a..8b8e725 100644 --- a/src/posts/fs_post.rs +++ b/src/posts/fs_post.rs @@ -1,7 +1,7 @@ use crate::posts::abstractions::post::Post; use std::{borrow::Cow, fs, path::PathBuf}; -#[derive(Debug)] +#[derive(Debug, Eq)] pub struct FsPost { file: PathBuf, } @@ -22,3 +22,26 @@ impl Post for FsPost { Cow::Owned(article) } } + +impl Ord for FsPost { + fn cmp(&self, other: &Self) -> std::cmp::Ordering { + self.file + .metadata() + .unwrap() + .modified() + .unwrap() + .cmp(&other.file.metadata().unwrap().modified().unwrap()) + } +} + +impl PartialOrd for FsPost { + fn partial_cmp(&self, other: &Self) -> Option { + Some(self.cmp(other)) + } +} + +impl PartialEq for FsPost { + fn eq(&self, other: &Self) -> bool { + self.get_title() == other.get_title() + } +} -- cgit v1.2.3