eikon 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86196d2fa09e2981f82ab26fed3d7fa7fdfc444584575f0ebd90dd62fed21d73
-  data.tar.gz: 4548eae26d0cb328cbd5d468aaa534ad13fd995c02d8bd359b80e0db6cd21614
+  metadata.gz: 2f7954d7b98c1d1589778c648f2ccdb1f3bd3a7bfb2b5b96a78b67309c22c13b
+  data.tar.gz: 70691d16384c391b125fcb7be1ebc0ffef570efcd428e56a3f1e401ad6aedf96
 SHA512:
-  metadata.gz: d6d182537ed158831d9be37296ac8ddaf3337bf13c855ed8ad05c74eb8ba3cb92f08e82caaa31f1381c573f0e52f8f1fce769b5b29c7382aeb995ca0d9e9bc6d
-  data.tar.gz: c9bdaf70abeaa9d64c13661d7a0637ca5a7dd2f028fe96817832120f7d020cb85f21e2cde52bdc8209e1fe0f659e2c07416edee3e99aabaf70f34d82ea13b680
+  metadata.gz: d9471e14568ca78e34930f6ec33c1464caf66766d0231558737d9645624ad6cf07b1e358b80bf6f4634507477afaed0bb10d218e505b2cd4d791a8019762c085
+  data.tar.gz: 88bbdec7d3e3dd8f937360b609b11451dd69ab2f0f2050623112877e2b0ab8aea6d66b3cf1778065a2a5569f883f959c98ad9c7cb65d2b4ca195b56e024bb544

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)

data/lib/eikon/version.rb

@@ -1,5 +1,5 @@
 # typed: true
 
 module Eikon
-  VERSION = "0.1.9".freeze
+  VERSION = "0.1.11".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)
@@ -40,35 +41,36 @@ module Eikon
       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?
+      if number_of_frames > 2
+        # number_of_frames = number_of_frames - 2
+        # number_of_frames = 0 if number_of_frames.negative?
 
-        fps = number_of_frames / total_time
+        # NOTE: This has to be a fraction, not a whole number, but also, never 0
+        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
 

data/lib/eikon.rb

@@ -8,6 +8,7 @@ require "vips"
 require "sorbet-runtime"
 
 module Eikon
+  # T::Configuration.default_checked_level = :never
   extend T::Sig
 
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eikon
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Christopher Guess
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-vips