eikon 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfc5f4e26e72909f6f59029c9acfdd6e352ac7ec04f31b88ede2da6228dfecb4
-  data.tar.gz: 43b93efe48bfa4e598cc1b902a099d68c02a583515c173f0eb0d1e8fa578f4dd
+  metadata.gz: 24e03b53236236989ffb235048a5a27c45b060e7be16fd417f3f9cb33f7bf630
+  data.tar.gz: 768aca67bb323962f93b1e488035e86b6261099d507ae6e20dfb162c5547acef
 SHA512:
-  metadata.gz: acec6e8fe0926c409ed27ffdb8be8e8dca096e9d673ece9b206412363ea045ba9f4a9fdeccfba4ebc311012fc2b5c2f36d8f10b4aac49bf6b0844bc289c748c9
-  data.tar.gz: 3c45290cce3a222048414426f898ac5df6ef83e75784bebb10b252ead8347101b21ec7f7ac652412dfd6db8542c8797f8b07be675b2d1680cb8ee0e4b5f48e29
+  metadata.gz: 30e2055cdee287fd90491cdda63bed5d16621b900e90e67ecab6dc33628510a2f84a2b4bb13b26ed2834888b522358be9f38279ded9d5c8a1a949f6c848bab90
+  data.tar.gz: 71524ce43256b89eb92ff0a75ed05b2fe4620b2bd1a6b137fab397774056ef3529f55564ca8b2e1366d208f37d14496db0b66a11ffdd681a89f547c553ffc22f

data/Gemfile.lock

@@ -9,20 +9,20 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.2.3)
-      actionview (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionpack (7.0.4)
+      actionview (= 7.0.4)
+      activesupport (= 7.0.4)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionview (7.0.4)
+      activesupport (= 7.0.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.2.3)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -35,75 +35,78 @@ GEM
     concurrent-ruby (1.1.10)
     crass (1.0.6)
     diff-lcs (1.5.0)
-    erubi (1.10.0)
+    erubi (1.11.0)
     ffi (1.15.5)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.16.0)
+    json (2.6.2)
+    loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
-    nokogiri (1.13.4)
+    minitest (5.16.3)
+    netrc (0.11.0)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    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.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    railties (7.0.4)
+      actionpack (= 7.0.4)
+      activesupport (= 7.0.4)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (12.3.3)
-    rbi (0.0.14)
+    rbi (0.0.16)
       ast
       parser (>= 2.6.4.0)
       sorbet-runtime (>= 0.5.9204)
       unparser
-    regexp_parser (2.3.0)
+    regexp_parser (2.6.0)
     rexml (3.2.5)
-    rubocop (1.27.0)
+    rubocop (1.38.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
-    rubocop-minitest (0.19.1)
+    rubocop-minitest (0.23.1)
       rubocop (>= 0.90, < 2.0)
-    rubocop-packaging (0.5.1)
-      rubocop (>= 0.89, < 2.0)
-    rubocop-performance (1.13.3)
+    rubocop-packaging (0.5.2)
+      rubocop (>= 1.33, < 2.0)
+    rubocop-performance (1.15.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.14.2)
+    rubocop-rails (2.17.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
-    rubocop-rails_config (1.9.2)
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-rails_config (1.11.3)
       railties (>= 5.0)
-      rubocop (>= 1.25.1)
+      rubocop (>= 1.29.0)
       rubocop-ast (>= 1.0.1)
       rubocop-minitest (~> 0.15)
       rubocop-packaging (~> 0.5)
@@ -116,51 +119,52 @@ GEM
       byebug (>= 9.1, < 12.0)
       pry (~> 0.13.0)
       tty-screen (~> 0.8.1)
-    sorbet (0.5.9905)
-      sorbet-static (= 0.5.9905)
-    sorbet-runtime (0.5.9905)
-    sorbet-static (0.5.9905-universal-darwin-14)
-    sorbet-static (0.5.9905-universal-darwin-15)
-    sorbet-static (0.5.9905-universal-darwin-16)
-    sorbet-static (0.5.9905-universal-darwin-17)
-    sorbet-static (0.5.9905-universal-darwin-18)
-    sorbet-static (0.5.9905-universal-darwin-19)
-    sorbet-static (0.5.9905-universal-darwin-20)
-    sorbet-static (0.5.9905-universal-darwin-21)
-    sorbet-static (0.5.9905-x86_64-linux)
-    sorbet-static-and-runtime (0.5.9905)
-      sorbet (= 0.5.9905)
-      sorbet-runtime (= 0.5.9905)
-    spoom (1.1.11)
+    sorbet (0.5.10549)
+      sorbet-static (= 0.5.10549)
+    sorbet-runtime (0.5.10549)
+    sorbet-static (0.5.10549-universal-darwin-14)
+    sorbet-static (0.5.10549-universal-darwin-15)
+    sorbet-static (0.5.10549-universal-darwin-16)
+    sorbet-static (0.5.10549-universal-darwin-17)
+    sorbet-static (0.5.10549-universal-darwin-18)
+    sorbet-static (0.5.10549-universal-darwin-19)
+    sorbet-static (0.5.10549-universal-darwin-20)
+    sorbet-static (0.5.10549-universal-darwin-21)
+    sorbet-static (0.5.10549-universal-darwin-22)
+    sorbet-static (0.5.10549-x86_64-linux)
+    sorbet-static-and-runtime (0.5.10549)
+      sorbet (= 0.5.10549)
+      sorbet-runtime (= 0.5.10549)
+    spoom (1.1.12)
       sorbet (>= 0.5.9204)
       sorbet-runtime (>= 0.5.9204)
       thor (>= 0.19.2)
-    tapioca (0.7.1)
+    tapioca (0.10.3)
       bundler (>= 1.17.3)
-      pry (>= 0.12.2)
-      rbi (~> 0.0.0, >= 0.0.14)
-      sorbet-runtime (>= 0.5.9204)
-      sorbet-static (>= 0.5.9204)
-      spoom (~> 1.1.0, >= 1.1.4)
+      netrc (>= 0.11.0)
+      parallel (>= 1.21.0)
+      rbi (~> 0.0.0, >= 0.0.16)
+      sorbet-static-and-runtime (>= 0.5.9892)
+      spoom (~> 1.1.0, >= 1.1.11)
       thor (>= 1.2.0)
       yard-sorbet
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
     thor (1.2.1)
     tty-screen (0.8.1)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.3.0)
     unparser (0.6.5)
       diff-lcs (~> 1.3)
       parser (>= 3.1.0)
     webrick (1.7.0)
-    yard (0.9.27)
+    yard (0.9.28)
       webrick (~> 1.7.0)
-    yard-sorbet (0.6.1)
+    yard-sorbet (0.7.0)
       sorbet-runtime (>= 0.5)
       yard (>= 0.9)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

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/version.rb

@@ -1,4 +1,4 @@
 # typed: true
 module Eikon
-  VERSION = "0.1.3".freeze
+  VERSION = "0.1.5".freeze
 end

data/lib/eikon/video_processor.rb

@@ -1,4 +1,5 @@
 # typed: strict
+
 require "sorbet-runtime"
 require "terrapin"
 
@@ -14,8 +15,8 @@ module Eikon
       @file_name = T.let(file_name, String)
     end
 
-    sig { returns(String) }
-    def split_video_into_images
+    sig { params(number_of_frames: Integer).returns(String) }
+    def split_video_into_images(number_of_frames = 0)
       file_name = get_file_name(@file_name)
 
       setup_tmp_folder
@@ -28,8 +29,24 @@ module Eikon
         raise "Folder already exists for this export"
       end
 
+      # 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
+
+        fps = number_of_frames / total_time
+      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=10/60 :folder_name")
+      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

data/lib/eikon.rb

@@ -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.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Christopher Guess
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-04 00:00:00.000000000 Z
+date: 2022-11-10 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