eikon 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e06bcf4e7b27eccddc0670f442aa27dc1c04a10ad551238cfc2df5942a5009fb
-  data.tar.gz: 297f266c5e14409e1a854d913de74bd589dee54ac9906aebe88975fd9cd98361
+  metadata.gz: 3953b63ceee83d454dbd4713f71df4d9a0951a93a4237a17fcba4c6d3acd87fb
+  data.tar.gz: 6dc06db31ae3ca79620a027e51444b5a41dfff619415fec10ba6d9eb51504c9e
 SHA512:
-  metadata.gz: a4c33c259b94085a63548fc309a26c7ce8a6e3ae5ca5dfbe19ca4b229b145762a3e17945905cef1cb287faf43dba2869625b41df73013645fc713b9a56a99c06
-  data.tar.gz: 3382ae9ed965b8e6a4dcfcbb1216ff503e2a06f9c40de4e7bf77f7194a13fbf0b2e211a4b5ac973969c5317454b3a0f091485959cd49982a0f6c09dccdda562b
+  metadata.gz: e58a8eeecd90dd10dfd8f1f466dc3e15065bca99e94fdba5f8d85fde6495d0efaa3cabe10b6a237c2095df73a5f9a446639dd59fa244660df9987ca9ecca6305
+  data.tar.gz: 854cc94f57d7249256db6ae866a46ffffdb97da483429353667ad71a0c5410586c1d22ab7180dfbf52074e037f42f9c3c0cc11e25fef25955e3343c7950cc0fa

data/Gemfile

@@ -19,3 +19,4 @@ group :development do
 end
 
 gem "terrapin"
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eikon (0.1.5)
+    eikon (0.1.10)
       ruby-vips (~> 2.1)
       sorbet-runtime (>= 0.5.9204)
       terrapin (~> 0.6.0)
@@ -107,6 +107,7 @@ GEM
       rubocop-packaging (~> 0.5)
       rubocop-performance (~> 1.11)
       rubocop-rails (~> 2.0)
+    ruby-prof (1.6.3)
     ruby-progressbar (1.11.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
@@ -166,6 +167,7 @@ DEPENDENCIES
   rubocop (~> 1.27)
   rubocop-rails
   rubocop-rails_config
+  ruby-prof (~> 1.6)
   ruby-vips
   sorbet-static-and-runtime
   tapioca

data/lib/eikon/version.rb

@@ -1,5 +1,5 @@
 # typed: true
 
 module Eikon
-  VERSION = "0.1.8".freeze
+  VERSION = "0.1.10".freeze
 end

data/lib/eikon/video_processor.rb

@@ -15,6 +15,7 @@ module Eikon
       @file_name = T.let(file_name, String)
     end
 
+    # Note, this isn't guranteed to give the number of frames since we remove blank 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)
@@ -35,40 +36,40 @@ module Eikon
 
       # 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
+      total_time =  time_parts[0].to_i * 60 * 60 # Hours
+      total_time += time_parts[1].to_i * 60 # Minutes
+      total_time += time_parts[2].to_f # Seconds
 
       # Figure out the number of frames per minute given the number of frames we want, default to every ten seconds out of sixty
       if number_of_frames.positive?
+        number_of_frames = number_of_frames - 2
+        number_of_frames = 0 if number_of_frames.negative?
 
-        fps = number_of_frames / total_time
+        fps = (number_of_frames - 2) / total_time # We subtract two because we're taking the start and end
         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")
+        line.run(file_name: @file_name, folder_name: "#{output_folder_path}/#{file_name}_%05d.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).abs.floor}"
-        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)
+        line = Terrapin::CommandLine.new("ffmpeg", "-i :file_name -filter:v \"select='gt(scene,0.4)',showinfo\" -vsync 0 :output_directory/:output_file_name")
+        line.run(file_name: @file_name, output_directory: output_folder_path, output_file_name: "#{file_name}_%05d.png")
       end
 
+      # 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).abs.floor}"
+      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: "#{file_name}_%05d.png",
+        output_file_name_end: "#{file_name}_%05d.png"
+      )
+      remove_blank_shots(output_folder_path)
+
       output_folder_path
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eikon
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Christopher Guess
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-01 00:00:00.000000000 Z
+date: 2023-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-vips