mirror/crowbook
1
0
Fork 0
mirror of https://github.com/lise-henry/crowbook synced 2024-09-28 07:09:40 +02:00
Code Issues

Revert "Canonicalize paths before returning them"

Browse Source 
Since `canonicalize` only works with existing files this doesn't
go well for output files (that may not exist)

This reverts commit 25f5ccd1c9.
This commit is contained in:
Elisabeth Henry 2016-10-14 23:54:16 +02:00
parent 25f5ccd1c9
commit c5a9d2f0c4
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib/bookoptions.rs
View File

@ -375,16 +375,8 @@ impl BookOptions {
if let Yaml::String(value) = value {
if &key == "import_config" {
// special case, not a real option
let tmp = try!(
self.root
.join(&value)
.canonicalize()
.map_err(|e| {
Error::default(&self.source,
lformat!("could not canonicalize path: {error}",
error = e))
})
);
let tmp = self.root
.join(&value);
let file = try!(tmp
.to_str()
.ok_or(Error::book_option(&self.source,
@ -604,13 +596,13 @@ impl BookOptions {
return base_path;
}
self.root.join(path)
}
"cover" => {
// Translate according to resources.base_path.images
let base = self.get_path("resources.base_path.images").unwrap();
Path::new(&base).join(path)
let new_path = Path::new(&base).join(path);
new_path
}
"output.epub" |
@ -624,25 +616,19 @@ impl BookOptions {
"output.proofread.pdf" => {
// Translate according to output.base_path
let base = self.get_path("output.base_path").unwrap();
Path::new(&base).join(path)
let new_path = Path::new(&base).join(path);
new_path
}
key if self.valid_tpls.contains(&key) => {
// Translate according to resources.base_path.template
let base = self.get_path("resources.base_path.templates").unwrap();
Path::new(&base).join(path)
let new_path = Path::new(&base).join(path);
new_path
}
_ => self.root.join(path),
};
let new_path = try!(
new_path.canonicalize()
.map_err(|e| {
Error::default(&self.source,
lformat!("could not canonicalize path: {error}",
error = e))
})
);
if let Some(path) = new_path.to_str() {
Ok(path.to_owned())
} else {