progress updates in core submit, log R logs

Author: Heliozoa

tmc-langs-cli/src/main.rs

@@ -515,6 +515,8 @@ fn run() -> Result<()> {
             env::var("TMC_CORE_CLI_ROOT_URL").unwrap_or_else(|_| "https://tmc.mooc.fi".to_string());
         let mut core = TmcCore::new_in_config(root_url)
             .with_context(|| format!("Failed to create TmcCore"))?;
+        // set progress report to print the updates to stdout as JSON
+        core.set_progress_report(|update| println!("{}", serde_json::to_string(&update).unwrap()));
 
         let email = matches.value_of("email").unwrap();
         // TODO: "Please enter password" and quiet param

tmc-langs-core/src/tmc_core.rs

@@ -11,6 +11,7 @@ use oauth2::{
     AuthUrl, ClientId, ClientSecret, ResourceOwnerPassword, ResourceOwnerUsername, TokenUrl,
 };
 use reqwest::{blocking::Client, Url};
+use serde::Serialize;
 use std::collections::HashMap;
 use std::io::Write;
 use std::path::Path;
@@ -21,6 +22,12 @@ use tmc_langs_util::task_executor;
 pub type Token =
     oauth2::StandardTokenResponse<oauth2::EmptyExtraTokenFields, oauth2::basic::BasicTokenType>;
 
+#[derive(Debug, Serialize)]
+pub enum StatusUpdate {
+    Processing(&'static str, f64),
+    Finished,
+}
+
 /// A struct for interacting with the TestMyCode service, including authentication
 pub struct TmcCore {
     client: Client,
@@ -29,6 +36,7 @@ pub struct TmcCore {
     api_url: Url,
     auth_url: String,
     token: Option<Token>,
+    progress_report: Option<Box<dyn Fn(StatusUpdate)>>,
 }
 
 // TODO: cache API results?
@@ -64,6 +72,7 @@ impl TmcCore {
             api_url,
             auth_url,
             token: None,
+            progress_report: None,
         })
     }
 
@@ -83,6 +92,25 @@ impl TmcCore {
         Self::new(config_dir, root_url)
     }
 
+    pub fn set_progress_report<F>(&mut self, progress_report: F)
+    where
+        F: Fn(StatusUpdate) + 'static,
+    {
+        self.progress_report = Some(Box::new(progress_report));
+    }
+
+    pub fn report_progress(&self, msg: &'static str, progress: f64) {
+        self.progress_report
+            .as_ref()
+            .map(|f| f(StatusUpdate::Processing(msg, progress)));
+    }
+
+    pub fn report_complete(&self) {
+        self.progress_report
+            .as_ref()
+            .map(|f| f(StatusUpdate::Finished));
+    }
+
     /// Attempts to log in with the given credentials, returns an error if an authentication token is already present.
     /// Username can be the user's username or email.
     ///
@@ -329,12 +357,18 @@ impl TmcCore {
         locale: Language,
     ) -> Result<NewSubmission> {
         // compress
+        self.report_progress("Submitting exercise. Compressing submission...", 0.0);
         let compressed = task_executor::compress_project(submission_path)?;
+        self.report_progress("Compressed submission. Creating temporary file...", 0.25);
         let mut file = NamedTempFile::new().map_err(CoreError::TempFile)?;
+        self.report_progress("Created temporary file. Writing compressed data...", 0.5);
         file.write_all(&compressed)
             .map_err(|e| CoreError::FileWrite(file.path().to_path_buf(), e))?;
+        self.report_progress("Wrote compressed data. Posting submission...", 0.75);
 
-        self.post_submission(submission_url, file.path(), locale)
+        let result = self.post_submission(submission_url, file.path(), locale);
+        self.report_complete();
+        result
     }
 
     /// Fetches the course's exercises from the server,

tmc-langs-r/src/plugin.rs

@@ -84,6 +84,10 @@ impl LanguagePlugin for RPlugin {
             .args(args)
             .output()
             .map_err(|e| RError::Command("Rscript", e))?;
+
+        log::trace!("stdout: {}", String::from_utf8_lossy(&out.stdout));
+        log::debug!("stderr: {}", String::from_utf8_lossy(&out.stderr));
+
         if !out.status.success() {
             return Err(RError::CommandStatus("Rscript", out.status).into());
         }