From 3cfcae25a9150d6c99b1ebe168a7a1ff3e934f36 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Mon, 23 Oct 2023 23:49:35 -0400 Subject: [PATCH] Move the render context to its own folder. We are going to have a lot of render context types because there are so many org-mode elements/objects so I'm moving it to a separate folder for organization. --- src/blog_post/convert.rs | 4 ++-- src/blog_post/mod.rs | 1 - src/main.rs | 1 + .../blog_post_page.rs} | 23 +----------------- src/types/global_settings.rs | 24 +++++++++++++++++++ src/types/mod.rs | 5 ++++ 6 files changed, 33 insertions(+), 25 deletions(-) rename src/{blog_post/render_context.rs => types/blog_post_page.rs} (52%) create mode 100644 src/types/global_settings.rs create mode 100644 src/types/mod.rs diff --git a/src/blog_post/convert.rs b/src/blog_post/convert.rs index c7d2b46..81a7410 100644 --- a/src/blog_post/convert.rs +++ b/src/blog_post/convert.rs @@ -4,9 +4,9 @@ use std::path::PathBuf; use crate::config::Config; use crate::error::CustomError; +use crate::types::GlobalSettings; +use crate::types::RenderBlogPostPage; -use super::render_context::GlobalSettings; -use super::render_context::RenderBlogPostPage; use super::BlogPost; use super::BlogPostPage; diff --git a/src/blog_post/mod.rs b/src/blog_post/mod.rs index bd4e010..2996114 100644 --- a/src/blog_post/mod.rs +++ b/src/blog_post/mod.rs @@ -1,7 +1,6 @@ mod convert; mod definition; mod page; -mod render_context; pub(crate) use convert::convert_blog_post_page_to_render_context; pub(crate) use definition::BlogPost; pub(crate) use page::BlogPostPage; diff --git a/src/main.rs b/src/main.rs index 6e1fb2d..7505bd4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,6 +13,7 @@ mod command; mod config; mod error; mod render; +mod types; fn main() -> Result { let rt = tokio::runtime::Runtime::new()?; diff --git a/src/blog_post/render_context.rs b/src/types/blog_post_page.rs similarity index 52% rename from src/blog_post/render_context.rs rename to src/types/blog_post_page.rs index 4085b9d..9ddd0ec 100644 --- a/src/blog_post/render_context.rs +++ b/src/types/blog_post_page.rs @@ -1,27 +1,6 @@ use serde::Serialize; -/// The settings that a "global" to a single dustjs render. -#[derive(Debug, Serialize)] -pub(crate) struct GlobalSettings { - /// The title that goes in the html tag in the <head>. - page_title: Option<String>, - css_files: Vec<String>, - js_files: Vec<String>, -} - -impl GlobalSettings { - pub(crate) fn new( - page_title: Option<String>, - css_files: Vec<String>, - js_files: Vec<String>, - ) -> GlobalSettings { - GlobalSettings { - page_title, - css_files, - js_files, - } - } -} +use super::GlobalSettings; #[derive(Debug, Serialize)] #[serde(tag = "type")] diff --git a/src/types/global_settings.rs b/src/types/global_settings.rs new file mode 100644 index 0000000..53e3eda --- /dev/null +++ b/src/types/global_settings.rs @@ -0,0 +1,24 @@ +use serde::Serialize; + +/// The settings that a "global" to a single dustjs render. +#[derive(Debug, Serialize)] +pub(crate) struct GlobalSettings { + /// The title that goes in the html <title> tag in the <head>. + page_title: Option<String>, + css_files: Vec<String>, + js_files: Vec<String>, +} + +impl GlobalSettings { + pub(crate) fn new( + page_title: Option<String>, + css_files: Vec<String>, + js_files: Vec<String>, + ) -> GlobalSettings { + GlobalSettings { + page_title, + css_files, + js_files, + } + } +} diff --git a/src/types/mod.rs b/src/types/mod.rs new file mode 100644 index 0000000..a216de3 --- /dev/null +++ b/src/types/mod.rs @@ -0,0 +1,5 @@ +mod blog_post_page; +mod global_settings; + +pub(crate) use blog_post_page::RenderBlogPostPage; +pub(crate) use global_settings::GlobalSettings;