Fixes missing the default "theme" dir location

[budziq]

if one is not specified in book.toml

fixes https://github.com/azerupi/mdBook/issues/313

[azerupi]

I think this is better fixed directly by giving the HtmlConfig a default value for the theme. What do you think?

[budziq]

Yep that's much better idea :)

I have pushed a version with suggested changes which in addition changes HtmlConfig.theme from Option<&PathBuf> to PathBuf as now it is guaranteed to always be set (unfortunately a lot of the code had to be adapted to this change). Otherwise I can submit a super minimal version:

-------------------------- src/config/htmlconfig.rs ---------------------------
index 1c42a34..c90c76b 100644
@@ -25,9 +25,10 @@ impl HtmlConfig {
     /// assert_eq!(config.get_destination(), &output);
     /// ```
     pub fn new<T: Into<PathBuf>>(root: T) -> Self {
+        let root = root.into();
         HtmlConfig {
-            destination: root.into().join("book"),
-            theme: None,
+            destination: root.clone().join("book"),
+            theme: Some(root.join("theme")),
             curly_quotes: false,
             google_analytics: None,
             additional_css: Vec::new(),

edit: Pushed the correct branch now.

[azerupi]

I suppose we can remove the option here too, no?

[budziq]

I was thinking about it but but there is this problem that while in the context of HtmlConfig the theme is guaranteed, it is not in the context of MdBook as the HtmlConfig is optional itself

    pub fn get_theme_path(&self) -> Option<&Path> {
        if let Some(htmlconfig) = self.config.get_html_config() {
            return Some(htmlconfig.get_theme());
        }

        None
    }

So removing this option will make us jump through hoops here:

  --> src/renderer/html_handlebars/hbs_renderer.rs:36:39
   |
36 |         let theme = theme::Theme::new(book.get_theme_path());

[azerupi]

Right, let's keep it like it is for now then. Maybe it will get refactored with all the planned changes anyway.