remove core variant from outputresult

Author: Heliozoa

tmc-langs-cli/src/main.rs

@@ -18,7 +18,7 @@ use tempfile::NamedTempFile;
 use tmc_langs_core::oauth2::{
     basic::BasicTokenType, AccessToken, EmptyExtraTokenFields, Scope, StandardTokenResponse,
 };
-use tmc_langs_core::{FeedbackAnswer, TmcCore, Token};
+use tmc_langs_core::{FeedbackAnswer, StatusType, TmcCore, Token};
 use tmc_langs_framework::{domain::ValidationResult, io::submission_processing};
 use tmc_langs_util::{
     task_executor::{self, TmcParams},
@@ -440,7 +440,7 @@ fn run() -> Result<()> {
             let output = Output::<()> {
                 status: Status::InProgress,
                 message: Some(update.message.to_string()),
-                result: OutputResult::Core(update.status_type),
+                result: update.status_type.into(),
                 percent_done: update.percent_done,
                 data: None,
             };

tmc-langs-cli/src/output.rs

@@ -31,5 +31,25 @@ pub enum OutputResult {
     SentData,
     RetrievedData,
     ExecutedCommand,
-    Core(StatusType),
+    Downloading,
+    Compressing,
+    Extracting,
+    Processing,
+    Sending,
+    WaitingForResults,
+    Finished,
+}
+
+impl From<StatusType> for OutputResult {
+    fn from(status_type: StatusType) -> Self {
+        match status_type {
+            StatusType::Downloading => OutputResult::Downloading,
+            StatusType::Compressing => OutputResult::Compressing,
+            StatusType::Extracting => OutputResult::Extracting,
+            StatusType::Processing => OutputResult::Processing,
+            StatusType::Sending => OutputResult::Sending,
+            StatusType::WaitingForResults => OutputResult::WaitingForResults,
+            StatusType::Finished => OutputResult::Finished,
+        }
+    }
 }