Code cleanup

* Whitespace removal
* Followed IDE recommended simplifications

src/cache.rs

@@ -134,9 +134,9 @@ impl<'a> Cache<'a> {
      * Get the hash of the desired file and return it as a hex string
      */
     pub fn get_file_hash(&self, path: &Path) -> Result<String, Error> {
-        let mut source = try!(File::open(&path));
+        let mut source = File::open(&path)?;
         let mut buf: Vec<u8> = Vec::new();
-        try!(source.read_to_end(&mut buf));
+        source.read_to_end(&mut buf)?;
         let mut sha1 = Sha1::new();
         sha1.update(&buf);
         let digest = sha1.digest();
@@ -261,7 +261,7 @@ impl<'a> Cache<'a> {
                                     let desire_len = row_str.len() - 1;
                                     row_str.truncate(desire_len);
                                     row_str.push_str("\n");
-                                    try!(compressor.write(&row_str.into_bytes()));
+                                    compressor.write(&row_str.into_bytes())?;
                                 }
                                 let compressed_matrix = match compressor.finish() {
                                     Ok(data) => data,
@@ -270,8 +270,8 @@ impl<'a> Cache<'a> {
                                         return Err(e);
                                     }
                                 };
-                                try!(file.write(&compressed_matrix));
-                                try!(file.flush());
+                                file.write(&compressed_matrix)?;
+                                file.flush()?;
                             }
                             Err(e) => {
                                 return Err(e);
@@ -322,10 +322,10 @@ impl<'a> Cache<'a> {
                                 .trim()
                                 .split("\n")
                                 .map(|line| {
-                                         line.split(",")
-                                             .map(|f| f64::from_str(f).unwrap())
-                                             .collect()
-                                     })
+                                    line.split(",")
+                                        .map(|f| f64::from_str(f).unwrap())
+                                        .collect()
+                                })
                                 .collect();
 
                             Some(matrix)
@@ -355,7 +355,7 @@ fn test_get_file_hash() {
     match hash {
         Ok(v) => {
             println!("Hash: {}", v);
-            assert!(v == "4beb6f2d852b75a313863916a1803ebad13a3196");
+            assert_eq!(v, "4beb6f2d852b75a313863916a1803ebad13a3196");
         }
         Err(e) => {
             println!("Error: {:?}", e);

src/hash/mod.rs

@@ -59,12 +59,12 @@ pub struct PerceptualHashes<'a> {
 impl<'a> PerceptualHashes<'a> {
     pub fn similar(&self, other: &'a PerceptualHashes<'a>) -> bool {
         if self.orig_path != other.orig_path &&
-           calculate_hamming_distance(self.ahash, other.ahash) <=
-           HAMMING_DISTANCE_SIMILARITY_LIMIT &&
-           calculate_hamming_distance(self.dhash, other.dhash) <=
-           HAMMING_DISTANCE_SIMILARITY_LIMIT &&
-           calculate_hamming_distance(self.phash, other.phash) <=
-           HAMMING_DISTANCE_SIMILARITY_LIMIT {
+            calculate_hamming_distance(self.ahash, other.ahash) <=
+                HAMMING_DISTANCE_SIMILARITY_LIMIT &&
+            calculate_hamming_distance(self.dhash, other.dhash) <=
+                HAMMING_DISTANCE_SIMILARITY_LIMIT &&
+            calculate_hamming_distance(self.phash, other.phash) <=
+                HAMMING_DISTANCE_SIMILARITY_LIMIT {
             true
         } else {
             false
@@ -116,7 +116,7 @@ pub trait PerceptualHash {
 // Functions //
 
 /**
- * Resonsible for parsing a path, converting an image and package it to be
+ * Responsible for parsing a path, converting an image and package it to be
  * hashed.
  *
  * # Arguments
@@ -187,7 +187,7 @@ fn process_image<'a>(image_path: &'a str, size: u32) -> PreparedImage<'a> {
     };
     PreparedImage {
         orig_path: &*image_path,
-        image: image,
+        image,
     }
 }
 
@@ -219,9 +219,9 @@ pub fn get_perceptual_hashes<'a>(path: &'a Path,
     let phash = phash::PHash::new(&path, &precision, &cache).get_hash(&cache);
     PerceptualHashes {
         orig_path: &*image_path,
-        ahash: ahash,
-        dhash: dhash,
-        phash: phash,
+        ahash,
+        dhash,
+        phash,
     }
 }
 

src/hash/phash.rs

@@ -41,7 +41,7 @@ impl<'a> PerceptualHash for PHash<'a> {
                 // Get 2d data to 2d FFT/DFT
                 // Either from the cache or calculate it
                 // Pretty fast already, so caching doesn't make a huge difference
-                // Atleast compared to opening and processing the images
+                // At least compared to opening and processing the images
                 let data_matrix: Vec<Vec<f64>> = match *cache {
                     Some(ref c) => {
                         match c.get_matrix_from_cache(&Path::new(self.prepared_image.orig_path),
@@ -116,11 +116,11 @@ fn create_data_matrix(width: usize,
     data_matrix
 }
 
-// Use a 1D DFT to cacluate the 2D DFT.
+// Use a 1D DFT to calculate the 2D DFT.
 //
 // This is achieved by calculating the DFT for each row, then calculating the
 // DFT for each column of DFT row data. This means that a 32x32 image with have
-// 1024 1D DFT operations performed on it. (Slightly caclulation intensive)
+// 1024 1D DFT operations performed on it. (Slightly calculation intensive)
 //
 // This operation is in place on the data in the provided vector
 //
@@ -204,23 +204,23 @@ fn test_2d_dft() {
     println!("{:?}", test_matrix[2]);
     println!("{:?}", test_matrix[3]);
 
-    assert!(test_matrix[0][0] == 24_f64);
-    assert!(test_matrix[0][1] == 0_f64);
-    assert!(test_matrix[0][2] == 0_f64);
-    assert!(test_matrix[0][3] == 0_f64);
-
-    assert!(test_matrix[1][0] == 0_f64);
-    assert!(test_matrix[1][1] == 0_f64);
-    assert!(test_matrix[1][2] == -2_f64);
-    assert!(test_matrix[1][3] == 2_f64);
-
-    assert!(test_matrix[2][0] == 0_f64);
-    assert!(test_matrix[2][1] == -2_f64);
-    assert!(test_matrix[2][2] == -4_f64);
-    assert!(test_matrix[2][3] == -2_f64);
-
-    assert!(test_matrix[3][0] == 0_f64);
-    assert!(test_matrix[3][1] == 2_f64);
-    assert!(test_matrix[3][2] == -2_f64);
-    assert!(test_matrix[3][3] == 0_f64);
+    assert_eq!(test_matrix[0][0], 24_f64);
+    assert_eq!(test_matrix[0][1], 0_f64);
+    assert_eq!(test_matrix[0][2], 0_f64);
+    assert_eq!(test_matrix[0][3], 0_f64);
+
+    assert_eq!(test_matrix[1][0], 0_f64);
+    assert_eq!(test_matrix[1][1], 0_f64);
+    assert_eq!(test_matrix[1][2], -2_f64);
+    assert_eq!(test_matrix[1][3], 2_f64);
+
+    assert_eq!(test_matrix[2][0], 0_f64);
+    assert_eq!(test_matrix[2][1], -2_f64);
+    assert_eq!(test_matrix[2][2], -4_f64);
+    assert_eq!(test_matrix[2][3], -2_f64);
+
+    assert_eq!(test_matrix[3][0], 0_f64);
+    assert_eq!(test_matrix[3][1], 2_f64);
+    assert_eq!(test_matrix[3][2], -2_f64);
+    assert_eq!(test_matrix[3][3], 0_f64);
 }

src/lib.rs

@@ -108,7 +108,6 @@ impl<'a> PIHash<'a> {
                               second: &Path,
                               sensitivity: Option<u64>)
                               -> bool {
-
         let threshold = match sensitivity {
             Some(value) => value,
             None => 4,
@@ -118,9 +117,9 @@ impl<'a> PIHash<'a> {
         let second_pihash = self.get_phashes(second);
         if hash::calculate_hamming_distance(first_pihash.ahash, second_pihash.ahash) <= threshold {
             if hash::calculate_hamming_distance(first_pihash.dhash, second_pihash.dhash) <=
-               threshold {
+                threshold {
                 if hash::calculate_hamming_distance(first_pihash.phash, second_pihash.phash) <=
-                   threshold {
+                    threshold {
                     return true;
                 }
             }
@@ -229,7 +228,6 @@ fn to_hex_string(bytes: &[u8]) -> String {
 //
 #[cfg(test)]
 mod tests {
-
     use std::fs;
     use std::path::Path;
     use hash;
@@ -307,28 +305,28 @@ mod tests {
         let lib = PIHash::new(Some(cache::DEFAULT_CACHE_DIR));
         let sample_01_base_image = &Path::new("./test_images/sample_01_large.jpg");
         let sample_01_images: [&Path; 2] = [&Path::new("./test_images/sample_01_medium.jpg"),
-                                            &Path::new("./test_images/sample_01_small.jpg")];
+            &Path::new("./test_images/sample_01_small.jpg")];
         let sample_01_results = lib.get_similar_images(&sample_01_base_image, &sample_01_images)
             .unwrap();
         assert_eq!(sample_01_results.len(), 2);
 
         let sample_02_base_image = &Path::new("./test_images/sample_02_large.jpg");
         let sample_02_images: [&Path; 2] = [&Path::new("./test_images/sample_02_medium.jpg"),
-                                            &Path::new("./test_images/sample_02_small.jpg")];
+            &Path::new("./test_images/sample_02_small.jpg")];
         let sample_02_results = lib.get_similar_images(&sample_02_base_image, &sample_02_images)
             .unwrap();
         assert_eq!(sample_02_results.len(), 2);
 
         let sample_03_base_image = &Path::new("./test_images/sample_03_large.jpg");
         let sample_03_images: [&Path; 2] = [&Path::new("./test_images/sample_03_medium.jpg"),
-                                            &Path::new("./test_images/sample_03_small.jpg")];
+            &Path::new("./test_images/sample_03_small.jpg")];
         let sample_03_results = lib.get_similar_images(&sample_03_base_image, &sample_03_images)
             .unwrap();
         assert_eq!(sample_03_results.len(), 2);
 
         let sample_04_base_image = &Path::new("./test_images/sample_04_large.jpg");
         let sample_04_images: [&Path; 2] = [&Path::new("./test_images/sample_04_medium.jpg"),
-                                            &Path::new("./test_images/sample_04_small.jpg")];
+            &Path::new("./test_images/sample_04_small.jpg")];
         let sample_04_results = lib.get_similar_images(&sample_04_base_image, &sample_04_images)
             .unwrap();
         assert_eq!(sample_04_results.len(), 2);
@@ -341,8 +339,8 @@ mod tests {
 
         // Sample_01 tests
         let sample_01_images: [&Path; 3] = [&Path::new("./test_images/sample_01_large.jpg"),
-                                            &Path::new("./test_images/sample_01_medium.jpg"),
-                                            &Path::new("./test_images/sample_01_small.jpg")];
+            &Path::new("./test_images/sample_01_medium.jpg"),
+            &Path::new("./test_images/sample_01_small.jpg")];
         let sample_01_hashes: [u64; 3] = [857051991849750, 857051991849750, 857051992374038];
         test_imageset_hash(hash::HashType::AHash,
                            hash::Precision::Medium,
@@ -353,11 +351,11 @@ mod tests {
 
         // Sample_02 tests
         let sample_02_images: [&Path; 3] = [&Path::new("./test_images/sample_02_large.jpg"),
-                                            &Path::new("./test_images/sample_02_medium.jpg"),
-                                            &Path::new("./test_images/sample_02_small.jpg")];
+            &Path::new("./test_images/sample_02_medium.jpg"),
+            &Path::new("./test_images/sample_02_small.jpg")];
         let sample_02_hashes: [u64; 3] = [18446744073441116160,
-                                          18446744073441116160,
-                                          18446744073441116160];
+            18446744073441116160,
+            18446744073441116160];
         test_imageset_hash(hash::HashType::AHash,
                            hash::Precision::Medium,
                            1u64,
@@ -367,8 +365,8 @@ mod tests {
 
         // Sample_03 tests
         let sample_03_images: [&Path; 3] = [&Path::new("./test_images/sample_03_large.jpg"),
-                                            &Path::new("./test_images/sample_03_medium.jpg"),
-                                            &Path::new("./test_images/sample_03_small.jpg")];
+            &Path::new("./test_images/sample_03_medium.jpg"),
+            &Path::new("./test_images/sample_03_small.jpg")];
         let sample_03_hashes: [u64; 3] =
             [135670932300497406, 135670932300497406, 135670932300497406];
         test_imageset_hash(hash::HashType::AHash,
@@ -380,11 +378,11 @@ mod tests {
 
         // Sample_04 tests
         let sample_04_images: [&Path; 3] = [&Path::new("./test_images/sample_04_large.jpg"),
-                                            &Path::new("./test_images/sample_04_medium.jpg"),
-                                            &Path::new("./test_images/sample_04_small.jpg")];
+            &Path::new("./test_images/sample_04_medium.jpg"),
+            &Path::new("./test_images/sample_04_small.jpg")];
         let sample_04_hashes: [u64; 3] = [18446460933090836480,
-                                          18446460933090836480,
-                                          18446460933090836480];
+            18446460933090836480,
+            18446460933090836480];
         test_imageset_hash(hash::HashType::AHash,
                            hash::Precision::Medium,
                            1u64,
@@ -403,11 +401,11 @@ mod tests {
 
         // Sample_01 tests
         let sample_01_images: [&Path; 3] = [&Path::new("./test_images/sample_01_large.jpg"),
-                                            &Path::new("./test_images/sample_01_medium.jpg"),
-                                            &Path::new("./test_images/sample_01_small.jpg")];
+            &Path::new("./test_images/sample_01_medium.jpg"),
+            &Path::new("./test_images/sample_01_small.jpg")];
         let sample_01_hashes: [u64; 3] = [7937395827556495926,
-                                          7937395827556495926,
-                                          7939647627370181174];
+            7937395827556495926,
+            7939647627370181174];
         test_imageset_hash(hash::HashType::DHash,
                            hash::Precision::Medium,
                            1u64,
@@ -417,11 +415,11 @@ mod tests {
 
         // Sample_02 tests
         let sample_02_images: [&Path; 3] = [&Path::new("./test_images/sample_02_large.jpg"),
-                                            &Path::new("./test_images/sample_02_medium.jpg"),
-                                            &Path::new("./test_images/sample_02_small.jpg")];
+            &Path::new("./test_images/sample_02_medium.jpg"),
+            &Path::new("./test_images/sample_02_small.jpg")];
         let sample_02_hashes: [u64; 3] = [11018273919551199541,
-                                          11009266719759587637,
-                                          11009847262435924277];
+            11009266719759587637,
+            11009847262435924277];
         test_imageset_hash(hash::HashType::DHash,
                            hash::Precision::Medium,
                            3u64,
@@ -431,8 +429,8 @@ mod tests {
 
         // Sample_03 tests
         let sample_03_images: [&Path; 3] = [&Path::new("./test_images/sample_03_large.jpg"),
-                                            &Path::new("./test_images/sample_03_medium.jpg"),
-                                            &Path::new("./test_images/sample_03_small.jpg")];
+            &Path::new("./test_images/sample_03_medium.jpg"),
+            &Path::new("./test_images/sample_03_small.jpg")];
         let sample_03_hashes: [u64; 3] =
             [262683193365159876, 225528496439353284, 225528496435158982];
         test_imageset_hash(hash::HashType::DHash,
@@ -444,11 +442,11 @@ mod tests {
 
         // Sample_04 tests
         let sample_04_images: [&Path; 3] = [&Path::new("./test_images/sample_04_large.jpg"),
-                                            &Path::new("./test_images/sample_04_medium.jpg"),
-                                            &Path::new("./test_images/sample_04_small.jpg")];
+            &Path::new("./test_images/sample_04_medium.jpg"),
+            &Path::new("./test_images/sample_04_small.jpg")];
         let sample_04_hashes: [u64; 3] = [14620651386429567209,
-                                          14620651386429567209,
-                                          14620651386429567209];
+            14620651386429567209,
+            14620651386429567209];
         test_imageset_hash(hash::HashType::DHash,
                            hash::Precision::Medium,
                            1u64,
@@ -467,8 +465,8 @@ mod tests {
 
         // Sample_01 tests
         let sample_01_images: [&Path; 3] = [&Path::new("./test_images/sample_01_large.jpg"),
-                                            &Path::new("./test_images/sample_01_medium.jpg"),
-                                            &Path::new("./test_images/sample_01_small.jpg")];
+            &Path::new("./test_images/sample_01_medium.jpg"),
+            &Path::new("./test_images/sample_01_small.jpg")];
         let sample_01_hashes: [u64; 3] = [72357778504597504, 72357778504597504, 72357778504597504];
         test_imageset_hash(hash::HashType::PHash,
                            hash::Precision::Medium,
@@ -479,11 +477,11 @@ mod tests {
 
         // Sample_02 tests
         let sample_02_images: [&Path; 3] = [&Path::new("./test_images/sample_02_large.jpg"),
-                                            &Path::new("./test_images/sample_02_medium.jpg"),
-                                            &Path::new("./test_images/sample_02_small.jpg")];
+            &Path::new("./test_images/sample_02_medium.jpg"),
+            &Path::new("./test_images/sample_02_small.jpg")];
         let sample_02_hashes: [u64; 3] = [5332332327550844928,
-                                          5332332327550844928,
-                                          5332332327550844928];
+            5332332327550844928,
+            5332332327550844928];
         test_imageset_hash(hash::HashType::PHash,
                            hash::Precision::Medium,
                            0u64,
@@ -493,11 +491,11 @@ mod tests {
 
         // Sample_03 tests
         let sample_03_images: [&Path; 3] = [&Path::new("./test_images/sample_03_large.jpg"),
-                                            &Path::new("./test_images/sample_03_medium.jpg"),
-                                            &Path::new("./test_images/sample_03_small.jpg")];
+            &Path::new("./test_images/sample_03_medium.jpg"),
+            &Path::new("./test_images/sample_03_small.jpg")];
         let sample_03_hashes: [u64; 3] = [6917529027641081856,
-                                          6917529027641081856,
-                                          6917529027641081856];
+            6917529027641081856,
+            6917529027641081856];
         test_imageset_hash(hash::HashType::PHash,
                            hash::Precision::Medium,
                            0u64,
@@ -507,11 +505,11 @@ mod tests {
 
         // Sample_04 tests
         let sample_04_images: [&Path; 3] = [&Path::new("./test_images/sample_04_large.jpg"),
-                                            &Path::new("./test_images/sample_04_medium.jpg"),
-                                            &Path::new("./test_images/sample_04_small.jpg")];
+            &Path::new("./test_images/sample_04_medium.jpg"),
+            &Path::new("./test_images/sample_04_small.jpg")];
         let sample_04_hashes: [u64; 3] = [10997931646002397184,
-                                          10997931646002397184,
-                                          10997931646002397184];
+            10997931646002397184,
+            10997931646002397184];
         test_imageset_hash(hash::HashType::PHash,
                            hash::Precision::Medium,
                            0u64,
@@ -530,17 +528,17 @@ mod tests {
         let lib = PIHash::new(Some(cache::DEFAULT_CACHE_DIR));
 
         // Setup the caches to make sure we're good to properly bench
-        // All phashes so that the matricies are pulled from cache as well
+        // All phashes so that the matrices are pulled from cache as well
         lib.get_perceptual_hash(&Path::new("./test_images/sample_01_large.jpg"),
                                 &hash::Precision::Medium,
                                 &hash::HashType::PHash);
 
         bench.iter(|| {
-                       // Sample_01 Bench
-                       lib.get_perceptual_hash(&Path::new("./test_images/sample_01_large.jpg"),
-                                               &hash::Precision::Medium,
-                                               &hash::HashType::PHash);
-                   })
+            // Sample_01 Bench
+            lib.get_perceptual_hash(&Path::new("./test_images/sample_01_large.jpg"),
+                                    &hash::Precision::Medium,
+                                    &hash::HashType::PHash);
+        })
     }
 
     #[cfg(feature = "bench")]
@@ -550,10 +548,10 @@ mod tests {
         let lib = PIHash::new(None);
 
         bench.iter(|| {
-                       // Sample_01 Bench
-                       lib.get_perceptual_hash(&Path::new("./test_images/sample_01_large.jpg"),
-                                               &hash::Precision::Medium,
-                                               &hash::HashType::PHash);
-                   })
+            // Sample_01 Bench
+            lib.get_perceptual_hash(&Path::new("./test_images/sample_01_large.jpg"),
+                                    &hash::Precision::Medium,
+                                    &hash::HashType::PHash);
+        })
     }
 }

src/main.rs

@@ -82,7 +82,6 @@ fn main() {
         for similar_image in similar_images {
             println!("{}", similar_image);
         }
-
     } else {
         let image_path = Path::new(&args.arg_path);
         let hashes = get_requested_perceptual_hashes(&lib, &image_path, &args);
@@ -102,7 +101,7 @@ fn main() {
 
 fn flags_get_all_perceptual_hashes(args: &Args) -> bool {
     (args.flag_ahash && args.flag_dhash && args.flag_phash) ||
-    (!args.flag_ahash && !args.flag_dhash && !args.flag_phash)
+        (!args.flag_ahash && !args.flag_dhash && !args.flag_phash)
 }
 
 fn get_requested_perceptual_hashes<'a>(lib: &pihash::PIHash,
@@ -129,8 +128,8 @@ fn get_requested_perceptual_hashes<'a>(lib: &pihash::PIHash,
 
     pihash::hash::PerceptualHashes {
         orig_path: image_path.to_str().unwrap(),
-        ahash: ahash,
-        dhash: dhash,
-        phash: phash,
+        ahash,
+        dhash,
+        phash,
     }
 }