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

many many changes

Browse source
This commit is contained in:
Zoey 2023-06-09 21:55:04 -07:00
parent 80bc863cdf
commit efa0d03315
22 changed files with 360 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/images.rs
View file

@ -1,5 +1,4 @@
use serde::{Deserialize, Serialize};
use url::Url;
use crate::{
builder::SiteBuilder,
@ -28,7 +27,7 @@ pub fn build_images(site_builder: &SiteBuilder) -> anyhow::Result<()> {
};
let mut builder = ResourceBuilder::<ImageMetadata, ImageTemplateData>::new(config);
builder.load_all(&site_builder.site.site_path)?;
builder.load_all(site_builder)?;
builder.build_all(site_builder)?;
Ok(())
@ -45,13 +44,6 @@ pub struct ImageMetadata {
pub file: String,
}
impl ImageMetadata {
/// Gets an image's CDN url.
pub fn cdn_url(&self, config: &SiteConfig) -> anyhow::Result<Url> {
Ok(config.cdn_url.join(&config.s3_prefix)?.join(&self.file)?)
}
}
/// Template data for a specific image.
#[derive(Debug, Serialize)]
struct ImageTemplateData {
@ -70,7 +62,7 @@ impl ResourceMethods<ImageTemplateData> for ResourceMetadata<ImageMetadata> {
site_config: &SiteConfig,
) -> anyhow::Result<ImageTemplateData> {
Ok(ImageTemplateData {
src: self.inner.cdn_url(site_config)?.to_string(),
src: site_config.cdn_url(&self.inner.file)?.to_string(),
})
}
}