Update README and metadata in preparation for future 0.5.0 release

[hashgood] / src / display.rs

diff --git a/src/display.rs b/src/display.rs
index fe43dd79cb53240fa887810bd9e68c66473b5f1e..1a3b243cfdfda2e708550126bb2c2799504e44c6 100644 (file)
--- a/src/display.rs
+++ b/src/display.rs
@@ -50,20 +50,40 @@ fn write_algorithm(mut stdout: &mut StandardStream, alg: Algorithm) -> PrintResu
     Ok(())
 }
 
     Ok(())
 }
 

-fn print_hex_compare(print: &str, against: &str, mut stdout: &mut StandardStream) -> PrintResult {
-    for (p, a) in print.chars().zip(against.chars()) {
-        if p == a {
+fn print_hex_compare(
+    print: &[u8],
+    matches: &[bool],
+    mut stdout: &mut StandardStream,
+) -> PrintResult {
+    for (p, m) in print.iter().zip(matches.iter()) {
+        if *m {

             stdout.set_color(ColorSpec::new().set_fg(Some(Color::Green)).set_bold(true))?;
         } else {
             stdout.set_color(ColorSpec::new().set_fg(Some(Color::Red)).set_bold(true))?;
         }
             stdout.set_color(ColorSpec::new().set_fg(Some(Color::Green)).set_bold(true))?;
         } else {
             stdout.set_color(ColorSpec::new().set_fg(Some(Color::Red)).set_bold(true))?;
         }

-        write!(&mut stdout, "{}", p)?;
+        write!(&mut stdout, "{:02x}", p)?;

     }
     stdout.reset()?;
     writeln!(&mut stdout)?;
     Ok(())
 }
 
     }
     stdout.reset()?;
     writeln!(&mut stdout)?;
     Ok(())
 }
 

+fn print_pointer_line(
+    matches: &[bool],
+    marker: &str,
+    mut stdout: &mut StandardStream,
+) -> PrintResult {
+    for m in matches {
+        if *m {
+            write!(&mut stdout, "  ")?;
+        } else {
+            write!(&mut stdout, "{}{}", marker, marker)?;
+        }
+    }
+    write!(&mut stdout, "\n")?;
+    Ok(())
+}
+

 fn write_source(
     mut stdout: &mut StandardStream,
     verify_source: &VerificationSource,
 fn write_source(
     mut stdout: &mut StandardStream,
     verify_source: &VerificationSource,


@@ -104,6 +124,14 @@ fn write_source(
     Ok(())
 }
 
     Ok(())
 }
 

+fn calculate_match_indices(bytes1: &[u8], bytes2: &[u8]) -> Vec<bool> {
+    bytes1
+        .iter()
+        .zip(bytes2.iter())
+        .map(|(b1, b2)| b1 == b2)
+        .collect()
+}
+

 pub fn print_hash(
     hash: &Hash,
     verify_hash: Option<&CandidateHash>,
 pub fn print_hash(
     hash: &Hash,
     verify_hash: Option<&CandidateHash>,


@@ -118,19 +146,26 @@ pub fn print_hash(
     writeln!(&mut stdout)?;
 
     // Handle basic case first - nothing to compare it to
     writeln!(&mut stdout)?;
 
     // Handle basic case first - nothing to compare it to

-    let hash_hex = hex::encode(&hash.bytes);

     let verify_hash = match verify_hash {
         None => {
     let verify_hash = match verify_hash {
         None => {

-            write!(&mut stdout, "{}\n\n", hash_hex)?;
+            write!(&mut stdout, "{}\n\n", hex::encode(&hash.bytes))?;

             return Ok(());
         }
         Some(verify_hash) => verify_hash,
     };
             return Ok(());
         }
         Some(verify_hash) => verify_hash,
     };

-    let other_hex = hex::encode(&verify_hash.bytes);

 
     // Do a top-to-bottom comparison
 
     // Do a top-to-bottom comparison

-    print_hex_compare(&hash_hex, &other_hex, &mut stdout)?;
-    print_hex_compare(&other_hex, &hash_hex, &mut stdout)?;
+    let matches = calculate_match_indices(&hash.bytes, &verify_hash.bytes);
+    let any_wrong = matches.iter().any(|m| !*m);
+
+    if any_wrong && no_colour {
+        print_pointer_line(&matches, "v", &mut stdout)?;
+    }
+    print_hex_compare(&hash.bytes, &matches, &mut stdout)?;
+    print_hex_compare(&verify_hash.bytes, &matches, &mut stdout)?;
+    if any_wrong && no_colour {
+        print_pointer_line(&matches, "^", &mut stdout)?;
+    }

 
     // Show the source of our hash
     if let Some(source) = verify_source {
 
     // Show the source of our hash
     if let Some(source) = verify_source {