kamov/website
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

refactor

Browse source
This commit is contained in:
Maciej Jur 2024-09-15 01:44:37 +02:00
parent 474d30c24d
commit a0df7388d8
Signed by: kamov
GPG key ID: 191CBFF5F72ECAFD
8 changed files with 270 additions and 241 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rustfmt.toml Normal file
View file

@ -0,0 +1,2 @@
tab_spaces = 4
hard_tabs = true

54
src/html/mod.rs
View file

@ -1,18 +1,17 @@
mod head;
mod home; mod home;
mod isodate; mod isodate;
mod list; mod list;
mod misc; mod misc;
mod post; pub mod post;
mod slideshow; pub mod slideshow;
mod special; pub mod wiki;
mod wiki;
mod head;
use std::collections::HashMap; use std::collections::HashMap;
use camino::{Utf8Path, Utf8PathBuf}; use camino::{Utf8Path, Utf8PathBuf};
use chrono::{DateTime, Datelike, Utc}; use chrono::{DateTime, Datelike, Utc};
use hauchiwa::{Bibliography, Content, Link, LinkDate, Linkable, Outline, Sack}; use hauchiwa::{Bibliography, Link, LinkDate, Linkable, Outline, Sack};
use hayagriva::Library; use hayagriva::Library;
use hypertext::{html_elements, maud, maud_move, GlobalAttributes, Raw, Renderable}; use hypertext::{html_elements, maud, maud_move, GlobalAttributes, Raw, Renderable};
@ -133,7 +132,6 @@ where
)) ))
} }
fn full<'s, 'p, 'html>( fn full<'s, 'p, 'html>(
sack: &'s Sack, sack: &'s Sack,
main: impl Renderable + 'p, main: impl Renderable + 'p,
@ -143,10 +141,7 @@ where
's: 'html, 's: 'html,
'p: 'html, 'p: 'html,
{ {
let main = maud_move!( let main = maud_move!((navbar())(main));
(navbar())
(main)
);
bare(sack, main, title, None) bare(sack, main, title, None)
} }
@ -161,11 +156,7 @@ where
's: 'html, 's: 'html,
'p: 'html, 'p: 'html,
{ {
let main = maud_move!( let main = maud_move!((navbar())(main)(footer(sack)));
(navbar())
(main)
(footer(sack))
);
bare(sack, main, title, js) bare(sack, main, title, js)
} }
@ -214,14 +205,13 @@ pub(crate) fn search<'s, 'html>(sack: &'s Sack) -> String {
main #app {} main #app {}
), ),
String::from("Search"), String::from("Search"),
Some(&["search".into()]) Some(&["search".into()]),
) )
.unwrap() .unwrap()
.render() .render()
.into() .into()
} }
/// Represents a simple post. /// Represents a simple post.
#[derive(Deserialize, Debug, Clone)] #[derive(Deserialize, Debug, Clone)]
pub(crate) struct Flox { pub(crate) struct Flox {
@ -231,36 +221,34 @@ pub(crate) struct Flox {
pub(crate) desc: Option<String>, pub(crate) desc: Option<String>,
} }
impl Content for Flox { pub fn parse_content(
fn parse_content(
content: &str, content: &str,
sack: &Sack, sack: &Sack,
path: &Utf8Path, path: &Utf8Path,
library: Option<&Library>, library: Option<&Library>,
) -> (String, Outline, Bibliography) { ) -> (String, Outline, Bibliography) {
crate::text::md::parse(content, sack, path, library) crate::text::md::parse(content, sack, path, library)
} }
fn as_html( pub fn as_html(
&self, meta: &Flox,
parsed: &str, parsed: &str,
sack: &Sack, sack: &Sack,
outline: Outline, outline: Outline,
bibliography: Bibliography, bibliography: Bibliography,
) -> String { ) -> String {
flox(&self.title, parsed, sack, outline, bibliography) flox(&meta.title, parsed, sack, outline, bibliography)
} }
fn as_link(&self, path: Utf8PathBuf) -> Option<Linkable> { pub fn as_link(meta: &Flox, path: Utf8PathBuf) -> Option<Linkable> {
Some(Linkable::Date(LinkDate { Some(Linkable::Date(LinkDate {
link: Link { link: Link {
path, path,
name: self.title.to_owned(), name: meta.title.to_owned(),
desc: self.desc.to_owned(), desc: meta.desc.to_owned(),
}, },
date: self.date.to_owned(), date: meta.date.to_owned(),
})) }))
}
} }
pub(crate) fn flox<'p, 's, 'html>( pub(crate) fn flox<'p, 's, 'html>(
@ -293,7 +281,7 @@ pub(crate) fn flox<'p, 's, 'html>(
} }
), ),
String::from("Flox"), String::from("Flox"),
Some(&["editor".into()]) Some(&["editor".into()]),
) )
.unwrap() .unwrap()
.render() .render()

38
src/html/post.rs
View file

@ -1,53 +1,51 @@
use camino::{Utf8Path, Utf8PathBuf}; use camino::{Utf8Path, Utf8PathBuf};
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use hauchiwa::{Bibliography, Content, Link, LinkDate, Linkable, Outline, Sack}; use hauchiwa::{Bibliography, Link, LinkDate, Linkable, Outline, Sack};
use hayagriva::Library; use hayagriva::Library;
use hypertext::{html_elements, maud_move, GlobalAttributes, Raw, Renderable}; use hypertext::{html_elements, maud_move, GlobalAttributes, Raw, Renderable};
use serde::Deserialize; use serde::Deserialize;
/// Represents a simple post. /// Represents a simple post.
#[derive(Deserialize, Debug, Clone)] #[derive(Deserialize, Debug, Clone)]
pub(crate) struct Post { pub struct Post {
pub(crate) title: String, pub title: String,
#[serde(with = "super::isodate")] #[serde(with = "super::isodate")]
pub(crate) date: DateTime<Utc>, pub date: DateTime<Utc>,
pub(crate) desc: Option<String>, pub desc: Option<String>,
pub(crate) scripts: Option<Vec<String>>, pub scripts: Option<Vec<String>>,
} }
impl Content for Post { pub fn parse_content(
fn parse_content(
content: &str, content: &str,
sack: &Sack, sack: &Sack,
path: &Utf8Path, path: &Utf8Path,
library: Option<&Library>, library: Option<&Library>,
) -> (String, Outline, Bibliography) { ) -> (String, Outline, Bibliography) {
crate::text::md::parse(content, sack, path, library) crate::text::md::parse(content, sack, path, library)
} }
fn as_html( pub fn as_html(
&self, meta: &Post,
parsed: &str, parsed: &str,
sack: &Sack, sack: &Sack,
outline: Outline, outline: Outline,
bibliography: Bibliography, bibliography: Bibliography,
) -> String { ) -> String {
post(self, parsed, sack, outline, bibliography) post(meta, parsed, sack, outline, bibliography)
.unwrap() .unwrap()
.render() .render()
.into() .into()
} }
fn as_link(&self, path: Utf8PathBuf) -> Option<Linkable> { pub fn as_link(meta: &Post, path: Utf8PathBuf) -> Option<Linkable> {
Some(Linkable::Date(LinkDate { Some(Linkable::Date(LinkDate {
link: Link { link: Link {
path, path,
name: self.title.to_owned(), name: meta.title.to_owned(),
desc: self.desc.to_owned(), desc: meta.desc.to_owned(),
}, },
date: self.date.to_owned(), date: meta.date.to_owned(),
})) }))
}
} }
pub fn post<'s, 'p, 'html>( pub fn post<'s, 'p, 'html>(

32
src/html/slideshow.rs
View file

@ -1,6 +1,6 @@
use camino::{Utf8Path, Utf8PathBuf}; use camino::{Utf8Path, Utf8PathBuf};
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use hauchiwa::{Bibliography, Content, Link, LinkDate, Linkable, Outline, Sack}; use hauchiwa::{Bibliography, Link, LinkDate, Linkable, Outline, Sack};
use hayagriva::Library; use hayagriva::Library;
use hypertext::{html_elements, maud, GlobalAttributes, Raw, Renderable}; use hypertext::{html_elements, maud, GlobalAttributes, Raw, Renderable};
use serde::Deserialize; use serde::Deserialize;
@ -22,13 +22,12 @@ pub(crate) struct Slideshow {
pub desc: Option<String>, pub desc: Option<String>,
} }
impl Content for Slideshow { pub fn parse_content(
fn parse_content(
content: &str, content: &str,
sack: &Sack, sack: &Sack,
path: &Utf8Path, path: &Utf8Path,
library: Option<&Library>, library: Option<&Library>,
) -> (String, Outline, Bibliography) { ) -> (String, Outline, Bibliography) {
let parsed = content let parsed = content
.split("\n-----\n") .split("\n-----\n")
.map(|chunk| { .map(|chunk| {
@ -49,22 +48,27 @@ impl Content for Slideshow {
}) })
.collect::<String>(); .collect::<String>();
(parsed, Outline(vec![]), Bibliography(None)) (parsed, Outline(vec![]), Bibliography(None))
} }
fn as_html(&self, parsed: &str, sack: &Sack, _: Outline, _: Bibliography) -> String { pub fn as_html(
show(self, sack, parsed) slides: &Slideshow,
} parsed: &str,
sack: &Sack,
_: Outline,
_: Bibliography,
) -> String {
show(slides, sack, parsed)
}
fn as_link(&self, path: Utf8PathBuf) -> Option<Linkable> { pub fn as_link(slides: &Slideshow, path: Utf8PathBuf) -> Option<Linkable> {
Some(Linkable::Date(LinkDate { Some(Linkable::Date(LinkDate {
link: Link { link: Link {
path, path,
name: self.title.to_owned(), name: slides.title.to_owned(),
desc: self.desc.to_owned(), desc: slides.desc.to_owned(),
}, },
date: self.date.to_owned(), date: slides.date.to_owned(),
})) }))
}
} }
pub fn show(fm: &Slideshow, sack: &Sack, slides: &str) -> String { pub fn show(fm: &Slideshow, sack: &Sack, slides: &str) -> String {
@ -80,7 +84,7 @@ pub fn show(fm: &Slideshow, sack: &Sack, slides: &str) -> String {
style { (Raw(CSS)) } style { (Raw(CSS)) }
), ),
fm.title.clone(), fm.title.clone(),
Some(&["reveal".into()]) Some(&["reveal".into()]),
) )
.unwrap() .unwrap()
.render() .render()

0
src/html/special.rs
View file

24
src/html/wiki.rs
View file

@ -1,5 +1,5 @@
use camino::{Utf8Path, Utf8PathBuf}; use camino::{Utf8Path, Utf8PathBuf};
use hauchiwa::{Bibliography, Content, Link, Linkable, Outline, Sack}; use hauchiwa::{Bibliography, Link, Linkable, Outline, Sack};
use hayagriva::Library; use hayagriva::Library;
use hypertext::{html_elements, maud_move, GlobalAttributes, Raw, Renderable}; use hypertext::{html_elements, maud_move, GlobalAttributes, Raw, Renderable};
use serde::Deserialize; use serde::Deserialize;
@ -10,33 +10,31 @@ pub struct Wiki {
pub title: String, pub title: String,
} }
impl Content for Wiki { pub fn parse_content(
fn parse_content(
content: &str, content: &str,
sack: &Sack, sack: &Sack,
path: &Utf8Path, path: &Utf8Path,
library: Option<&Library>, library: Option<&Library>,
) -> (String, Outline, Bibliography) { ) -> (String, Outline, Bibliography) {
crate::text::md::parse(content, sack, path, library) crate::text::md::parse(content, sack, path, library)
} }
fn as_html( pub fn as_html(
&self, meta: &Wiki,
parsed: &str, parsed: &str,
sack: &Sack, sack: &Sack,
outline: Outline, outline: Outline,
bibliography: Bibliography, bibliography: Bibliography,
) -> String { ) -> String {
wiki(self, parsed, sack, outline, bibliography) wiki(meta, parsed, sack, outline, bibliography)
} }
fn as_link(&self, path: Utf8PathBuf) -> Option<Linkable> { pub fn as_link(meta: &Wiki, path: Utf8PathBuf) -> Option<Linkable> {
Some(Linkable::Link(Link { Some(Linkable::Link(Link {
path, path,
name: self.title.to_owned(), name: meta.title.to_owned(),
desc: None, desc: None,
})) }))
}
} }
fn wiki( fn wiki(

59
src/main.rs
View file

@ -3,7 +3,7 @@ mod text;
mod ts; mod ts;
use clap::{Parser, ValueEnum}; use clap::{Parser, ValueEnum};
use hauchiwa::Website; use hauchiwa::{Loader, Processor, Website};
use html::{Flox, Post, Slideshow, Wiki}; use html::{Flox, Post, Slideshow, Wiki};
use hypertext::Renderable; use hypertext::Renderable;
@ -22,12 +22,48 @@ enum Mode {
fn main() { fn main() {
let args = Args::parse(); let args = Args::parse();
let processor_post = Processor {
read_content: crate::html::post::parse_content,
to_html: crate::html::post::as_html,
to_link: crate::html::post::as_link,
};
let processor_slideshow = Processor {
read_content: crate::html::slideshow::parse_content,
to_html: crate::html::slideshow::as_html,
to_link: crate::html::slideshow::as_link,
};
let processor_wiki = Processor {
read_content: crate::html::wiki::parse_content,
to_html: crate::html::wiki::as_html,
to_link: crate::html::wiki::as_link,
};
let processor_flox = Processor {
read_content: crate::html::parse_content,
to_html: crate::html::as_html,
to_link: crate::html::as_link,
};
let website = Website::design() let website = Website::design()
.content::<Post>("content/about.md", ["md"].into()) .add_loaders(vec![
.content::<Post>("content/posts/**/*", ["md", "mdx"].into()) Loader::glob_with::<Post>("content", "about.md", ["md"].into(), processor_post.clone()),
.content::<Slideshow>("content/slides/**/*", ["md", "lhs"].into()) Loader::glob_with::<Post>(
.content::<Wiki>("content/wiki/**/*", ["md"].into()) "content",
.content::<Flox>("content/projects/flox.md", ["md"].into()) "posts/**/*",
["md", "mdx"].into(),
processor_post.clone(),
),
Loader::glob_with::<Slideshow>(
"content",
"slides/**/*",
["md", "lhs"].into(),
processor_slideshow,
),
Loader::glob_with::<Wiki>("content", "wiki/**/*", ["md"].into(), processor_wiki),
Loader::glob_with::<Flox>("content", "projects/flox.md", ["md"].into(), processor_flox),
])
.js("search", "./js/search/dist/search.js") .js("search", "./js/search/dist/search.js")
.js("photos", "./js/vanilla/photos.js") .js("photos", "./js/vanilla/photos.js")
.js("reveal", "./js/vanilla/reveal.js") .js("reveal", "./js/vanilla/reveal.js")
@ -37,12 +73,15 @@ fn main() {
|sack| crate::html::map(sack).unwrap().render().to_owned().into(), |sack| crate::html::map(sack).unwrap().render().to_owned().into(),
"map/index.html".into(), "map/index.html".into(),
) )
.add_virtual(|sack| crate::html::search(sack), "search/index.html".into())
.add_virtual( .add_virtual(
|sack| crate::html::search(sack), |sack| {
"search/index.html".into(), crate::html::to_list(
sack,
sack.get_links("projects/**/*.html"),
"Projects".into(),
) )
.add_virtual( },
|sack| crate::html::to_list(sack, sack.get_links("projects/**/*.html"), "Projects".into()),
"projects/index.html".into(), "projects/index.html".into(),
) )
.add_virtual( .add_virtual(