From e74c3768330461b4804415ffa88f8de9059897be Mon Sep 17 00:00:00 2001
From: Michael Bryan <michaelfbryan@gmail.com>
Date: Wed, 3 Jan 2018 19:32:49 +0800
Subject: [PATCH] You need to call `rx.iter()` to iterate over events from a
 channel (#522)

---
 src/bin/mdbook.rs |  1 +
 src/bin/serve.rs  | 26 +++++++++++++++++++++-----
 src/bin/watch.rs  |  2 +-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/bin/mdbook.rs b/src/bin/mdbook.rs
index 305f9f94..93794541 100644
--- a/src/bin/mdbook.rs
+++ b/src/bin/mdbook.rs
@@ -3,6 +3,7 @@ extern crate clap;
 extern crate chrono;
 extern crate env_logger;
 extern crate error_chain;
+#[macro_use]
 extern crate log;
 extern crate mdbook;
 extern crate open;
diff --git a/src/bin/serve.rs b/src/bin/serve.rs
index ada545fa..ac6a51e5 100644
--- a/src/bin/serve.rs
+++ b/src/bin/serve.rs
@@ -52,7 +52,7 @@ pub fn execute(args: &ArgMatches) -> Result<()> {
     let address = format!("{}:{}", interface, port);
     let ws_address = format!("{}:{}", interface, ws_port);
 
-    book.livereload = Some(format!(
+    let livereload = Some(format!(
         r#"
     <script type="text/javascript">
         var socket = new WebSocket("ws://{}:{}");
@@ -70,6 +70,7 @@ pub fn execute(args: &ArgMatches) -> Result<()> {
 "#,
         public_address, ws_port, RELOAD_COMMAND
     ));
+    book.livereload = livereload.clone();
 
     book.build()?;
 
@@ -98,11 +99,26 @@ pub fn execute(args: &ArgMatches) -> Result<()> {
     #[cfg(feature = "watch")]
     watch::trigger_on_change(&mut book, move |path, book_dir| {
         println!("File changed: {:?}\nBuilding book...\n", path);
-        match MDBook::load(&book_dir).and_then(|mut b| b.build()) {
-            Err(e) => println!("Error while building: {:?}", e),
-            _ => broadcaster.send(RELOAD_COMMAND).unwrap(),
+        // FIXME: This area is really ugly because we need to re-set livereload :(
+        
+        let livereload = livereload.clone();
+
+        let result = MDBook::load(&book_dir)
+            .map(move |mut b| {
+                b.livereload = livereload;
+                b
+            })
+            .and_then(|mut b| b.build());
+
+        if let Err(e) = result {
+            error!("Unable to load the book");
+            error!("Error: {}", e);
+            for cause in e.iter().skip(1) {
+                error!("\tCaused By: {}", cause);
+            }
+        } else {
+            let _ = broadcaster.send(RELOAD_COMMAND);
         }
-        println!("");
     });
 
     Ok(())
diff --git a/src/bin/watch.rs b/src/bin/watch.rs
index 8f3eb4e6..536e6150 100644
--- a/src/bin/watch.rs
+++ b/src/bin/watch.rs
@@ -74,7 +74,7 @@ where
 
     println!("\nListening for changes...\n");
 
-    for event in rx.recv() {
+    for event in rx.iter() {
         match event {
             Create(path) | Write(path) | Remove(path) | Rename(_, path) => {
                 closure(&path, &book.root);