moved more logic from CLI to tmc-langs

Author: Heliozoa

tmc-client/src/tmc_client.rs

@@ -225,6 +225,12 @@ impl TmcClient {
             None,
         );
 
+        // for each exercise, check if there's already something on disk
+        // if yes, check if it needs updating
+        // if not, check if there's a previous submission
+        //   if yes, download it
+        //   if not, download the exercise template
+
         let thread_count = exercises_len.min(4); // max 4 threads
         let mut handles = vec![];
         let exercises = Arc::new(Mutex::new(exercises));
@@ -369,7 +375,7 @@ impl TmcClient {
 
     pub fn get_exercises_details(
         &self,
-        exercise_ids: Vec<usize>,
+        exercise_ids: &[usize],
     ) -> Result<Vec<ExercisesDetails>, ClientError> {
         self.core_exercise_details(exercise_ids)
     }

tmc-client/src/tmc_client/api.rs

@@ -658,7 +658,7 @@ impl TmcClient {
 
     pub(super) fn core_exercise_details(
         &self,
-        exercise_ids: Vec<usize>,
+        exercise_ids: &[usize],
     ) -> Result<Vec<ExercisesDetails>, ClientError> {
         if self.0.token.is_none() {
             return Err(ClientError::NotLoggedIn);

tmc-langs-cli/src/app.rs

@@ -1,12 +1,11 @@
 //! Create clap app
 
-use crate::output::{
-    CombinedCourseData, DownloadOrUpdateCourseExercisesResult, LocalExercise, UpdatedExercise,
-};
+use crate::output::{LocalExercise, UpdatedExercise};
 use clap::{App, AppSettings, Arg, SubCommand};
 use schemars::JsonSchema;
 use std::path::PathBuf;
 use tmc_langs::{
+    data::{CombinedCourseData, DownloadOrUpdateCourseExercisesResult},
     CourseData, CourseDetails, CourseExercise, ExerciseDesc, ExerciseDetails,
     ExercisePackagingConfiguration, NewSubmission, Organization, Review, RunResult,
     StyleValidationResult, Submission, SubmissionFeedbackResponse, SubmissionFinished,
@@ -311,7 +310,7 @@ fn create_core_app() -> App<'static, 'static> {
         .subcommand(SubCommand::with_name("download-old-submission")
             .about("Downloads an old submission. Resets the exercise at output-path if any, downloading the exercise base from the server. The old submission is then downloaded and extracted on top of the base, using the student file policy to retain student files")
             .long_about(SCHEMA_NULL)
-            .arg(Arg::with_name("save-old-state")
+            .arg(Arg::with_name("save-old-state") // TODO: unnecessary, remove (submission-url is enough, but probaly needs a rename if the flag is removed)
                 .help("If set, the exercise is submitted to the server before resetting it.")
                 .long("save-old-state")
                 .requires("submission-url"))

tmc-langs-cli/src/error.rs

@@ -1,7 +1,6 @@
 use std::path::PathBuf;
 use thiserror::Error;
-
-use crate::output::DownloadOrUpdateCourseExercise;
+use tmc_langs::ExerciseDownload;
 
 #[derive(Debug, Error)]
 #[error("Invalid token. Deleted credentials file")]
@@ -19,7 +18,7 @@ pub struct SandboxTestError {
 #[derive(Debug, Error)]
 #[error("Failed to download one or more exercises")]
 pub struct DownloadsFailedError {
-    pub downloaded: Vec<DownloadOrUpdateCourseExercise>,
-    pub skipped: Vec<DownloadOrUpdateCourseExercise>,
-    pub failed: Vec<(DownloadOrUpdateCourseExercise, Vec<String>)>,
+    pub downloaded: Vec<ExerciseDownload>,
+    pub skipped: Vec<ExerciseDownload>,
+    pub failed: Vec<(ExerciseDownload, Vec<String>)>,
 }