Browse Source

Working on storing DFT's in the cache since we have it.

develop
Drew Short 9 years ago
parent
commit
8b2de14eb6
  1. 2
      Cargo.toml
  2. 64
      src/cache.rs
  3. 2
      src/hash.rs

2
Cargo.toml

@ -1,6 +1,6 @@
[package] [package]
name = "pihash" name = "pihash"
version = "0.1.1"
version = "0.2.0"
authors = ["Drew Short <warrick@sothr.com>"] authors = ["Drew Short <warrick@sothr.com>"]
description = "A simple library for generating perceptual hashes for images and comparing images based on their perceptual hashes." description = "A simple library for generating perceptual hashes for images and comparing images based on their perceptual hashes."
repository = "https://github.com/warricksothr/Perceptual-Image-Hashing/" repository = "https://github.com/warricksothr/Perceptual-Image-Hashing/"

64
src/cache.rs

@ -10,7 +10,7 @@ use self::image::ImageBuffer;
use self::sha1::Sha1; use self::sha1::Sha1;
use std::path::Path; use std::path::Path;
use std::fs::{File, create_dir_all, remove_dir_all}; use std::fs::{File, create_dir_all, remove_dir_all};
use std::io::{Read, Error};
use std::io::{Read, Error, Write};
use std::option::Option; use std::option::Option;
use std::result::Result; use std::result::Result;
@ -61,8 +61,30 @@ pub fn put_image_in_cache(path: &Path, size: u32, image: &ImageBuffer<image::Lum
/** /**
* Expects a slice of slices that represents lines in the file * Expects a slice of slices that represents lines in the file
*/ */
pub fn put_file_in_cache(path: &Path, size: u32, file_contents: &[&[u8]]) {
pub fn put_matrix_in_cache(path: &Path, size: u32, extension: &str, file_contents: &Vec<Vec<f64>>) {
let hash = get_file_hash(&path);
match hash {
Ok(sha1) => {
let cache_path_str = format!("{}/{}x{}_{}.{}",CACHE_DIR, size, size, sha1, extension);
let cached_path = Path::new(&cache_path_str);
// Save the file into the cache
match File::create(&cached_path) {
Ok(mut file) => {
for row in file_contents {
let mut row_str = row.iter().fold(String::new(), |acc, &item| acc + &format!("{},",item));
//remove the last comma
let desire_len = row_str.len()-1;
row_str.truncate(desire_len);
row_str.push_str("\n");
file.write(&row_str.into_bytes());
}
file.flush();
},
Err(_) => {},
}
},
Err(e) => println!("Error: {}", e),
}
} }
/** /**
@ -95,6 +117,42 @@ pub fn get_image_from_cache(path: &Path, size: u32) -> Option<ImageBuffer<image:
} }
} }
/**
* Get a matrix out of the cache
*/
pub fn get_matrix_from_cache(path: &Path, size: u32, extension: &str) -> Option<Vec<Vec<f64>>> {
let hash = get_file_hash(&path);
match hash {
Ok(sha1) => {
// Check if the file exists in the cache
let cache_path_str = format!("{}/{}x{}_{}.{}",CACHE_DIR, size, size, sha1, extension);
let cached_path = Path::new(&cache_path_str);
// Try to open, if it does, then we can read the image in
match File::open(&cached_path) {
Ok(mut file) => {
let mut matrix: Vec<Vec<f64>> = Vec::new();
let mut matrix_data: Vec<u8> = Vec::new();
file.read_to_end(&mut matrix_data);
let matrix_data_str = String::from_utf8(matrix_data);
//convert the matrix
Some(matrix)
},
// Don't really care here, it just means an existing cached
// file doesn't exist, or can't be read.
Err(_) => {
None
},
}
},
Err(e) => {
println!("Error: {}", e);
None
},
}
}
#[test] #[test]
fn test_get_file_hash() { fn test_get_file_hash() {
let target = "test_images/sample_01_large.jpg"; let target = "test_images/sample_01_large.jpg";

2
src/hash.rs

@ -298,6 +298,8 @@ impl<'a> PerceptualHash for PHash<'a> {
// Perform the 2D DFT operation on our matrix // Perform the 2D DFT operation on our matrix
calculate_2d_dft(&mut data_matrix); calculate_2d_dft(&mut data_matrix);
// Store this DFT in the cache
cache::put_matrix_in_cache(&Path::new(self.prepared_image.orig_path),width as u32,&"dft",&data_matrix);
// Only need the top left quadrant // Only need the top left quadrant
let target_width = (width / 4) as usize; let target_width = (width / 4) as usize;

Loading…
Cancel
Save