Merge branch 'mooc'

Author: Heliozoa

.cargo/config.toml

@@ -1,3 +1,6 @@
+#[build]
+#target = "x86_64-pc-windows-gnu"
+
 [target.armv7-unknown-linux-gnueabihf]
 linker = "arm-linux-gnueabihf-gcc"
 

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

@@ -15,7 +15,7 @@ fn main() {
         // getExercisePackagingConfiguration
         tmc_langs::ExercisePackagingConfiguration,
         // listLocalCourseExercises
-        tmc_langs::LocalExercise,
+        tmc_langs::LocalTmcExercise,
         // prepareSubmission
         tmc_langs::Compression,
         // refreshCourse
@@ -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,
@@ -168,7 +168,7 @@ fn get_exercise_packaging_configuration(mut cx: FunctionContext) -> JsResult<JsV
 fn list_local_course_exercises(mut cx: FunctionContext) -> JsResult<JsValue> {
     parse_args!(cx, client_name: String, course_slug: String);
 
-    let res = tmc_langs::list_local_course_exercises(&client_name, &course_slug);
+    let res = tmc_langs::list_local_tmc_course_exercises(&client_name, &course_slug);
     convert_res(&mut cx, res)
 }
 
@@ -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

@@ -14,7 +14,7 @@ student_file_paths: Array<string>,
  */
 exercise_file_paths: Array<string>, }
 
-export type LocalExercise = { "exercise-slug": string, "exercise-path": string, }
+export type LocalTmcExercise = { "exercise-slug": string, "exercise-path": string, }
 
 export type Compression = "tar" | "zip" | "zstd";
 

crates/bindings/tmc-langs-node/ts/generated.d.ts

@@ -2,7 +2,7 @@ export type Locale = string;
 
 export type CliOutput = { "output-kind": "output-data" } & OutputData | { "output-kind": "status-update" } & StatusUpdateData | { "output-kind": "notification" } & Notification;
 
-export type DataKind = { "output-data-kind": "error", "output-data": { kind: Kind, trace: Array<string>, } } | { "output-data-kind": "validation", "output-data": StyleValidationResult | null } | { "output-data-kind": "available-points", "output-data": Array<string> } | { "output-data-kind": "exercises", "output-data": Array<string> } | { "output-data-kind": "exercise-packaging-configuration", "output-data": ExercisePackagingConfiguration } | { "output-data-kind": "local-exercises", "output-data": Array<LocalExercise> } | { "output-data-kind": "refresh-result", "output-data": RefreshData } | { "output-data-kind": "test-result", "output-data": RunResult } | { "output-data-kind": "exercise-desc", "output-data": ExerciseDesc } | { "output-data-kind": "updated-exercises", "output-data": Array<UpdatedExercise> } | { "output-data-kind": "exercise-download", "output-data": DownloadOrUpdateCourseExercisesResult } | { "output-data-kind": "combined-course-data", "output-data": CombinedCourseData } | { "output-data-kind": "course-details", "output-data": CourseDetails } | { "output-data-kind": "course-exercises", "output-data": Array<CourseExercise> } | { "output-data-kind": "course-data", "output-data": CourseData } | { "output-data-kind": "courses", "output-data": Array<Course> } | { "output-data-kind": "exercise-details", "output-data": ExerciseDetails } | { "output-data-kind": "submissions", "output-data": Array<Submission> } | { "output-data-kind": "update-result", "output-data": UpdateResult } | { "output-data-kind": "organization", "output-data": Organization } | { "output-data-kind": "organizations", "output-data": Array<Organization> } | { "output-data-kind": "reviews", "output-data": Array<Review> } | { "output-data-kind": "token", "output-data": unknown } | { "output-data-kind": "new-submission", "output-data": NewSubmission } | { "output-data-kind": "submission-feedback-response", "output-data": SubmissionFeedbackResponse } | { "output-data-kind": "submission-finished", "output-data": SubmissionFinished } | { "output-data-kind": "config-value", "output-data": ConfigValue } | { "output-data-kind": "tmc-config", "output-data": TmcConfig } | { "output-data-kind": "compressed-project-hash", "output-data": string } | { "output-data-kind": "submission-sandbox", "output-data": string } | { "output-data-kind": "mooc-course-instances", "output-data": Array<CourseInstance> } | { "output-data-kind": "mooc-exercise-slides", "output-data": Array<TmcExerciseSlide> } | { "output-data-kind": "mooc-exercise-slide", "output-data": TmcExerciseSlide } | { "output-data-kind": "mooc-submission-finished", "output-data": ExerciseTaskSubmissionResult };
+export type DataKind = { "output-data-kind": "error", "output-data": { kind: Kind, trace: Array<string>, } } | { "output-data-kind": "validation", "output-data": StyleValidationResult | null } | { "output-data-kind": "available-points", "output-data": Array<string> } | { "output-data-kind": "exercises", "output-data": Array<string> } | { "output-data-kind": "exercise-packaging-configuration", "output-data": ExercisePackagingConfiguration } | { "output-data-kind": "local-tmc-exercises", "output-data": Array<LocalTmcExercise> } | { "output-data-kind": "local-mooc-exercises", "output-data": Array<LocalMoocExercise> } | { "output-data-kind": "refresh-result", "output-data": RefreshData } | { "output-data-kind": "test-result", "output-data": RunResult } | { "output-data-kind": "exercise-desc", "output-data": ExerciseDesc } | { "output-data-kind": "updated-exercises", "output-data": Array<UpdatedExercise> } | { "output-data-kind": "exercise-download", "output-data": DownloadOrUpdateCourseExercisesResult } | { "output-data-kind": "combined-course-data", "output-data": CombinedCourseData } | { "output-data-kind": "course-details", "output-data": CourseDetails } | { "output-data-kind": "course-exercises", "output-data": Array<CourseExercise> } | { "output-data-kind": "course-data", "output-data": CourseData } | { "output-data-kind": "courses", "output-data": Array<Course> } | { "output-data-kind": "exercise-details", "output-data": ExerciseDetails } | { "output-data-kind": "submissions", "output-data": Array<Submission> } | { "output-data-kind": "update-result", "output-data": UpdateResult } | { "output-data-kind": "organization", "output-data": Organization } | { "output-data-kind": "organizations", "output-data": Array<Organization> } | { "output-data-kind": "reviews", "output-data": Array<Review> } | { "output-data-kind": "token", "output-data": unknown } | { "output-data-kind": "new-submission", "output-data": NewSubmission } | { "output-data-kind": "submission-feedback-response", "output-data": SubmissionFeedbackResponse } | { "output-data-kind": "submission-finished", "output-data": SubmissionFinished } | { "output-data-kind": "config-value", "output-data": ConfigValue } | { "output-data-kind": "tmc-config", "output-data": TmcConfig } | { "output-data-kind": "compressed-project-hash", "output-data": string } | { "output-data-kind": "submission-sandbox", "output-data": string } | { "output-data-kind": "mooc-course-instances", "output-data": Array<CourseInstance> } | { "output-data-kind": "mooc-exercise-slides", "output-data": Array<TmcExerciseSlide> } | { "output-data-kind": "mooc-exercise-slide", "output-data": TmcExerciseSlide } | { "output-data-kind": "mooc-submission-finished", "output-data": ExerciseTaskSubmissionResult };
 
 export type Kind = "generic" | "forbidden" | "not-logged-in" | "connection-error" | "obsolete-client" | "invalid-token" | { "failed-exercise-download": { completed: Array<ExerciseDownload>, skipped: Array<ExerciseDownload>, failed: Array<[ExerciseDownload, Array<string>]>, } };
 
@@ -38,7 +38,11 @@ student_file_paths: Array<string>,
  */
 exercise_file_paths: Array<string>, }
 
-export type LocalExercise = { "exercise-slug": string, "exercise-path": string, }
+export type LocalExercise = { "tmc": LocalTmcExercise } | { "mooc": LocalMoocExercise };
+
+export type LocalTmcExercise = { "exercise-slug": string, "exercise-path": string, }
+
+export type LocalMoocExercise = { "exercise-id": string, "exercise-path": string, }
 
 export type Compression = "tar" | "zip" | "zstd";
 
@@ -290,9 +294,9 @@ export type TmcExerciseSlide = { slide_id: string, exercise_id: string, exercise
 
 export type TmcExerciseTask = { task_id: string, order_number: number, assignment: unknown, public_spec: PublicSpec | null, model_solution_spec: ModelSolutionSpec | null, }
 
-export type PublicSpec = { "type": "browser", files: Array<ExerciseFile>, } | { "type": "editor", archiveName: string, archiveDownloadUrl: string, checksum: string, };
+export type PublicSpec = { "type": "Browser", files: Array<ExerciseFile>, } | { "type": "Editor", archive_name: string, archive_download_url: string, checksum: string, };
 
-export type ModelSolutionSpec = { "type": "browser", solutionFiles: Array<ExerciseFile>, } | { "type": "editor", archiveDownloadUrl: string, };
+export type ModelSolutionSpec = { "type": "Browser", solution_files: Array<ExerciseFile>, } | { "type": "Editor", download_url: string, };
 
 export type ExerciseFile = { filepath: string, contents: string, }