Merge pull request #137 from rage/dont-fail-on-dl-fail

do not fail download-or-update if some downloads fail

Author: Heliozoa

tmc-langs-cli/src/lib.rs

@@ -733,7 +733,7 @@ fn run_core(
                 .collect::<Result<Vec<_>>>()?;
 
             let projects_dir = tmc_langs::get_projects_dir(client_name)?;
-            match tmc_langs::download_or_update_course_exercises(
+            let data = match tmc_langs::download_or_update_course_exercises(
                 &client,
                 &projects_dir,
                 &exercise_ids,
@@ -742,29 +742,26 @@ fn run_core(
                 DownloadResult::Success {
                     downloaded,
                     skipped,
-                } => {
-                    let data = DownloadOrUpdateCourseExercisesResult {
-                        downloaded,
-                        skipped,
-                    };
-                    let output = Output::finished_with_data(
-                        "downloaded or updated exercises",
-                        Data::ExerciseDownload(data),
-                    );
-                    print_output(&output, pretty)?
-                }
+                } => DownloadOrUpdateCourseExercisesResult {
+                    downloaded,
+                    skipped,
+                    failed: None,
+                },
                 DownloadResult::Failure {
                     downloaded,
                     skipped,
                     failed,
-                } => {
-                    anyhow::bail!(DownloadsFailedError {
-                        downloaded,
-                        skipped,
-                        failed,
-                    })
-                }
-            }
+                } => DownloadOrUpdateCourseExercisesResult {
+                    downloaded,
+                    skipped,
+                    failed: Some(failed),
+                },
+            };
+            let output = Output::finished_with_data(
+                "downloaded or updated exercises",
+                Data::ExerciseDownload(data),
+            );
+            print_output(&output, pretty)?
         }
         ("get-course-data", Some(matches)) => {
             let course_id = matches.value_of("course-id").unwrap();

tmc-langs-cli/src/output.rs

@@ -213,6 +213,7 @@ mod test {
                         exercise_slug: "some skipped exercise".to_string(),
                         path: PathBuf::from("third path"),
                     }],
+                    failed: None,
                 },
             )),
         });

tmc-langs/src/data.rs

@@ -196,4 +196,6 @@ pub struct CombinedCourseData {
 pub struct DownloadOrUpdateCourseExercisesResult {
     pub downloaded: Vec<ExerciseDownload>,
     pub skipped: Vec<ExerciseDownload>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub failed: Option<Vec<(ExerciseDownload, Vec<String>)>>,
 }

tmc-langs/src/lib.rs

@@ -551,6 +551,7 @@ pub fn update_exercises(
     Ok(DownloadOrUpdateCourseExercisesResult {
         downloaded: exercises_to_update,
         skipped: vec![],
+        failed: None,
     })
 }