{title}

From 2dff30140ff8b46b8b82b761b4305ceb7b67108d Mon Sep 17 00:00:00 2001 From: A Farzat Date: Sat, 7 Mar 2026 10:51:33 +0300 Subject: Replace format! macro with xml! where xml is used This commit does not produce a working version, as processed_fragment is escaped by xml!. This needs to be resolved. --- src/epub.rs | 15 +-------------- src/xml.rs | 55 +++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 38 insertions(+), 32 deletions(-) (limited to 'src') diff --git a/src/epub.rs b/src/epub.rs index 1d4676d..f9a5aac 100644 --- a/src/epub.rs +++ b/src/epub.rs @@ -111,26 +111,13 @@ pub fn create_epub_archive( src_file.read_to_end(&mut buffer)?; if let Some(chapter) = chapters.get(&entry.ourn) { let chapter_dir = entry.full_path.parent().unwrap_or(RelativePath::new("")); - let stylesheet_links = chapter - .related_assets - .stylesheets - .iter() - .filter_map(|u| url_to_file.get(u)) - .map(|e| { - format!( - "\n", - e.media_type, - chapter_dir.relative(&e.full_path) - ) - }) - .collect::(); let html = String::from_utf8(buffer)?; let html = build_epub_chapter( epub_data, chapter, chapter_dir, &html, - &stylesheet_links, + &url_to_file, &url_path_to_local, )?; zip.write_all(html.as_bytes())?; diff --git a/src/xml.rs b/src/xml.rs index 9b11e9a..63b4700 100644 --- a/src/xml.rs +++ b/src/xml.rs @@ -1,11 +1,13 @@ use anyhow::Result; +use ogrim::{Document, xml}; use quick_xml::events::{BytesStart, Event}; use quick_xml::{Reader, Writer}; use relative_path::{RelativePath, RelativePathBuf}; use std::collections::HashMap; use std::io::Cursor; +use url::Url; -use crate::models::{Chapter, EpubResponse}; +use crate::models::{Chapter, EpubResponse, FileEntry}; /// Checks if a tag is a standard HTML void element that shouldn't have a closing tag. fn is_html_void_tag(name: &[u8]) -> bool { @@ -34,7 +36,7 @@ pub fn build_epub_chapter( chapter: &Chapter, chapter_dir: &RelativePath, fragment: &str, - stylesheet_path: &str, + url_to_file: &HashMap<&Url, &FileEntry>, url_path_to_local: &HashMap<&str, &RelativePathBuf>, ) -> Result { // Setup the XML Reader and Writer. @@ -86,24 +88,41 @@ pub fn build_epub_chapter( // Wrap in EPUB XHTML Boilerplate. // EPUBs strictly require the w3 and idpf namespaces to validate properly. - let full_xhtml = format!( - r#" - - - {title} - {css} - - -{content} - -"#, - lang = epub_data.language, - title = chapter.title, - css = stylesheet_path, - content = processed_fragment, + let full_xhtml = xml!( + + + + {chapter.title} + {|doc| make_stylesheet_links(doc, chapter, chapter_dir, url_to_file)} + + + {processed_fragment} + + ); - Ok(full_xhtml) + Ok(full_xhtml.into_string()) +} + +/// Helper function add link elements for stylesheets to an xml Document. +fn make_stylesheet_links( + doc: &mut Document, + chapter: &Chapter, + chapter_dir: &RelativePath, + url_to_file: &HashMap<&Url, &FileEntry>, +) { + chapter + .related_assets + .stylesheets + .iter() + .filter_map(|u| url_to_file.get(u)) + .for_each(|e| { + let rel_path = chapter_dir.relative(&e.full_path); + xml!(doc, + + ); + }) } /// Helper function to inspect tags and rewrite the elements' attributes. -- cgit v1.2.3-70-g09d2