ffmprb 0.12.1 → 0.12.3

data/lib/ffmprb/process.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 module Ffmprb
 
   class Process
@@ -134,6 +136,7 @@ module Ffmprb
       end
     end
 
+    # TODO ...or... "output label"! (implement intermediate "outputs" through this)
     def input_label(input)
       @inputs.index input
     end
@@ -160,11 +163,12 @@ module Ffmprb
       thr = Util::Thread.new main: !parent do
         proc_vis_node Thread.current
         # NOTE yes, an exception can occur anytime, and we'll just die, it's ok, see above
-        cmd = command
-        opts = {limit: limit, timeout: timeout}
-        opts[:ignore_broken_pipes] = ignore_broken_pipes  unless ignore_broken_pipes.nil?
-        Util.ffmpeg(*cmd, **opts).tap do |res|
-          Util::Thread.join_children! limit, timeout: timeout
+        command do |cmd|
+          opts = {limit: limit, timeout: timeout}
+          opts[:ignore_broken_pipes] = ignore_broken_pipes  unless ignore_broken_pipes.nil?
+          Util.ffmpeg(*cmd, **opts).tap do |res|
+            Util::Thread.join_children! limit, timeout: timeout
+          end
         end
         proc_vis_node Thread.current, :remove
       end
@@ -174,23 +178,28 @@ module Ffmprb
     private
 
     def command
-      input_args + filter_args + output_args
+      fail "Miserably"  unless
+        block_given?
+      Tempfile.create do |tmp_file|
+        yield input_args(tmp_file) + filter_args(tmp_file) + output_args(tmp_file)
+      end
     end
 
-    def input_args
-      filter_args  # NOTE must run first
+    def input_args(script_file=nil)
+      filter_args script_file  # NOTE must run first
       @input_args ||= @inputs.map(&:args).reduce(:+)
     end
 
-    # NOTE must run first
-    def filter_args
+    # NOTE must run first (which is excusable just because it's private)
+    def filter_args(script_file=nil)
       @filter_args ||= Filter.complex_args(
-        @outputs.map(&:filters).reduce :+
+        *@outputs.map(&:filters).reduce(:+),
+        script_file: script_file
       )
     end
 
-    def output_args
-      filter_args  # NOTE must run first
+    def output_args(script_file=nil)
+      filter_args script_file  # NOTE must run first
       @output_args ||= @outputs.map(&:args).reduce(:+)
     end
 

data/lib/ffmprb/util/thread.rb

@@ -59,7 +59,8 @@ module Ffmprb
             @parent.child_lives self
             Ffmprb.logger.warn "Not the main: false thread run by a #{self.class.name} thread"  if main
           else
-            Ffmprb.logger.warn "Not the main: true thread run by a not #{self.class.name} thread"  unless main
+            Ffmprb.logger.warn "Not the main: true thread run by a not #{self.class.name} thread"  unless
+              main
           end
           sync_q.enq :ok
           Ffmprb.logger.debug{"#{name} thread launched"}
@@ -99,7 +100,8 @@ module Ffmprb
         @children_mon.synchronize do
           Ffmprb.logger.debug{"releasing #{thr.name} thread"}
           @dead_children_q.enq thr
-          fail "System Error"  unless @live_children.delete thr
+          fail "System Error"  unless
+            @live_children.delete thr
         end
         proc_vis_edge self, thr, :remove
       end
@@ -112,7 +114,8 @@ module Ffmprb
             @dead_children_q.deq
           end
           Ffmprb.logger.debug "joining the late #{thr.name} thread"
-          fail "System Error"  unless thr.join(timeout)  # NOTE should not block
+          fail "System Error"  unless
+            thr.join(timeout)  # NOTE should not block
         end
       end
     end

data/lib/ffmprb/util.rb

@@ -24,12 +24,14 @@ module Ffmprb
       def ffmpeg(*args, limit: nil, timeout: cmd_timeout, ignore_broken_pipes: true)
         args = %w[-loglevel debug] + args  if
           Ffmprb.ffmpeg_debug
-        sh *ffmpeg_cmd, *args,
-        output: :stderr,
-        limit: limit,
-        timeout: timeout,
-        ignore_broken_pipes: ignore_broken_pipes,
-        broken_pipe_error_re: FFMPEG_BROKEN_PIPE_ERROR_RE
+        sh(
+          *ffmpeg_cmd, *args,
+          output: :stderr,
+          limit: limit,
+          timeout: timeout,
+          ignore_broken_pipes: ignore_broken_pipes,
+          broken_pipe_error_re: FFMPEG_BROKEN_PIPE_ERROR_RE
+        )
       end
 
       def sh(*cmd, input: nil, output: :stdout, limit: nil, timeout: cmd_timeout, ignore_broken_pipes: false, broken_pipe_error_re: nil)

data/lib/ffmprb/version.rb

@@ -1,6 +1,6 @@
 module Ffmprb
 
-  VERSION = '0.12.1'
+  VERSION = '0.12.3'
 
   GEM_GITHUB_URL = 'https://github.com/costa/ffmprb'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffmprb
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.3
 platform: ruby
 authors:
 - Costa Shapiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-02 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mkfifo
@@ -189,6 +189,7 @@ files:
 - exp/youtubby/README.md
 - exp/youtubby/bin/up-deps
 - exp/youtubby/docker-compose.yml
+- exp/youtubby/exp/gop-raw-cut-rcc-join-you-HD60.rb
 - exp/youtubby/exp/gop-raw-cut-you-HD60
 - exp/youtubby/exp/gop-raw-cut-you-HD60.rb
 - exp/youtubby/exp/media-upload
@@ -246,7 +247,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="