Merge pull request #254 from frewsxcv/frewsxcv-no-create

Implement new 'no-create' build flag.
This commit is contained in:
Corey Farwell 2017-04-21 23:03:23 -04:00 committed by GitHub
commit a4a708bdda
2 changed files with 27 additions and 13 deletions

View File

@ -63,6 +63,7 @@ fn main() {
.about("Build the book from the markdown files") .about("Build the book from the markdown files")
.arg_from_usage("-o, --open 'Open the compiled book in a web browser'") .arg_from_usage("-o, --open 'Open the compiled book in a web browser'")
.arg_from_usage("-d, --dest-dir=[dest-dir] 'The output directory for your book{n}(Defaults to ./book when omitted)'") .arg_from_usage("-d, --dest-dir=[dest-dir] 'The output directory for your book{n}(Defaults to ./book when omitted)'")
.arg_from_usage("--no-create 'Will not create non-existent files linked from SUMMARY.md'")
.arg_from_usage("[dir] 'A directory for your book{n}(Defaults to Current Directory when omitted)'")) .arg_from_usage("[dir] 'A directory for your book{n}(Defaults to Current Directory when omitted)'"))
.subcommand(SubCommand::with_name("watch") .subcommand(SubCommand::with_name("watch")
.about("Watch the files for changes") .about("Watch the files for changes")
@ -174,6 +175,10 @@ fn build(args: &ArgMatches) -> Result<(), Box<Error>> {
None => book None => book
}; };
if args.is_present("no-create") {
book.create_missing = false;
}
try!(book.build()); try!(book.build());
if args.is_present("open") { if args.is_present("open") {

View File

@ -32,6 +32,10 @@ pub struct MDBook {
renderer: Box<Renderer>, renderer: Box<Renderer>,
livereload: Option<String>, livereload: Option<String>,
/// Should `mdbook build` create files referenced from SUMMARY.md if they
/// don't exist
pub create_missing: bool,
} }
impl MDBook { impl MDBook {
@ -79,6 +83,7 @@ impl MDBook {
renderer: Box::new(HtmlHandlebars::new()), renderer: Box::new(HtmlHandlebars::new()),
livereload: None, livereload: None,
create_missing: true,
} }
} }
@ -175,23 +180,27 @@ impl MDBook {
debug!("[*]: constructing paths for missing files"); debug!("[*]: constructing paths for missing files");
for item in self.iter() { for item in self.iter() {
debug!("[*]: item: {:?}", item); debug!("[*]: item: {:?}", item);
match *item { let ch = match *item {
BookItem::Spacer => continue, BookItem::Spacer => continue,
BookItem::Chapter(_, ref ch) | BookItem::Chapter(_, ref ch) |
BookItem::Affix(ref ch) => { BookItem::Affix(ref ch) => ch,
if ch.path != PathBuf::new() { };
let path = self.src.join(&ch.path); if ch.path.as_os_str().is_empty() {
let path = self.src.join(&ch.path);
if !path.exists() { if !path.exists() {
debug!("[*]: {:?} does not exist, trying to create file", path); if !self.create_missing {
try!(::std::fs::create_dir_all(path.parent().unwrap())); return Err(format!(
let mut f = try!(File::create(path)); "'{}' referenced from SUMMARY.md does not exist.",
path.to_string_lossy()).into());
// debug!("[*]: Writing to {:?}", path);
try!(writeln!(f, "# {}", ch.name));
}
} }
}, debug!("[*]: {:?} does not exist, trying to create file", path);
try!(::std::fs::create_dir_all(path.parent().unwrap()));
let mut f = try!(File::create(path));
// debug!("[*]: Writing to {:?}", path);
try!(writeln!(f, "# {}", ch.name));
}
} }
} }