Add markers to highlight errors when ANSI colours are disabled

[hashgood] / src / verify.rs

diff --git a/src/verify.rs b/src/verify.rs
index 0f2d1d88325de4e19b90da50479bd75b6fd81b52..77120da502a441d7d3ca656f4cf26c2b50e80f0c 100644 (file)
--- a/src/verify.rs
+++ b/src/verify.rs
@@ -2,8 +2,6 @@ use super::{
     Algorithm, CandidateHash, CandidateHashes, Hash, MatchLevel, MessageLevel, Opt, Verification,
     VerificationSource,
 };
-#[cfg(feature = "paste")]
-use copypasta::{ClipboardContext, ClipboardProvider};
 use std::fs::File;
 use std::io;
 use std::io::prelude::*;
@@ -16,8 +14,6 @@ use std::path::Path;
 pub fn get_candidate_hashes(opt: &Opt) -> Result<Option<CandidateHashes>, String> {
     if let Some(hash_string) = &opt.hash {
         return Ok(Some(get_by_parameter(hash_string)?));
-    } else if opt.get_paste() {
-        return Ok(Some(get_from_clipboard()?));
     } else if let Some(hash_file) = &opt.hash_file {
         return Ok(Some(get_from_file(hash_file)?));
     }
@@ -40,39 +36,6 @@ fn get_by_parameter(param: &str) -> Result<CandidateHashes, String> {
     })
 }
 
-/// Generate a candidate hash from the system clipboard, or throw an error.
-fn get_from_clipboard() -> Result<CandidateHashes, String> {
-    #[cfg(feature = "paste")]
-    {
-        let mut ctx: ClipboardContext = match ClipboardContext::new() {
-            Ok(ctx) => ctx,
-            Err(e) => return Err(format!("Error getting system clipboard: {}", e)),
-        };
-
-        let possible_hash = match ctx.get_contents() {
-            Ok(value) => value,
-            Err(e) => format!("Error reading from clipboard: {}", e),
-        };
-
-        let bytes = hex::decode(&possible_hash)
-            .map_err(|_| "Clipboard contains invalid or truncated hex".to_owned())?;
-        let alg = Algorithm::from_len(bytes.len())?;
-        let candidate = CandidateHash {
-            filename: None,
-            bytes,
-        };
-        Ok(CandidateHashes {
-            alg,
-            hashes: vec![candidate],
-            source: VerificationSource::Clipboard,
-        })
-    }
-    #[cfg(not(feature = "paste"))]
-    {
-        Err("Paste not implemented".to_owned())
-    }
-}
-
 /// Generate a candidate hash from the digests file specified (could be "-" for STDIN), or throw an error.
 fn get_from_file(path: &Path) -> Result<CandidateHashes, String> {
     // Get a reader for either standard input or the chosen path
@@ -291,6 +254,7 @@ mod tests {
         let valid_sha1 = "b314c7ebb7d599944981908b7f3ed33a30e78f3a";
         let valid_sha1_2 = valid_sha1.to_uppercase();
         let valid_sha256 = "1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6";
+        let valid_sha512 = "f4f7de1665cdcd00b2e526da6876f3e06a37da3549e9f880602f64407f602983a571c142eb0de0eacfc9c1d0f534e9339cdce04eb9daddc6ddfa8cf34853beed";
 
         let invalid1 = "x";
         let invalid2 = "a";
@@ -326,6 +290,13 @@ mod tests {
                 ..
             })
         ));
+        assert!(matches!(
+            read_raw_candidate_from_file(valid_sha512, example_path),
+            Some(CandidateHashes {
+                alg: Algorithm::Sha512,
+                ..
+            })
+        ));
 
         for i in &[invalid1, invalid2, invalid3, invalid4, invalid5] {
             assert!(read_raw_candidate_from_file(*i, example_path).is_none());