ssimsort 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d2cb4217d6141e0a77c7bba104575151eea0844
-  data.tar.gz: 6d5c5137dbc3c9abfe3d432076f40758db163238
+  metadata.gz: adfe74cb2e85227dd8cf598400e1275c170e4320
+  data.tar.gz: 6abc4d25a01a20db39e36e152b94251f129f02d1
 SHA512:
-  metadata.gz: 378fa86ba675c020e3ceb786519cf35a01cedd6b6ca908f5642456cf4060c97e751de58c66cd068f2a30ee4ca912abfdc048718dc18b088ee3cb03ba3682524a
-  data.tar.gz: 12113ffe5100d222ca47565afa2642104745b912393ae187727cdd94a6c1705d7a10aaacf848e933e2caa6654d98efd7ac9b3306675d749913f51310bcc01f52
+  metadata.gz: 6223df1608c4c1a017ce8c3d68e9a43a682096fc8bc9a71594efe6b3fe27e430f49a2aecc46fac4565cd90bced1bb8d807d6668e56c93f665671ebf859b43d2a
+  data.tar.gz: 3ff54b3258a449255ebee47846a39f947e2ee66f8c3f850513ffb9656a09d1e22f64f823fb80717f7cb5ba5114e4b6ee777910e9d8006e1e5c6079f2999c12c0

data/bin/ssimsort

@@ -3,5 +3,8 @@
 root = File.expand_path("../..", __FILE__)
 require "#{root}/lib/ssimsort.rb"
 
-
-SsimSort.sort(ARGV[0],ARGV[1],*ARGV[2].to_i)
+case ARGV[0]
+	when "-sc" then SsimSort.sort_comp(ARGV[1],ARGV[2],ARGV[3])
+	when "-s" then SsimSort.sort(ARGV[1],ARGV[2],*ARGV[3])
+	else puts "SSIMSORT:\n-s <input_dir>,<output_dir>,[<tolerance>]\n-sc <base_file>,<input_dir>,<output_dir>\n"
+end

data/lib/ssimsort.rb

@@ -14,7 +14,7 @@ module SsimSort
 	end
 
 
-	def SsimSort.get_lum(img,px=300)
+	def SsimSort.get_lum(img,px=100)
 		img = img.scale(px,px)
 		lum_average = img.get_pixels(0, 0, img.columns, img.rows).map do |p|
 			p.to_HSL[2]
@@ -30,7 +30,7 @@ module SsimSort
 		moy_x, moy_y = x.mean, y.mean
 		a = (2*moy_x*moy_y+cA)*(2*(cov(x,y))+cB)
 		b = (moy_x**2+moy_y**2+cA)*(var_x+var_y+cB)
-		(a/b) < 0 ? 0 : (a/b).round(3)
+		(a/b) < 0 ? 0 : (a/b).round(4)
 	end
 
 
@@ -43,14 +43,31 @@ module SsimSort
 		set.each do |file1,file2|
 			path = "#{output_path}/#{file1.split("/").last}/"
 			simil = SsimSort.ssim(file1,file2)
-			if simil < tolerance
-				next
-			elsif simil > tolerance
+			if simil > tolerance
 				FileUtils.makedirs(path) unless File.exists?(path)
 				FileUtils.cp(file2,path)
 			end
 		end
 	end
 
+	def SsimSort.sort_comp(filecomp_path,input_path,output_path)
+		formats =  /(.jpg$|.png$|.JPG$|.jpeg$|.PNG$|.gif$|.bmp$|.BMP$)/
+		filecomp = File.absolute_path(filecomp_path)
+		output_path = File.absolute_path(output_path+"/")
+		files = Dir.entries(input_path).map {|file| File.absolute_path("#{input_path}/#{file}")}
+		files.shift(2) #Remove . and ..
+		files.select!{|f| formats=~ f}
+		sim_dict = {}
+		FileUtils.mkdir(output_path) unless File.exists?(output_path)
+		files.each do |file|
+			simil = SsimSort.ssim(filecomp,file)
+			sim_dict[file] = simil	
+		end
+		sim_dict = sim_dict.sort_by {|k,v| v}.reverse.map {|k,v| k}
+		sim_dict.each_with_index do |k,i|
+			FileUtils.cp(k,"#{output_path}/#{i}#{File.extname(k)}")
+		end
+	end
+
 end
 

data/ssimsort.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'ssimsort'
-  s.version     = '0.1.3'
+  s.version     = '0.1.5'
   s.date        = '2013-11-25'
   s.summary     = "SsimSort"
   s.description = "Sort images easily by their similarity"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssimsort
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Galaad Gauthier