Merge pull request #9 from quirinecker/fix/8-progress-jumps

Fix/8 progress jumps

src/app/build/mod.rs

@@ -23,10 +23,6 @@ pub fn docki_build(in_path: &str, offline_reveal: bool) -> DockiBuildResult {
 
         DockiBuildResult::Doc(convert_out_path)
     } else {
-		if in_path.starts_with("./docs/slides/revealjs") && !offline_reveal {
-			return DockiBuildResult::Silent;
-		}
-
         if let Err(err) = copy(&in_path, &out_path) {
             return DockiBuildResult::Err(err);
         }
@@ -50,5 +46,4 @@ pub enum DockiBuildResult {
     Doc(String),
     Copy(String),
     Err(String),
-	Silent,
 }

src/app/commands/executions/build_execution.rs

@@ -73,20 +73,24 @@ impl BuildExecution {
             return Err(result.unwrap_err())
         };
 
+		let paths = paths.into_iter()
+			.filter(|path| offline_reveal || !path.starts_with("./docs/slides/revealjs"))
+			.collect::<Vec<String>>();
+
+		self.goal = paths.len();
+
         for (index, in_path) in paths.iter().enumerate() {
             self.progress = index + 1;
-            self.goal = paths.len();
             let result = docki_build(&in_path, offline_reveal);
 
             match result {
                 DockiBuildResult::Err(err) => {
-                    self.display_building_status("Error", in_path, "");
+                    self.display_building_status("Error", &in_path, "");
                     println!("{}", err)
                 },
                 DockiBuildResult::Copy(out_path) => self.display_building_status("Copy", &in_path, &out_path),
                 DockiBuildResult::Slide(out_path) => self.display_building_status("Slide", &in_path, &out_path),
                 DockiBuildResult::Doc(out_path) => self.display_building_status("Doc", &in_path, &out_path),
-				DockiBuildResult::Silent => ()
             }
         }
 

src/app/commands/serve.rs

@@ -78,7 +78,6 @@ fn build_file(paths: Vec<std::path::PathBuf>) {
             display_rebuilding_status("Error", &in_path, "");
             println!("{}", err);
         },
-		DockiBuildResult::Silent => ()
     }
 }