eikon 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1ad60cf41c77add0178d6372fdf1e8501ceb2e3f85c753e66acd3d91121de5c
-  data.tar.gz: 877f7cb92526cf750a91fd53e2005e956b0abdfe1ddcafb0abc98761fed934b8
+  metadata.gz: 366b24652f24e8fd05b78fc1200ab2d17dc9ca358fff8675602d3d0276151e33
+  data.tar.gz: d9e6e4059614085ff8cc86fed30162c7762e14ae3bbb965feae755ae162760e1
 SHA512:
-  metadata.gz: 2592bd8a187d0edecc53623e3eb83e566450103bf93de7b553e9e2aceb160d0e583503c7c6da4b5f7a665033ca565aa227621e1d5699a8994fc3fca93b600533
-  data.tar.gz: e6e7371c75cb80fdba71ce4194753b57d8bcd6b57b7cc11a47a9095f3d4975330fcb375bd678263fb68b863bcb51f93dbf35cc50f9f36defb5b2baee929cb1ca
+  metadata.gz: 0fdacf27e83df61edce31ed9eda68003910cdcd9695b1996534c53b7d468f445cbcac1e9543eb230da51f39bc1972a1dc45e4b621f870fc278fac277df4d73b4
+  data.tar.gz: e35e71275bdba7a2826539c72ee331e23ab55fb11d150996a58b427e658a58599154c2f85d72baad547a32f3eb20431e90a71db043e49e77bd6a284bdb7a90c2

data/.rubocop.yml

@@ -13,7 +13,7 @@ AllCops:
     - 'redis-stable/**/*'
     - 'bin/**/*'
     - 'vendor/**/*'
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.2
 
 # This sets us to use the standard Rails format instead of Rubocop's
 # opinionated Ruby style.

data/Gemfile

@@ -6,8 +6,7 @@ gemspec
 gem "rake", "~> 12.0"
 gem "minitest", "~> 5.0"
 gem "ruby-vips"
-gem "byebug"
-gem "ruby_jard"
+# gem "debugger"
 
 gem "rubocop", "~> 1.27", require: false
 gem "rubocop-rails", require: false # Rails specific styles

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eikon (0.1.3)
+    eikon (0.1.5)
       ruby-vips (~> 2.1)
       sorbet-runtime (>= 0.5.9204)
       terrapin (~> 0.6.0)
@@ -29,9 +29,7 @@ GEM
       tzinfo (~> 2.0)
     ast (2.4.2)
     builder (3.2.4)
-    byebug (11.1.3)
     climate_control (0.2.0)
-    coderay (1.1.3)
     concurrent-ruby (1.1.10)
     crass (1.0.6)
     diff-lcs (1.5.0)
@@ -53,9 +51,6 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
     racc (1.6.0)
     rack (2.2.4)
     rack-test (2.0.2)
@@ -115,10 +110,6 @@ GEM
     ruby-progressbar (1.11.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
-    ruby_jard (0.3.1)
-      byebug (>= 9.1, < 12.0)
-      pry (~> 0.13.0)
-      tty-screen (~> 0.8.1)
     sorbet (0.5.10549)
       sorbet-static (= 0.5.10549)
     sorbet-runtime (0.5.10549)
@@ -151,7 +142,6 @@ GEM
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
     thor (1.2.1)
-    tty-screen (0.8.1)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
@@ -170,7 +160,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug
   eikon!
   minitest (~> 5.0)
   rake (~> 12.0)
@@ -178,7 +167,6 @@ DEPENDENCIES
   rubocop-rails
   rubocop-rails_config
   ruby-vips
-  ruby_jard
   sorbet-static-and-runtime
   tapioca
   terrapin

data/README.md

@@ -4,7 +4,7 @@ This is an implementation of the DHash image matching algorithm in pure Ruby, as
 https://www.hackerfactor.com/blog/?/archives/529-Kind-of-Like-That.html. Its main use is reverse
 image searching.
 
-This library is fully types in Sorbet.
+This library is fully typed in Sorbet.
 
 ## Installation
 

data/lib/eikon/comparator.rb

@@ -1,4 +1,5 @@
 # typed: strict
+
 require "sorbet-runtime"
 
 module Eikon
@@ -8,7 +9,7 @@ module Eikon
     def self.compare(dhash_1, dhash_2)
       hamming_distance = 0
       dhash_1.chars.each_with_index do |character, index|
-        hamming_distance += 1 if character != dhash_2.chars[index]
+        hamming_distance += 1 if character != dhash_2[index]
       end
 
       hamming_distance + (dhash_1.length - dhash_2.length).abs

data/lib/eikon/image_processor.rb

@@ -1,4 +1,5 @@
 # typed: strict
+
 require "sorbet-runtime"
 
 module Eikon

data/lib/eikon/version.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Eikon
-  VERSION = "0.1.4".freeze
+  VERSION = "0.1.6".freeze
 end

data/lib/eikon/video_processor.rb

@@ -29,25 +29,46 @@ module Eikon
         raise "Folder already exists for this export"
       end
 
+      # Get length of video
+      line = Terrapin::CommandLine.new("ffmpeg", "-i :file_name 2>&1 | grep Duration | cut -d ' ' -f 4 | sed s/,//")
+      time = line.run(file_name: @file_name).chomp
+
+      # Turn the time into total seconds (with two points of precision)
+      time_parts =  time.split(":")
+      total_time =  Integer(time_parts[0]) * 60 * 60 # Hours
+      total_time += Integer(time_parts[1]) * 60 # Minutes
+      total_time += Float(time_parts[2]) # Seconds
+
       # Figure out the number of frames per minute given the number of frames we want, default to every ten seconds out of sixty
-      fps = 0.166 # 10/60
-      unless number_of_frames.zero?
-        # Get length of video
-        line = Terrapin::CommandLine.new("ffmpeg", "-i :file_name 2>&1 | grep Duration | cut -d ' ' -f 4 | sed s/,//")
-        time = line.run(file_name: @file_name).chomp
-
-        # Turn the time into total seconds (with two points of precision)
-        time_parts =  time.split(":")
-        total_time =  Integer(time_parts[0]) * 60 * 60 # Hours
-        total_time += Integer(time_parts[1]) * 60 # Minutes
-        total_time += Float(time_parts[2]) # Seconds
+      if number_of_frames.positive?
 
         fps = number_of_frames / total_time
+        line = Terrapin::CommandLine.new("ffmpeg", "-i :file_name -vf fps=#{fps} :folder_name")
+        line.run(file_name: @file_name, folder_name: "#{output_folder_path}/#{file_name}_%d.png")
+      else
+        # Scene detect the video
+        line = Terrapin::CommandLine.new("ffmpeg", "-i :file_name -filter:v \"select='gt(scene,0.4)',showinfo\" -vsync 0 :output_directory/%05d.png")
+        line.run(file_name: @file_name, output_directory: output_folder_path)
+
+        # Screenshot the second second and second to last second
+        # ffmpeg -ss 01:23:45 -i input -frames:v 1 -q:v 2 output.jpg
+        last_time = "#{time_parts[0]}:#{time_parts[1]}:#{time_parts[2].to_f - 1}"
+        ffmpeg_command = "-ss 00:00:02 -i :file_name " +
+                         "-ss :last_time -i :file_name " +
+                         "-map 0:v -vframes 1 :output_directory/:output_file_name_start " +
+                         "-map 1:v -vframes 1 :output_directory/:output_file_name_end"
+        line = Terrapin::CommandLine.new("ffmpeg", ffmpeg_command)
+        line.run(
+          file_name: @file_name,
+          last_time: last_time,
+          output_directory: output_folder_path,
+          output_file_name_start: "#{SecureRandom.uuid}.png",
+          output_file_name_end: "#{SecureRandom.uuid}.png"
+        )
+
+        remove_blank_shots(output_folder_path)
       end
 
-      # ffmpeg -i pexels-ron-lach-7121125.mp4 -vf fps=10/60 out%d.png
-      line = Terrapin::CommandLine.new("ffmpeg", "-i :file_name -vf fps=#{fps} :folder_name")
-      line.run(file_name: @file_name, folder_name: "#{output_folder_path}/#{file_name}_%d.png")
       output_folder_path
     end
 
@@ -85,5 +106,35 @@ module Eikon
         make_dir_command.run
       rescue Terrapin::ExitStatusError; end
     end
+
+    sig { params(folder_path: String).void }
+    def remove_blank_shots(folder_path)
+      # Scan through the directory getting all images (naïvely)
+      # Find the average size of the files, then choose files that are less than 20% of the average size
+      # This means they're probably mostly one color, so we delete them
+
+      # Filter the '.' and '..' directories from the current directory's file list
+      file_names = Dir.entries(folder_path).filter do |entry|
+        !entry.start_with?(".") ||
+          entry.downcase.end_with?(".png") ||
+          entry.downcase.end_with?(".jpg") ||
+          entry.downcase.end_with?(".jpeg")
+      end
+
+      # Get the average size of the files
+      total_size = file_names.reduce(0) do |sum, file_name|
+        sum + File.size("#{folder_path}/#{file_name}")
+      end
+
+      average_size = total_size / file_names.count
+
+      # Delete files that are less than 20% of the average size
+      file_names.each do |file_name|
+        file_path = "#{folder_path}/#{file_name}"
+        file_size = File.size(file_path)
+
+        File.delete(file_path) if file_size < (average_size * 0.2)
+      end
+    end
   end
 end

data/lib/eikon.rb

@@ -1,10 +1,10 @@
 # typed: strict
+
 require "eikon/version"
 require "eikon/comparator"
 require "eikon/video_processor"
 require "eikon/image_processor"
 require "vips"
-require "ruby_jard"
 require "sorbet-runtime"
 
 module Eikon
@@ -20,10 +20,10 @@ module Eikon
     image.byte_array
   end
 
-  sig { params(filename: String).returns(T::Array[T::Hash[String, T.any(Integer, String)]]) }
-  def self.dhash_for_video(filename)
+  sig { params(filename: String, number_of_frames: Integer).returns(T::Array[T::Hash[String, T.any(Integer, String)]]) }
+  def self.dhash_for_video(filename, number_of_frames = 0)
     video_processor = Eikon::VideoProcessor.new(filename)
-    storage_path = video_processor.split_video_into_images
+    storage_path = video_processor.split_video_into_images(number_of_frames)
     dhashes = video_processor.get_frames_dhash(storage_path)
     dhashes
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eikon
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Christopher Guess
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-vips
@@ -73,7 +73,6 @@ files:
 - bin/console
 - bin/setup
 - bin/tapioca
-- eikon-0.1.0.gem
 - eikon.gemspec
 - lib/eikon.rb
 - lib/eikon/comparator.rb
@@ -134,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.4.9
 signing_key:
 specification_version: 4
 summary: A small pure-Ruby (for now) implementation of DHash