clean up

Author: ssanj

README.md

@@ -1,54 +1,52 @@
 # Quiet
 
-When refactoring or working in some intermediate state, Cargo can end up spamming you with a lot of errors or warnings
-that you don't really care about. It would be nice to filter out these messages until you actually care about them.
+When refactoring or working in some intermediate state, Cargo can end up spamming you with a lot of errors or warnings that you don't really care about. It would be nice to filter out these messages until you actually care about them.
 
-Quiet lets you do this by only showing the number of errors you want. Quiet can also limit errors to only a file you
-specify.
+Quiet lets you do this by only showing the number of errors you want. Quiet can also limit errors to only a file you specify.
 
 
 ## Usage
 
 ```
-quiet 0.1.11
-
 Reduce Cargo's compiler information output
 
-Usage: quiet [OPTIONS] --errors <ERRORS>
+Usage: quiet [OPTIONS] --items <ITEMS>
 
 Options:
-      --errors <ERRORS>            The number of errors and/or warnings to display
+      --items <ITEMS>              The number of items to show. This includes errors and warnings to display. By default only errors are shown. Use --show-warnings to include warnings. Values range from 0 to 255
       --show-warnings              Flag to include warnings in the output
-      --file-filter <FILE_FILTER>  The file (if any) to filter on Example: --file-filter main.rs
+      --file-filter <FILE_FILTER>  The file (if any) to filter on. Example: --file-filter main.rs
   -h, --help                       Print help information
   -V, --version                    Print version information
-
 ```
 
 Cargo output should be passed to Quiet through the following format:
 
+
 ```
- cargo check -q --message-format json-diagnostic-rendered-ansi
+ cargo check -q --message-format json-diagnostic-rendered-ansi 2>&1
  ```
 
 For example to show only a single error for a project, run the following from your project directory:
 
 ```
-cargo check -q --message-format  json-diagnostic-rendered-ansi | quiet --errors 1
+cargo check -q --message-format json-diagnostic-rendered-ansi 2>&1 | quiet --items 1
 ```
 
 You can also use it while running tests:
 
 ```
-cargo test -q --message-format  json-diagnostic-rendered-ansi | quiet --errors 1
+cargo test --message-format json-diagnostic-rendered-ansi 2>&1 | quiet --items 1
 ```
 
 You can use it with `cargo watch` as:
 
 ```
-cargo watch -x 'test -q --message-format json-diagnostic-rendered-ansi | quiet --errors 1'
+cargo watch -x 'test --message-format json-diagnostic-rendered-ansi 2>&1  | quiet --items 1'
 ```
 
+Also look at the [qcompile](https://github.com/ssanj/quiet/blob/main/qcompile), [qcompile-test](https://github.com/ssanj/quiet/blob/main/qcompile-test) and [qrun-test](https://github.com/ssanj/quiet/blob/main/qrun-test) sample scripts in this repository.
+
 ## Building
 
 Build Quiet with:

qcompile

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-cargo watch -x 'check -q --message-format json-diagnostic-rendered-ansi | quiet --items 1'
+cargo watch -x 'check -q --message-format json-diagnostic-rendered-ansi 2>&1 | quiet --items 1'

qcompile-test

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-cargo watch -x 'test --no-run  -q --message-format json-diagnostic-rendered-ansi | quiet --items 1'
+cargo watch -x 'test --no-run -q --message-format json-diagnostic-rendered-ansi 2>&1  | quiet --items 1'

qrun-test

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 if [ -z "$1" ]; then
-  cargo watch -x 'test -q --message-format json-diagnostic-rendered-ansi | quiet --items 1'
+  cargo watch -x 'test --message-format json-diagnostic-rendered-ansi 2>&1  | quiet --items 1'
 else
-  cargo watch -x 'test '"$1"' -q --message-format json-diagnostic-rendered-ansi | quiet --items 1'
+  cargo watch -x 'test '"$1"' --message-format json-diagnostic-rendered-ansi 2>&1  | quiet --items 1'
 fi
 
 

src/main.rs

@@ -105,6 +105,7 @@ enum OutputType<'a> {
 }
 
 fn print_compiler_output(constrained_matches: Vec<CompilerMessage>, level_status: LevelStatus) {
+  println!();
   constrained_matches
     .into_iter()
     .for_each(|compiler_message|{
@@ -278,7 +279,9 @@ fn decode_compiler_message(line: &str) -> serde_json::Result<CompilerMessage> {
 
 // TODO: Refactor this spaghetti code
 fn updated_stdout_line(line: &str, test_results_buffer: &mut HashMap<&str, u32>) -> Option<String> {
-  if line == "failures:" {
+  if line.is_empty() {
+    None
+  } else if line == "failures:" {
     let dots = print_success_dots(test_results_buffer.get("success"));
     Some(print_failures_line(line, dots.as_deref()))
   } else if line.starts_with("test result: FAILED.") {
@@ -291,11 +294,14 @@ fn updated_stdout_line(line: &str, test_results_buffer: &mut HashMap<&str, u32>)
     let output = print_test_success(line, dots.as_deref());
     test_results_buffer.clear();
     Some(output)
-  } else if !line.is_empty() && line.split_inclusive(".").count() == line.len()  {
+  } else if line.split_inclusive(".").count() == line.len()  {
     Some(print_test_run_dots(line))
-  } else if line.contains("    Finished ") || line.contains("    Compiling ") { // TODO: Use regex. (dev|test|release)
+  } else if line.trim().starts_with("Finished ") ||
+            line.trim().starts_with("Compiling ") ||
+            line.trim().starts_with("error: ") ||
+            line.trim().starts_with("warning: ") {
     None
-  } else if line.contains("     Running ") {
+  } else if line.trim().starts_with("Running ") {
     Some(print_test_name(line))
   } else if line.ends_with("... ok") {
     // TODO: Move to a function
@@ -308,8 +314,6 @@ fn updated_stdout_line(line: &str, test_results_buffer: &mut HashMap<&str, u32>)
     None
   } else if line.ends_with("... FAILED") {
     Some(print_failed_test_name(line))
-  } else if line.is_empty() {
-    None
   } else {
     Some(default_stdout_line(line))
   }
@@ -322,7 +326,7 @@ fn print_failed_test_name(line: &str) -> String {
 
 
 fn print_test_name(line: &str) -> String {
-  s!("\n{}", Yellow.paint(line.trim()))
+  s!("\n{}", Yellow.paint(line.trim().strip_prefix("Running ").unwrap_or(line)))
 }