zyl/webdog
1
0
Fork 0
mirror of https://github.com/zyllian/webdog.git synced 2025-05-10 02:26:42 -07:00
Code Issues Projects Releases Packages Wiki Activity

refactoring and new additions wheee

Browse source
This commit is contained in:
zyl 2023-11-13 18:14:40 -08:00
parent 94ba05daf2
commit 3a274932a8
No known key found for this signature in database
GPG key ID: 8611B896D1AAFAF2
10 changed files with 192 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/resource.rs
View file

@ -1,4 +1,5 @@
use std::{
cell::RefCell,
collections::BTreeMap,
marker::PhantomData,
path::{Path, PathBuf},
@ -13,6 +14,10 @@ use time::{format_description::well_known::Rfc2822, OffsetDateTime};
use crate::{builder::SiteBuilder, link_list::Link, PageMetadata, SiteConfig};
pub trait ResourceConfig<R> {
fn new(builder: &SiteBuilder) -> Self;
}
/// Metadata for resources.
#[derive(Debug, Deserialize, Serialize)]
pub struct ResourceMetadata<T> {
@ -126,9 +131,9 @@ pub struct ResourceBuilderConfig {
#[derive(Debug)]
pub struct ResourceBuilder<M, E> {
/// The builder's config.
config: ResourceBuilderConfig,
pub config: ResourceBuilderConfig,
/// The currently loaded resource metadata.
loaded_metadata: Vec<(String, ResourceMetadata<M>)>,
pub loaded_metadata: RefCell<Vec<(String, ResourceMetadata<M>)>>,
_extra: PhantomData<E>,
}
@ -176,8 +181,9 @@ where
}
/// Loads all resource metadata from the given config.
pub fn load_all(&mut self, builder: &SiteBuilder) -> anyhow::Result<()> {
self.loaded_metadata.clear();
pub fn load_all(&self, builder: &SiteBuilder) -> anyhow::Result<()> {
let mut lmd = self.loaded_metadata.borrow_mut();
lmd.clear();
for e in builder
.site
.site_path
@ -190,11 +196,10 @@ where
if cfg!(not(debug_assertions)) && metadata.draft {
continue;
}
self.loaded_metadata.push((id, metadata));
lmd.push((id, metadata));
}
}
self.loaded_metadata
.sort_by(|a, b| b.1.timestamp.cmp(&a.1.timestamp));
lmd.sort_by(|a, b| b.1.timestamp.cmp(&a.1.timestamp));
Ok(())
}
@ -224,7 +229,7 @@ where
builder.reg.render(&self.config.resource_template, &data)?
};
let out = builder.build_page_raw_extra(
let out = builder.build_page_raw_with_extra_data(
PageMetadata {
title: Some(resource.title.clone()),
..Default::default()
@ -250,12 +255,14 @@ where
std::fs::create_dir_all(&out_long)?;
}
for (id, resource) in &self.loaded_metadata {
let lmd = self.loaded_metadata.borrow();
for (id, resource) in lmd.iter() {
self.build(builder, id.clone(), resource)?;
}
let mut data = Vec::with_capacity(self.loaded_metadata.len());
for (id, resource) in &self.loaded_metadata {
let mut data = Vec::with_capacity(lmd.len());
for (id, resource) in lmd.iter() {
let extra = resource.get_extra_resource_template_data(&builder.site.config)?;
data.push(ResourceTemplateData {
resource,