Introduce a registry into the conversion to intermediate format.
This commit is contained in:
parent
e3b5f7f74f
commit
c6cf5f75ac
@ -5,15 +5,14 @@ use tokio::task::JoinHandle;
|
|||||||
use walkdir::WalkDir;
|
use walkdir::WalkDir;
|
||||||
|
|
||||||
use crate::error::CustomError;
|
use crate::error::CustomError;
|
||||||
|
use crate::intermediate::registry::Registry;
|
||||||
|
|
||||||
use super::BlogPostPage;
|
use super::BlogPostPage;
|
||||||
use super::IDocumentElement;
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub(crate) struct BlogPost {
|
pub(crate) struct BlogPost {
|
||||||
pub(crate) id: String,
|
pub(crate) id: String,
|
||||||
pub(crate) pages: Vec<BlogPostPage>,
|
pub(crate) pages: Vec<BlogPostPage>,
|
||||||
pub(crate) children: Vec<IDocumentElement>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl BlogPost {
|
impl BlogPost {
|
||||||
@ -44,12 +43,27 @@ impl BlogPost {
|
|||||||
ret
|
ret
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let mut registry = Registry::new();
|
||||||
|
|
||||||
|
// Assign IDs to the targets
|
||||||
|
for (_real_path, _contents, parsed_document) in parsed_org_files.iter() {
|
||||||
|
organic::types::AstNode::from(parsed_document)
|
||||||
|
.iter_all_ast_nodes()
|
||||||
|
.for_each(|node| match node {
|
||||||
|
organic::types::AstNode::Target(target) => {
|
||||||
|
registry.get_target(target.value);
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
let pages = {
|
let pages = {
|
||||||
let mut ret = Vec::new();
|
let mut ret = Vec::new();
|
||||||
for (real_path, _contents, parsed_document) in parsed_org_files {
|
for (real_path, _contents, parsed_document) in parsed_org_files.iter() {
|
||||||
let relative_to_post_dir_path = real_path.strip_prefix(post_dir)?;
|
let relative_to_post_dir_path = real_path.strip_prefix(post_dir)?;
|
||||||
ret.push(BlogPostPage::new(
|
ret.push(BlogPostPage::new(
|
||||||
relative_to_post_dir_path,
|
relative_to_post_dir_path,
|
||||||
|
&mut registry,
|
||||||
parsed_document,
|
parsed_document,
|
||||||
)?);
|
)?);
|
||||||
}
|
}
|
||||||
@ -59,7 +73,6 @@ impl BlogPost {
|
|||||||
Ok(BlogPost {
|
Ok(BlogPost {
|
||||||
id: post_id.to_string_lossy().into_owned(),
|
id: post_id.to_string_lossy().into_owned(),
|
||||||
pages,
|
pages,
|
||||||
children: Vec::new(),
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
inner(root_dir.as_ref(), post_dir.as_ref()).await
|
inner(root_dir.as_ref(), post_dir.as_ref()).await
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
use crate::error::CustomError;
|
use crate::error::CustomError;
|
||||||
|
|
||||||
|
use super::registry::Registry;
|
||||||
use super::IObject;
|
use super::IObject;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
@ -9,11 +10,14 @@ pub(crate) struct IHeading {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl IHeading {
|
impl IHeading {
|
||||||
pub(crate) fn new(heading: &organic::types::Heading<'_>) -> Result<IHeading, CustomError> {
|
pub(crate) fn new(
|
||||||
|
registry: &mut Registry<'_>,
|
||||||
|
heading: &organic::types::Heading<'_>,
|
||||||
|
) -> Result<IHeading, CustomError> {
|
||||||
let title = heading
|
let title = heading
|
||||||
.title
|
.title
|
||||||
.iter()
|
.iter()
|
||||||
.map(IObject::new)
|
.map(|obj| IObject::new(registry, obj))
|
||||||
.collect::<Result<Vec<_>, _>>()?;
|
.collect::<Result<Vec<_>, _>>()?;
|
||||||
Ok(IHeading {
|
Ok(IHeading {
|
||||||
title,
|
title,
|
||||||
|
@ -6,6 +6,7 @@ mod heading;
|
|||||||
mod object;
|
mod object;
|
||||||
mod page;
|
mod page;
|
||||||
mod plain_text;
|
mod plain_text;
|
||||||
|
mod registry;
|
||||||
mod section;
|
mod section;
|
||||||
mod util;
|
mod util;
|
||||||
pub(crate) use convert::convert_blog_post_page_to_render_context;
|
pub(crate) use convert::convert_blog_post_page_to_render_context;
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
use crate::error::CustomError;
|
use crate::error::CustomError;
|
||||||
|
|
||||||
use super::plain_text::IPlainText;
|
use super::plain_text::IPlainText;
|
||||||
|
use super::registry::Registry;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub(crate) enum IObject {
|
pub(crate) enum IObject {
|
||||||
@ -8,7 +9,10 @@ pub(crate) enum IObject {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl IObject {
|
impl IObject {
|
||||||
pub(crate) fn new(obj: &organic::types::Object<'_>) -> Result<IObject, CustomError> {
|
pub(crate) fn new(
|
||||||
|
registry: &mut Registry<'_>,
|
||||||
|
obj: &organic::types::Object<'_>,
|
||||||
|
) -> Result<IObject, CustomError> {
|
||||||
match obj {
|
match obj {
|
||||||
organic::types::Object::Bold(_) => todo!(),
|
organic::types::Object::Bold(_) => todo!(),
|
||||||
organic::types::Object::Italic(_) => todo!(),
|
organic::types::Object::Italic(_) => todo!(),
|
||||||
@ -17,7 +21,7 @@ impl IObject {
|
|||||||
organic::types::Object::Code(_) => todo!(),
|
organic::types::Object::Code(_) => todo!(),
|
||||||
organic::types::Object::Verbatim(_) => todo!(),
|
organic::types::Object::Verbatim(_) => todo!(),
|
||||||
organic::types::Object::PlainText(plain_text) => {
|
organic::types::Object::PlainText(plain_text) => {
|
||||||
Ok(IObject::PlainText(IPlainText::new(plain_text)?))
|
Ok(IObject::PlainText(IPlainText::new(registry, plain_text)?))
|
||||||
}
|
}
|
||||||
organic::types::Object::RegularLink(_) => todo!(),
|
organic::types::Object::RegularLink(_) => todo!(),
|
||||||
organic::types::Object::RadioLink(_) => todo!(),
|
organic::types::Object::RadioLink(_) => todo!(),
|
||||||
|
@ -2,6 +2,7 @@ use std::path::PathBuf;
|
|||||||
|
|
||||||
use crate::error::CustomError;
|
use crate::error::CustomError;
|
||||||
|
|
||||||
|
use super::registry::Registry;
|
||||||
use super::IDocumentElement;
|
use super::IDocumentElement;
|
||||||
use super::IHeading;
|
use super::IHeading;
|
||||||
use super::ISection;
|
use super::ISection;
|
||||||
@ -19,15 +20,16 @@ pub(crate) struct BlogPostPage {
|
|||||||
impl BlogPostPage {
|
impl BlogPostPage {
|
||||||
pub(crate) fn new<P: Into<PathBuf>>(
|
pub(crate) fn new<P: Into<PathBuf>>(
|
||||||
path: P,
|
path: P,
|
||||||
document: organic::types::Document<'_>,
|
registry: &mut Registry<'_>,
|
||||||
|
document: &organic::types::Document<'_>,
|
||||||
) -> Result<BlogPostPage, CustomError> {
|
) -> Result<BlogPostPage, CustomError> {
|
||||||
let path = path.into();
|
let path = path.into();
|
||||||
let mut children = Vec::new();
|
let mut children = Vec::new();
|
||||||
if let Some(section) = document.zeroth_section.as_ref() {
|
if let Some(section) = document.zeroth_section.as_ref() {
|
||||||
children.push(IDocumentElement::Section(ISection::new(section)?));
|
children.push(IDocumentElement::Section(ISection::new(registry, section)?));
|
||||||
}
|
}
|
||||||
for heading in document.children.iter() {
|
for heading in document.children.iter() {
|
||||||
children.push(IDocumentElement::Heading(IHeading::new(heading)?));
|
children.push(IDocumentElement::Heading(IHeading::new(registry, heading)?));
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(BlogPostPage {
|
Ok(BlogPostPage {
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
use crate::error::CustomError;
|
use crate::error::CustomError;
|
||||||
use crate::intermediate::util::coalesce_whitespace;
|
use crate::intermediate::util::coalesce_whitespace;
|
||||||
|
|
||||||
|
use super::registry::Registry;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub(crate) struct IPlainText {
|
pub(crate) struct IPlainText {
|
||||||
source: String,
|
source: String,
|
||||||
@ -8,6 +10,7 @@ pub(crate) struct IPlainText {
|
|||||||
|
|
||||||
impl IPlainText {
|
impl IPlainText {
|
||||||
pub(crate) fn new(
|
pub(crate) fn new(
|
||||||
|
registry: &mut Registry<'_>,
|
||||||
plain_text: &organic::types::PlainText<'_>,
|
plain_text: &organic::types::PlainText<'_>,
|
||||||
) -> Result<IPlainText, CustomError> {
|
) -> Result<IPlainText, CustomError> {
|
||||||
Ok(IPlainText {
|
Ok(IPlainText {
|
||||||
|
24
src/intermediate/registry.rs
Normal file
24
src/intermediate/registry.rs
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
type IdCounter = u16;
|
||||||
|
|
||||||
|
pub(crate) struct Registry<'p> {
|
||||||
|
id_counter: IdCounter,
|
||||||
|
targets: HashMap<&'p str, String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'p> Registry<'p> {
|
||||||
|
pub(crate) fn new() -> Registry<'p> {
|
||||||
|
Registry {
|
||||||
|
id_counter: 0,
|
||||||
|
targets: HashMap::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn get_target<'b>(&'b mut self, body: &'p str) -> &'b String {
|
||||||
|
self.targets.entry(body).or_insert_with(|| {
|
||||||
|
self.id_counter += 1;
|
||||||
|
format!("target_{}", self.id_counter)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
@ -1,10 +1,15 @@
|
|||||||
use crate::error::CustomError;
|
use crate::error::CustomError;
|
||||||
|
|
||||||
|
use super::registry::Registry;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub(crate) struct ISection {}
|
pub(crate) struct ISection {}
|
||||||
|
|
||||||
impl ISection {
|
impl ISection {
|
||||||
pub(crate) fn new(section: &organic::types::Section<'_>) -> Result<ISection, CustomError> {
|
pub(crate) fn new(
|
||||||
|
registry: &mut Registry<'_>,
|
||||||
|
section: &organic::types::Section<'_>,
|
||||||
|
) -> Result<ISection, CustomError> {
|
||||||
Ok(ISection {})
|
Ok(ISection {})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user