use course name and exercise name from details endpoint

Author: Heliozoa

tmc-langs-cli/src/config/projects_config.rs

@@ -98,11 +98,11 @@ mod test {
     }
 
     fn file_to(
-        temp: impl AsRef<std::path::Path>,
-        relative_path: impl AsRef<std::path::Path>,
+        target_dir: impl AsRef<std::path::Path>,
+        target_relative: impl AsRef<std::path::Path>,
         contents: impl AsRef<[u8]>,
     ) {
-        let target = temp.as_ref().join(relative_path);
+        let target = target_dir.as_ref().join(target_relative);
         if let Some(parent) = target.parent() {
             std::fs::create_dir_all(parent).unwrap();
         }

tmc-langs-cli/src/main.rs

@@ -830,18 +830,20 @@ fn run_core(
             let mut course_data = HashMap::<String, Vec<(String, String)>>::new();
             let mut exercises_and_paths = vec![];
             for exercise_detail in exercises_details {
-                // get course and exercise name from server
-                let ex_details = core.get_exercise_details(exercise_detail.id)?;
                 // check if the checksum is different from what's already on disk
-                if let Some(course_config) = projects_config.courses.get(&ex_details.course_name) {
-                    if let Some(exercise) = course_config.exercises.get(&ex_details.exercise_name) {
+                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)
+                    {
                         if exercise_detail.checksum == exercise.checksum {
                             // skip this exercise
                             log::info!(
                                 "Skipping exercise {} ({} in {}) due to identical checksum",
                                 exercise_detail.id,
-                                ex_details.course_name,
-                                ex_details.exercise_name
+                                exercise_detail.course_name,
+                                exercise_detail.exercise_name
                             );
                             continue;
                         }
@@ -850,13 +852,13 @@ fn run_core(
 
                 let target = ProjectsConfig::get_exercise_download_target(
                     &projects_dir,
-                    &ex_details.course_name,
-                    &ex_details.exercise_name,
+                    &exercise_detail.course_name,
+                    &exercise_detail.exercise_name,
                 );
 
-                let entry = course_data.entry(ex_details.course_name);
+                let entry = course_data.entry(exercise_detail.course_name);
                 let course_exercises = entry.or_default();
-                course_exercises.push((ex_details.exercise_name, exercise_detail.checksum));
+                course_exercises.push((exercise_detail.exercise_name, exercise_detail.checksum));
 
                 exercises_and_paths.push((exercise_detail.id, target));
             }

tmc-langs-core/src/lib.rs

@@ -18,7 +18,7 @@ pub use self::error::CoreError;
 pub use self::request::FeedbackAnswer;
 pub use self::response::{
     Course, CourseData, CourseDataExercise, CourseDataExercisePoint, CourseDetails, CourseExercise,
-    Exercise, ExerciseChecksums, ExerciseDetails, NewSubmission, Organization, Review, Submission,
+    Exercise, ExerciseDetails, ExercisesDetails, NewSubmission, Organization, Review, Submission,
     SubmissionFeedbackResponse, SubmissionFinished, SubmissionProcessingStatus, SubmissionStatus,
     UpdateResult, User,
 };

tmc-langs-core/src/response.rs

@@ -211,8 +211,10 @@ pub struct ExerciseDetails {
 }
 
 #[derive(Debug, Deserialize, Serialize, JsonSchema)]
-pub struct ExerciseChecksums {
+pub struct ExercisesDetails {
     pub id: usize,
+    pub course_name: String,
+    pub exercise_name: String,
     pub checksum: String,
 }
 

tmc-langs-core/src/tmc_core.rs

@@ -329,7 +329,7 @@ impl TmcCore {
     pub fn get_exercises_details(
         &self,
         exercise_ids: Vec<usize>,
-    ) -> Result<Vec<ExerciseChecksums>, CoreError> {
+    ) -> Result<Vec<ExercisesDetails>, CoreError> {
         self.core_exercise_details(exercise_ids)
     }
 

tmc-langs-core/src/tmc_core/api.rs

@@ -4,7 +4,7 @@ use crate::error::CoreError;
 use crate::response::ErrorResponse;
 use crate::{
     Course, CourseData, CourseDataExercise, CourseDataExercisePoint, CourseDetails, CourseExercise,
-    ExerciseChecksums, ExerciseDetails, FeedbackAnswer, NewSubmission, Organization, Review,
+    ExerciseDetails, ExercisesDetails, FeedbackAnswer, NewSubmission, Organization, Review,
     Submission, SubmissionFeedbackResponse, TmcCore, User,
 };
 use oauth2::TokenResponse;
@@ -610,7 +610,7 @@ impl TmcCore {
     pub(super) fn core_exercise_details(
         &self,
         exercise_ids: Vec<usize>,
-    ) -> Result<Vec<ExerciseChecksums>, CoreError> {
+    ) -> Result<Vec<ExercisesDetails>, CoreError> {
         if self.token.is_none() {
             return Err(CoreError::NotLoggedIn);
         }
@@ -625,7 +625,7 @@ impl TmcCore {
         );
 
         // returns map with result in key "exercises"
-        let res: HashMap<String, Vec<ExerciseChecksums>> =
+        let res: HashMap<String, Vec<ExercisesDetails>> =
             self.get_json_with_params(&url_tail, &[exercise_ids])?;
         if let Some((_, val)) = res.into_iter().next() {
             // just return whatever value is found first