temp

Author: Heliozoa

tmc-langs-cli/src/app.rs

@@ -337,6 +337,9 @@ fn create_core_app() -> App<'static, 'static> {
         .subcommand(SubCommand::with_name("download-or-update-course-exercises")
             .about("Downloads exercises. If downloading an exercise that has been downloaded before, the student file policy will be used to avoid overwriting student files, effectively just updating the exercise files")
             .long_about(schema_leaked::<DownloadOrUpdateCourseExercisesResult>())
+            .arg(Arg::with_name("download-from-template")
+                .help("If set, will always download the course template instead of the latest submission, even if one exists.")
+                .long("download-from-template"))
             .arg(Arg::with_name("exercise-id")
                 .help("Exercise id of an exercise that should be downloaded. Multiple ids can be given.")
                 .long("exercise-id")

tmc-langs-cli/src/lib.rs

@@ -711,6 +711,8 @@ fn run_core(
             print_output(&output, pretty)?
         }
         ("download-or-update-course-exercises", Some(matches)) => {
+            let download_from_template = matches.is_present("download-from-template");
+
             let exercise_ids = matches.values_of("exercise-id").unwrap();
             let exercise_ids = exercise_ids
                 .into_iter()
@@ -721,6 +723,7 @@ fn run_core(
                 &client,
                 client_name,
                 &exercise_ids,
+                download_from_template,
             )? {
                 DownloadResult::Success {
                     downloaded,

tmc-langs/src/lib.rs

@@ -119,26 +119,30 @@ pub fn download_or_update_course_exercises(
     client: &TmcClient,
     client_name: &str,
     exercises: &[usize],
+    download_from_template: bool,
 ) -> Result<DownloadResult, LangsError> {
     let exercises_details = client.get_exercises_details(exercises)?;
 
     let config_path = TmcConfig::get_location(client_name)?;
     let projects_dir = TmcConfig::load(client_name, &config_path)?.projects_dir;
     let mut projects_config = ProjectsConfig::load(&projects_dir)?;
 
-    // separate downloads into ones that don't need to be downloaded and ones that do
-    let mut to_be_downloaded = HashMap::new();
+    // separate exercises into fresh downloads, submission downloads and skipped
+    let mut to_be_downloaded_fresh = HashMap::new();
+    let mut to_be_downloaded_submission = HashMap::new();
     let mut to_be_skipped = vec![];
+
     for exercise_detail in exercises_details {
         let target = ProjectsConfig::get_exercise_download_target(
             &projects_dir,
             &exercise_detail.course_name,
             &exercise_detail.exercise_name,
         );
 
-        // check if the checksum is different from what's already on disk
+        // check if the exercise is already on disk
         if let Some(course_config) = projects_config.courses.get(&exercise_detail.course_name) {
             if let Some(exercise) = course_config.exercises.get(&exercise_detail.exercise_name) {
+                // exercise is on disk, check if the checksum is identical
                 if exercise_detail.checksum == exercise.checksum {
                     // skip this exercise
                     log::info!(
@@ -153,6 +157,23 @@ pub fn download_or_update_course_exercises(
                         path: target,
                     });
                     continue;
+                } else if !download_from_template {
+                    // different checksum, if flag isn't set check if there are any previous submissions
+                    if let Some(latest_submission) = client
+                        .get_exercise_submissions_for_current_user(exercise.id)?
+                        .first()
+                    {
+                        // previous submission found
+                        to_be_downloaded_submission.insert(
+                            exercise_detail.id,
+                            ExerciseDownload {
+                                course_slug: exercise_detail.exercise_name.clone(),
+                                exercise_slug: exercise_detail.exercise_name.clone(),
+                                path: target,
+                            },
+                        );
+                        continue;
+                    }
                 }
             }
         }