Work

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

@@ -15,7 +15,7 @@ fn main() {
         // getExercisePackagingConfiguration
         tmc_langs::ExercisePackagingConfiguration,
         // listLocalCourseExercises
-        tmc_langs::LocalExercise,
+        tmc_langs::LocalTmcExercise,
         // prepareSubmission
         tmc_langs::Compression,
         // refreshCourse

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

@@ -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)
 }
 

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, }
 

crates/tmc-langs-cli/bindings.d.ts

@@ -80,8 +80,10 @@ pub enum Command {
         naive: bool,
     },
 
+    /// Commands that communicate with the TMC server.
     Tmc(TestMyCode),
 
+    /// Commands that communicate with the Mooc server.
     Mooc(Mooc),
 
     /// Extracts an exercise from an archive. If the output-path is a project root, the plugin's student file policy will be used to avoid overwriting student files
@@ -133,7 +135,7 @@ pub enum Command {
 
     /// Returns a list of local exercises for the given course
     #[clap(long_about = schema_leaked::<Vec<LocalExercise>>())]
-    ListLocalCourseExercises {
+    ListLocalTmcCourseExercises {
         /// The client name of which the exercises should be listed.
         #[clap(long)]
         client_name: String,
@@ -542,23 +544,32 @@ pub struct Mooc {
 
 #[derive(Parser)]
 pub enum MoocCommand {
+    /// Fetches information about a course instance.
+    CourseInstance {
+        #[clap(long)]
+        course_instance_id: Uuid,
+    },
     /// Fetches the user's enrolled courses.
     #[clap(long_about = schema_leaked::<Vec<CourseInstance>>())]
     CourseInstances,
+    /// Fetches the available exercises for a course instance.
     CourseInstanceExercises {
         #[clap(long)]
         course_instance_id: Uuid,
     },
+    /// Fetches information about an exercise.
     Exercise {
         #[clap(long)]
         exercise_id: Uuid,
     },
+    /// Downloads an exercise.
     DownloadExercise {
         #[clap(long)]
         exercise_id: Uuid,
         #[clap(long)]
         target: PathBuf,
     },
+    /// Submits an exercise.
     Submit {
         #[clap(long)]
         exercise_id: Uuid,
@@ -644,7 +655,27 @@ impl FromStr for Locale {
             .or_else(|| Language::from_639_1(s))
             .or_else(|| Language::from_639_3(s))
             .with_context(|| format!("Invalid locale: {s}"))?;
-        Ok(Locale(locale))
+        Ok(Self(locale))
+    }
+}
+
+#[derive(Clone, Copy)]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+pub enum CourseType {
+    Tmc,
+    Mooc,
+}
+
+impl FromStr for CourseType {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let ct = match s.to_lowercase().as_str() {
+            "tmc" => Self::Tmc,
+            "mooc" => Self::Mooc,
+            other => return Err(anyhow::anyhow!("Invalid course type {other}")),
+        };
+        Ok(ct)
     }
 }
 
@@ -762,7 +793,7 @@ mod base_test {
     #[test]
     fn list_local_course_exercises() {
         get_matches(&[
-            "list-local-course-exercises",
+            "list-local-tmc-course-exercises",
             "--client-name",
             "client",
             "--course-slug",
@@ -1196,6 +1227,8 @@ mod test {
             tmc_langs::ExercisePackagingConfiguration,
             // listLocalCourseExercises
             tmc_langs::LocalExercise,
+            tmc_langs::LocalTmcExercise,
+            tmc_langs::LocalMoocExercise,
             // prepareSubmission
             tmc_langs::Compression,
             // refreshCourse

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

@@ -26,13 +26,11 @@ use std::{
 use tmc_langs::{
     CommandError, Compression, Credentials, DownloadOrUpdateCourseExercisesResult, DownloadResult,
     Language, StyleValidationResult, TmcConfig, UpdatedExercise,
-    mooc::MoocClient,
-    tmc::{TestMyCodeClient, TestMyCodeClientError, request::FeedbackAnswer},
-};
-use tmc_langs_util::{
-    deserialize,
     file_util::{self, Lock, LockOptions},
+    mooc::{MoocClient, MoocClientError},
+    tmc::{TestMyCodeClient, TestMyCodeClientError, request::FeedbackAnswer},
 };
+use tmc_langs_util::deserialize;
 
 pub enum ParsingResult {
     Ok(Cli),
@@ -104,7 +102,7 @@ fn solve_error_kind(e: &anyhow::Error) -> Kind {
             return Kind::InvalidToken;
         }
 
-        // check for client errors
+        // check for tmc client errors
         match cause.downcast_ref::<TestMyCodeClientError>() {
             Some(TestMyCodeClientError::HttpError {
                 url: _,
@@ -131,6 +129,33 @@ fn solve_error_kind(e: &anyhow::Error) -> Kind {
             _ => {}
         }
 
+        // check for tmc client errors
+        match cause.downcast_ref::<MoocClientError>() {
+            Some(MoocClientError::HttpError {
+                url: _,
+                status,
+                error: _,
+                obsolete_client,
+            }) => {
+                if *obsolete_client {
+                    return Kind::ObsoleteClient;
+                }
+                if status.as_u16() == 403 {
+                    return Kind::Forbidden;
+                }
+                if status.as_u16() == 401 {
+                    return Kind::NotLoggedIn;
+                }
+            }
+            Some(MoocClientError::NotAuthenticated) => {
+                return Kind::NotLoggedIn;
+            }
+            Some(MoocClientError::ConnectionError { .. }) => {
+                return Kind::ConnectionError;
+            }
+            _ => {}
+        }
+
         // check for download failed error
         if let Some(DownloadsFailedError {
             downloaded: completed,
@@ -308,16 +333,16 @@ fn run_app(cli: Cli) -> Result<CliOutput> {
             )
         }
 
-        Command::ListLocalCourseExercises {
+        Command::ListLocalTmcCourseExercises {
             client_name,
             course_slug,
         } => {
             let local_exercises =
-                tmc_langs::list_local_course_exercises(&client_name, &course_slug)?;
+                tmc_langs::list_local_tmc_course_exercises(&client_name, &course_slug)?;
 
             CliOutput::finished_with_data(
                 format!("listed local exercises for {course_slug}"),
-                DataKind::LocalExercises(local_exercises),
+                DataKind::LocalTmcExercises(local_exercises),
             )
         }
 
@@ -1008,7 +1033,9 @@ fn run_tmc_inner(
 
 fn run_mooc(mooc: Mooc) -> Result<CliOutput> {
     let root_url = env::var("TMC_LANGS_MOOC_ROOT_URL")
-        .unwrap_or_else(|_| "https://courses.mooc.fi".to_string());
+        .unwrap_or_else(|_| "https://courses.mooc.fi/".to_string())
+        .parse()
+        .context("Invalid TMC root url")?;
 
     let (mut client, credentials) =
         tmc_langs::init_mooc_client_with_credentials(root_url, &mooc.client_name)?;
@@ -1038,6 +1065,11 @@ fn run_mooc(mooc: Mooc) -> Result<CliOutput> {
 
 fn run_mooc_inner(mooc: Mooc, client: &mut MoocClient) -> Result<CliOutput> {
     let output = match mooc.command {
+        MoocCommand::CourseInstance {
+            course_instance_id: _,
+        } => {
+            todo!()
+        }
         MoocCommand::CourseInstances => {
             let course_instances = client.course_instances()?;
             CliOutput::finished_with_data(
@@ -1046,8 +1078,7 @@ fn run_mooc_inner(mooc: Mooc, client: &mut MoocClient) -> Result<CliOutput> {
             )
         }
         MoocCommand::CourseInstanceExercises { course_instance_id } => {
-            let course_instance_exercises =
-                client.course_instance_exercise_slides(course_instance_id)?;
+            let course_instance_exercises = client.course_instance_exercises(course_instance_id)?;
             CliOutput::finished_with_data(
                 "fetched course instance exercises",
                 DataKind::MoocExerciseSlides(course_instance_exercises),

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

@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 use tmc_langs::{
     CombinedCourseData, ConfigValue, DownloadOrUpdateCourseExercisesResult, ExerciseDesc,
-    ExerciseDownload, ExercisePackagingConfiguration, LocalExercise, RunResult,
-    StyleValidationResult, TmcConfig, UpdatedExercise, mooc,
+    ExerciseDownload, ExercisePackagingConfiguration, LocalExercise, LocalMoocExercise,
+    LocalTmcExercise, RunResult, StyleValidationResult, TmcConfig, UpdatedExercise, mooc,
     notification_reporter::Notification,
     tmc::{
         ClientUpdateData, Token, UpdateResult,
@@ -76,7 +76,8 @@ pub enum DataKind {
     AvailablePoints(Vec<String>),
     Exercises(Vec<PathBuf>),
     ExercisePackagingConfiguration(ExercisePackagingConfiguration),
-    LocalExercises(Vec<LocalExercise>),
+    LocalTmcExercises(Vec<LocalTmcExercise>),
+    LocalMoocExercises(Vec<LocalMoocExercise>),
     RefreshResult(tmc_langs::RefreshData),
     TestResult(RunResult),
     ExerciseDesc(ExerciseDesc),
@@ -161,7 +162,7 @@ pub enum Kind {
     },
 }
 
-pub use tmc_langs::ProjectsDirExercise;
+pub use tmc_langs::ProjectsDirTmcExercise;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct DownloadTarget {

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

@@ -6,10 +6,10 @@ mod tmc_config;
 
 pub use self::{
     credentials::Credentials,
-    projects_config::{CourseConfig, ProjectsConfig, ProjectsDirExercise},
+    projects_config::{ProjectsConfig, ProjectsDirTmcExercise, TmcCourseConfig},
     tmc_config::TmcConfig,
 };
-use crate::{TMC_LANGS_CONFIG_DIR_VAR, data::LocalExercise, error::LangsError};
+use crate::{TMC_LANGS_CONFIG_DIR_VAR, data::LocalTmcExercise, error::LangsError};
 use std::{
     collections::BTreeMap,
     env,
@@ -30,25 +30,23 @@ fn get_tmc_dir(client_name: &str) -> Result<PathBuf, LangsError> {
 }
 
 /// Returns all of the exercises for the given course.
-pub fn list_local_course_exercises(
+pub fn list_local_tmc_course_exercises(
     client_name: &str,
     course_slug: &str,
-) -> Result<Vec<LocalExercise>, LangsError> {
-    log::debug!(
-        "listing local course exercises of {course_slug} for {client_name}"
-    );
+) -> Result<Vec<LocalTmcExercise>, LangsError> {
+    log::debug!("listing local course exercises of {course_slug} for {client_name}");
 
     let projects_dir = TmcConfig::load(client_name)?.projects_dir;
     let mut projects_config = ProjectsConfig::load(&projects_dir)?;
 
     let exercises = projects_config
-        .courses
+        .tmc_courses
         .remove(course_slug)
         .map(|cc| cc.exercises)
         .unwrap_or_default();
-    let mut local_exercises: Vec<LocalExercise> = vec![];
+    let mut local_exercises: Vec<LocalTmcExercise> = vec![];
     for (exercise_slug, _) in exercises {
-        local_exercises.push(LocalExercise {
+        local_exercises.push(LocalTmcExercise {
             exercise_path: projects_dir.join(course_slug).join(&exercise_slug),
             exercise_slug,
         })
@@ -75,9 +73,9 @@ pub fn migrate_exercise(
     let _guard = lock.lock()?;
     let mut projects_config = ProjectsConfig::load(&tmc_config.projects_dir)?;
     let course_config = projects_config
-        .courses
+        .tmc_courses
         .entry(course_slug.to_string())
-        .or_insert(CourseConfig {
+        .or_insert(TmcCourseConfig {
             course: course_slug.to_string(),
             exercises: BTreeMap::new(),
         });
@@ -93,7 +91,7 @@ pub fn migrate_exercise(
 
     course_config.exercises.insert(
         exercise_slug.to_string(),
-        ProjectsDirExercise {
+        ProjectsDirTmcExercise {
             id: exercise_id,
             checksum: exercise_checksum.to_string(),
         },