Update exercises

Author: Heliozoa

Cargo.lock

@@ -44,5 +44,5 @@ ts-rs = { git = "https://github.com/Heliozoa/ts-rs.git", rev = "16362e1936b328f9
 # [patch.'https://github.com/Heliozoa/ts-rs.git']
 # ts-rs = { path = "../ts-rs/ts-rs" }
 
-# [patch.'https://github.com/rage/secret-project-331.git']
-# mooc-langs-api = { path = "../secret-project-331/services/headless-lms/langs-api" }
+[patch.'https://github.com/rage/secret-project-331.git']
+mooc-langs-api = { path = "../secret-project-331/services/headless-lms/langs-api" }

Cargo.toml

@@ -33,8 +33,8 @@ fn main() {
         // checkExerciseUpdates
         tmc_langs::UpdatedExercise,
         // downloadOrUpdateCourseExercises
-        tmc_langs::DownloadOrUpdateCourseExercisesResult,
-        tmc_langs::ExerciseDownload,
+        tmc_langs::DownloadOrUpdateTmcCourseExercisesResult,
+        tmc_langs::TmcExerciseDownload,
         // getCourseData
         tmc_langs::CombinedCourseData,
 

crates/bindings/tmc-langs-node/src/bin/generate-node-bindings.rs

@@ -16,7 +16,7 @@ use std::{
 };
 use thiserror::Error;
 use tmc_langs::{
-    Compression, Credentials, DownloadOrUpdateCourseExercisesResult, LangsError, Language,
+    Compression, Credentials, DownloadOrUpdateTmcCourseExercisesResult, LangsError, Language,
     PrepareSubmission, TmcConfig, file_util,
     tmc::{
         TestMyCodeClient, TestMyCodeClientError,
@@ -352,7 +352,7 @@ fn download_or_update_course_exercises(mut cx: FunctionContext) -> JsResult<JsVa
         tmc_langs::DownloadResult::Success {
             downloaded,
             skipped,
-        } => DownloadOrUpdateCourseExercisesResult {
+        } => DownloadOrUpdateTmcCourseExercisesResult {
             downloaded,
             skipped,
             failed: None,
@@ -361,7 +361,7 @@ fn download_or_update_course_exercises(mut cx: FunctionContext) -> JsResult<JsVa
             downloaded,
             skipped,
             failed,
-        } => DownloadOrUpdateCourseExercisesResult {
+        } => DownloadOrUpdateTmcCourseExercisesResult {
             downloaded,
             skipped,
             failed: Some(failed),
@@ -746,7 +746,7 @@ fn update_exercises(mut cx: FunctionContext) -> JsResult<JsValue> {
     let projects_dir =
         tmc_langs::get_projects_dir(&client_name).map_err(|e| convert_err(&mut cx, e))?;
     let res = with_client(client_name, client_version, |client| {
-        tmc_langs::update_exercises(client, &projects_dir)
+        tmc_langs::update_tmc_exercises(client, &projects_dir)
     });
     convert_res(&mut cx, res)
 }

crates/bindings/tmc-langs-node/src/lib.rs

@@ -5,7 +5,7 @@ use clap::Parser;
 use schemars::JsonSchema;
 use std::{path::PathBuf, str::FromStr};
 use tmc_langs::{
-    CombinedCourseData, Compression, DownloadOrUpdateCourseExercisesResult, ExerciseDesc,
+    CombinedCourseData, Compression, DownloadOrUpdateTmcCourseExercisesResult, ExerciseDesc,
     ExercisePackagingConfiguration, Language, LocalExercise, RunResult, StyleValidationResult,
     UpdatedExercise,
     mooc::CourseInstance,
@@ -307,7 +307,7 @@ pub enum TestMyCodeCommand {
     },
 
     /// 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
-    #[clap(long_about = schema_leaked::<DownloadOrUpdateCourseExercisesResult>())]
+    #[clap(long_about = schema_leaked::<DownloadOrUpdateTmcCourseExercisesResult>())]
     DownloadOrUpdateCourseExercises {
         /// If set, will always download the course template instead of the latest submission, even if one exists.
         #[clap(long)]
@@ -569,6 +569,9 @@ pub enum MoocCommand {
         #[clap(long)]
         target: PathBuf,
     },
+    /// Updates all local exercises that have been updated on the server
+    #[clap(long_about = SCHEMA_NULL)]
+    UpdateExercises,
     /// Submits an exercise.
     Submit {
         #[clap(long)]

crates/tmc-langs-cli/src/app.rs

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

crates/tmc-langs-cli/src/error.rs

@@ -24,8 +24,8 @@ use std::{
     path::{Path, PathBuf},
 };
 use tmc_langs::{
-    CommandError, Compression, Credentials, DownloadOrUpdateCourseExercisesResult, DownloadResult,
-    Language, StyleValidationResult, TmcConfig, UpdatedExercise,
+    CommandError, Compression, Credentials, DownloadOrUpdateTmcCourseExercisesResult,
+    DownloadResult, Language, StyleValidationResult, TmcConfig, UpdatedExercise,
     file_util::{self, Lock, LockOptions},
     mooc::{MoocClient, MoocClientError},
     tmc::{TestMyCodeClient, TestMyCodeClientError, request::FeedbackAnswer},
@@ -231,7 +231,7 @@ fn run_app(cli: Cli) -> Result<CliOutput> {
             let mut lock = Lock::dir(&exercise_path, LockOptions::Read)?;
             let _guard = lock.lock()?;
 
-            let hash = tmc_langs::compress_project_to(
+            let hash = tmc_langs::compress_project_to_with_hash(
                 &exercise_path,
                 &output_path,
                 compression,
@@ -674,7 +674,7 @@ fn run_tmc_inner(
                 DownloadResult::Success {
                     downloaded,
                     skipped,
-                } => DownloadOrUpdateCourseExercisesResult {
+                } => DownloadOrUpdateTmcCourseExercisesResult {
                     downloaded,
                     skipped,
                     failed: None,
@@ -683,15 +683,15 @@ fn run_tmc_inner(
                     downloaded,
                     skipped,
                     failed,
-                } => DownloadOrUpdateCourseExercisesResult {
+                } => DownloadOrUpdateTmcCourseExercisesResult {
                     downloaded,
                     skipped,
                     failed: Some(failed),
                 },
             };
             CliOutput::finished_with_data(
                 "downloaded or updated exercises",
-                DataKind::ExerciseDownload(data),
+                DataKind::TmcExerciseDownload(data),
             )
         }
 
@@ -1011,10 +1011,10 @@ fn run_tmc_inner(
 
         TestMyCodeCommand::UpdateExercises => {
             let projects_dir = tmc_langs::get_projects_dir(client_name)?;
-            let data = tmc_langs::update_exercises(client, &projects_dir)?;
+            let data = tmc_langs::update_tmc_exercises(client, &projects_dir)?;
             CliOutput::finished_with_data(
                 "downloaded or updated exercises",
-                DataKind::ExerciseDownload(data),
+                DataKind::TmcExerciseDownload(data),
             )
         }
 
@@ -1064,6 +1064,8 @@ fn run_mooc(mooc: Mooc) -> Result<CliOutput> {
 }
 
 fn run_mooc_inner(mooc: Mooc, client: &mut MoocClient) -> Result<CliOutput> {
+    let client_name = &mooc.client_name;
+
     let output = match mooc.command {
         MoocCommand::CourseInstance {
             course_instance_id: _,
@@ -1102,6 +1104,11 @@ fn run_mooc_inner(mooc: Mooc, client: &mut MoocClient) -> Result<CliOutput> {
             )?;
             CliOutput::finished("downloaded exercise")
         }
+        MoocCommand::UpdateExercises => {
+            let projects_dir = tmc_langs::get_projects_dir(client_name)?;
+            let res = tmc_langs::update_mooc_exercises(client, &projects_dir)?;
+            CliOutput::finished_with_data("updated exercises", DataKind::MoocExerciseDownload(res))
+        }
         MoocCommand::Submit {
             exercise_id,
             slide_id,