Improve printer for execution results (#78)

* Refactor result printer

* Move printer files to a printer mod

* Refactor

* Add decorator

* Implement submit result printer

Author: dragfire

src/config.rs

@@ -68,6 +68,17 @@ pub enum Either {
     String(String),
 }
 
+impl From<String> for Either {
+    fn from(s: String) -> Self {
+        let split: Vec<String> = s.trim().split("\n").map(|st| st.to_owned()).collect();
+        if split.is_empty() {
+            Either::String(s.to_owned())
+        } else {
+            Either::Sequence(split)
+        }
+    }
+}
+
 impl ToString for Either {
     fn to_string(&self) -> String {
         match self {

src/lib.rs

@@ -4,6 +4,7 @@ pub use error::{LeetUpError, Result};
 pub mod cmd;
 mod config;
 mod error;
+mod printer;
 
 pub(crate) mod client;
 pub(crate) mod icon;

src/model/mod.rs

@@ -206,10 +206,18 @@ pub struct CodeDefinition {
 }
 
 #[derive(Deserialize, Debug)]
-pub struct SubmissionResult {
+pub struct SubmissionResponse {
+    pub state: Option<String>,
+    pub input: Option<Either>,
+    pub input_formatted: Option<Either>,
     pub code_output: Option<Either>,
+    pub std_output: Option<Either>,
+    pub last_test_case: Option<Either>,
+    pub correct_answer: Option<bool>,
     pub code_answer: Option<Either>,
+    pub expected_output: Option<Either>,
     pub expected_code_output: Option<Either>,
+    pub expected_answer: Option<Either>,
     pub expected_code_answer: Option<Either>,
     pub compare_result: Option<String>,
     pub compile_error: Option<String>,
@@ -218,7 +226,6 @@ pub struct SubmissionResult {
     pub memory: Option<u32>,
     pub memory_percentile: Option<f32>,
     pub pretty_lang: String,
-    pub question_id: Option<u32>,
     pub run_success: bool,
     pub runtime_percentile: Option<f32>,
     pub expected_status_code: Option<u32>,
@@ -230,16 +237,31 @@ pub struct SubmissionResult {
     pub total_testcases: Option<u32>,
 }
 
-impl SubmissionResult {
-    pub fn has_compile_error(&self) -> bool {
+pub trait ExecutionErrorResponse {
+    fn has_compile_error(&self) -> bool;
+
+    fn has_runtime_error(&self) -> bool;
+
+    fn has_error(&self) -> bool;
+
+    fn is_error(&self) -> bool {
+        self.has_compile_error() || self.has_runtime_error() || self.has_error()
+    }
+}
+
+impl ExecutionErrorResponse for SubmissionResponse {
+    fn has_compile_error(&self) -> bool {
         self.compile_error.is_some() || self.full_compile_error.is_some()
     }
 
-    pub fn has_runtime_error(&self) -> bool {
-        self.status_msg.to_lowercase().contains("error")
+    fn has_runtime_error(&self) -> bool {
+        let tle = "time limit exceeded";
+        let msg = self.status_msg.to_lowercase();
+
+        msg.eq(tle) || msg.contains("error")
     }
 
-    pub fn has_error(&self) -> bool {
+    fn has_error(&self) -> bool {
         self.total_correct.lt(&self.total_testcases)
     }
 }

src/printer/mod.rs

@@ -0,0 +1,7 @@
+mod printer;
+mod submit_execution_printer;
+mod test_execution_printer;
+
+pub use printer::*;
+pub use submit_execution_printer::SubmitExecutionResult;
+pub use test_execution_printer::TestExecutionResult;

src/printer/printer.rs

@@ -0,0 +1,31 @@
+use crate::model::SubmissionResponse;
+
+pub(crate) const NEW_LINE: &'static str = "\n";
+pub(crate) const TEXT_BOLD_ON: &'static str = "\x1b[1m";
+pub(crate) const TEXT_BOLD_OFF: &'static str = "\x1b[m";
+
+pub trait Printer {
+    fn print(&self) {
+        print!("{}", self.buffer());
+    }
+
+    fn is_error(&self) -> bool;
+
+    fn buffer(&self) -> String;
+
+    fn total_cases_ratio_buffer(&self, response: &SubmissionResponse) -> String {
+        format!(
+            "{}/{}",
+            response.total_correct.unwrap_or(0),
+            response.total_testcases.unwrap_or(0)
+        )
+    }
+}
+
+pub mod decorator {
+    use super::*;
+
+    pub fn bold_text(s: &str) -> String {
+        format!("{}{}{}", s, TEXT_BOLD_ON, TEXT_BOLD_OFF)
+    }
+}