get-course-data command

Author: Heliozoa

tmc-langs-cli/src/app.rs

@@ -1,5 +1,6 @@
 //! Create clap app
 
+use crate::output::CombinedCourseData;
 use clap::{App, AppSettings, Arg, SubCommand};
 use schemars::JsonSchema;
 use std::path::PathBuf;
@@ -265,6 +266,15 @@ fn create_core_app() -> App<'static, 'static> {
                 .value_names(&["exercise-id", "exercise-path"])
                 .multiple(true)))
 
+        .subcommand(SubCommand::with_name("get-course-data")
+            .about("Fetches course data. Combines course details, course exercises and course settings.")
+            .long_about(schema_leaked::<CombinedCourseData>())
+            .arg(Arg::with_name("course-id")
+                .help("The ID of the course.")
+                .long("course-id")
+                .required(true)
+                .takes_value(true)))
+
         .subcommand(SubCommand::with_name("get-course-details")
             .about("Fetches course details.")
             .long_about(schema_leaked::<CourseDetails>())

tmc-langs-cli/src/main.rs

@@ -3,7 +3,7 @@
 mod app;
 mod output;
 
-use output::{ErrorData, Kind, Output, OutputResult, Status};
+use output::{CombinedCourseData, ErrorData, Kind, Output, OutputResult, Status};
 
 use anyhow::{Context, Result};
 use clap::{ArgMatches, Error, ErrorKind};
@@ -604,11 +604,37 @@ fn run_core(matches: &ArgMatches) -> Result<PrintToken> {
             };
             print_output(&output)?
         }
+        ("get-course-data", Some(matches)) => {
+            let course_id = matches.value_of("course-id").unwrap();
+            let course_id = into_usize(course_id)?;
+
+            let details = core
+                .get_course_details(course_id)
+                .context("Failed to get course details")?;
+            let exercises = core
+                .get_course_exercises(course_id)
+                .context("Failed to get course")?;
+            let settings = core.get_course(course_id).context("Failed to get course")?;
+            let data = CombinedCourseData {
+                details,
+                exercises,
+                settings,
+            };
+
+            let output = Output {
+                status: Status::Finished,
+                message: None,
+                result: OutputResult::RetrievedData,
+                percent_done: 1.0,
+                data: Some(data),
+            };
+            print_output(&output)?
+        }
         ("get-course-details", Some(matches)) => {
             let course_id = matches.value_of("course-id").unwrap();
             let course_id = into_usize(course_id)?;
 
-            let course_details = core
+            let details = core
                 .get_course_details(course_id)
                 .context("Failed to get course details")?;
 
@@ -617,15 +643,15 @@ fn run_core(matches: &ArgMatches) -> Result<PrintToken> {
                 message: None,
                 result: OutputResult::RetrievedData,
                 percent_done: 1.0,
-                data: Some(course_details),
+                data: Some(details),
             };
             print_output(&output)?
         }
         ("get-course-exercises", Some(matches)) => {
             let course_id = matches.value_of("course-id").unwrap();
             let course_id = into_usize(course_id)?;
 
-            let course = core
+            let exercises = core
                 .get_course_exercises(course_id)
                 .context("Failed to get course")?;
 
@@ -634,22 +660,22 @@ fn run_core(matches: &ArgMatches) -> Result<PrintToken> {
                 message: None,
                 result: OutputResult::RetrievedData,
                 percent_done: 1.0,
-                data: Some(course),
+                data: Some(exercises),
             };
             print_output(&output)?
         }
         ("get-course-settings", Some(matches)) => {
             let course_id = matches.value_of("course-id").unwrap();
             let course_id = into_usize(course_id)?;
 
-            let course = core.get_course(course_id).context("Failed to get course")?;
+            let settings = core.get_course(course_id).context("Failed to get course")?;
 
             let output = Output {
                 status: Status::Finished,
                 message: None,
                 result: OutputResult::RetrievedData,
                 percent_done: 1.0,
-                data: Some(course),
+                data: Some(settings),
             };
             print_output(&output)?
         }

tmc-langs-cli/src/output.rs

@@ -1,7 +1,8 @@
 //! Output format
 
+use schemars::JsonSchema;
 use serde::Serialize;
-use tmc_langs_core::StatusType;
+use tmc_langs_core::{CourseData, CourseDetails, CourseExercise, StatusType};
 
 /// The format for all messages written to stdout by the CLI
 #[derive(Debug, Serialize)]
@@ -79,3 +80,10 @@ pub enum Kind {
     /// Failed to connect to the TMC server, likely due to no internet connection
     ConnectionError,
 }
+
+#[derive(Debug, Serialize, JsonSchema)]
+pub struct CombinedCourseData {
+    pub details: CourseDetails,
+    pub exercises: Vec<CourseExercise>,
+    pub settings: CourseData,
+}