mirror/crowbook
1
0
Fork 0
mirror of https://github.com/lise-henry/crowbook synced 2024-09-29 16:31:23 +02:00
Code Issues

Find images correctly for EPUB/PDF even when called from another directory

Browse Source
This commit is contained in:
Elisabeth Henry 2016-05-29 17:54:20 +02:00
parent 1ad067f8e4
commit 5bbd4c8d90
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/epub.rs
View File

@ -126,9 +126,8 @@ impl<'a> EpubRenderer<'a> {
}
// Write all images (including cover)
let images_path = PathBuf::from(&self.book.options.get_path("resources.base_path.images").unwrap());
for (source, dest) in self.html.handler.images_mapping() {
let mut f = try!(File::open(images_path.join(source)).map_err(|_| Error::FileNotFound(source.to_owned())));
let mut f = try!(File::open(source).map_err(|_| Error::FileNotFound(source.to_owned())));
let mut content = vec!();
try!(f.read_to_end(&mut content).map_err(|e| Error::Render(format!("error while reading image file: {}", e))));
try!(zipper.write(dest, &content, true));

2
src/lib/latex.rs
View File

@ -58,7 +58,7 @@ impl<'a> LatexRenderer<'a> {
// write image files
for (source, dest) in self.handler.images_mapping() {
let mut f = try!(File::open(self.book.root.join(source)).map_err(|_| Error::FileNotFound(source.to_owned())));
let mut f = try!(File::open(source).map_err(|_| Error::FileNotFound(source.to_owned())));
let mut content = vec!();
try!(f.read_to_end(&mut content).map_err(|e| Error::Render(format!("error while reading image file: {}", e))));
try!(zipper.write(dest, &content, true));