Skip to content

Support Windows-style container.xml file path and allow chapter failed to be parsed #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trung1-dothanh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support Windows-style container.xml file path and allow chapter failed to be parsed #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
437b871
get_spine: Try META-INF\container.xml if META-INF/container.xml does …
trung1-dothanh Feb 19, 2025
12afb11
get_chapters: Allow chapters failed to be parsed
trung1-dothanh Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions src/epub.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use std::{
fs::File,
io::{self, Read},
};
use zip::result::{ZipError, ZipResult};

pub struct Chapter {
pub title: String,
Expand Down Expand Up @@ -42,22 +43,18 @@ impl Epub {
}
Ok(epub)
}
fn get_text(&mut self, name: &str) -> String {
fn get_text(&mut self, name: &str) -> ZipResult<String> {
let mut text = String::new();
self.container
.by_name(name)
.unwrap()
.read_to_string(&mut text)
.unwrap();
text
self.container.by_name(name)?.read_to_string(&mut text)?;
Ok(text)
}
fn get_chapters(&mut self, spine: Vec<(String, String)>) {
for (title, path) in spine {
// https://github.com/RazrFalcon/roxmltree/issues/12
// UnknownEntityReference for HTML entities
let xml = self.get_text(&format!("{}{}", self.rootdir, path));
let xml = self.get_text(&format!("{}{}", self.rootdir, path)).unwrap();
let opt = ParsingOptions { allow_dtd: true };
let doc = Document::parse_with_options(&xml, opt).unwrap();
let Ok(doc) = Document::parse_with_options(&xml, opt) else { continue; };
let body = doc.root_element().last_element_child().unwrap();
let state = Attributes::default();
let mut c = Chapter {
Expand Down Expand Up @@ -89,15 +86,19 @@ impl Epub {
}
}
fn get_spine(&mut self) -> Vec<(String, String)> {
let xml = self.get_text("META-INF/container.xml");
let xml = match self.get_text("META-INF/container.xml") {
Ok(text) => text,
Err(ZipError::FileNotFound) => self.get_text(r#"META-INF\container.xml"#).unwrap(),
Err(e) => panic!("{}", e),
};
let doc = Document::parse(&xml).unwrap();
let path = doc
.descendants()
.find(|n| n.has_tag_name("rootfile"))
.unwrap()
.attribute("full-path")
.unwrap();
let xml = self.get_text(path);
let xml = self.get_text(path).unwrap();
let doc = Document::parse(&xml).unwrap();

// zip expects unix path even on windows
Expand Down Expand Up @@ -134,13 +135,13 @@ impl Epub {
.unwrap()
.attribute("href")
.unwrap();
let xml = self.get_text(&format!("{}{}", self.rootdir, path));
let xml = self.get_text(&format!("{}{}", self.rootdir, path)).unwrap();
let doc = Document::parse(&xml).unwrap();
epub3(doc, &mut nav);
} else {
let id = spine_node.attribute("toc").unwrap_or("ncx");
let path = manifest.get(id).unwrap();
let xml = self.get_text(&format!("{}{}", self.rootdir, path));
let xml = self.get_text(&format!("{}{}", self.rootdir, path)).unwrap();
let doc = Document::parse(&xml).unwrap();
epub2(doc, &mut nav);
}
Expand Down