X-Git-Url: https://code.octet-stream.net/hashgood/blobdiff_plain/9e69a3e75455b37ac9b9eea835e72f1fef0b12eb..e6ad985239dcce1d556c0606ae1628ac14504382:/src/verify.rs diff --git a/src/verify.rs b/src/verify.rs index 0f2d1d8..e655d1a 100644 --- 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, 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 { }) } -/// Generate a candidate hash from the system clipboard, or throw an error. -fn get_from_clipboard() -> Result { - #[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 { // Get a reader for either standard input or the chosen path