dtas 0.14.2 → 0.15.0

data/lib/dtas/sigevent/efd.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 
 # used in various places for safe wakeups from IO.select via signals
 # This requires a modern Linux system and the "sleepy_penguin" RubyGem

data/lib/dtas/sigevent/pipe.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 
 # used in various places for safe wakeups from IO.select via signals

data/lib/dtas/sink.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'yaml'
 require_relative '../dtas'

data/lib/dtas/source.rb

@@ -1,7 +1,8 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../dtas'
+require_relative 'mcache'
 
 module DTAS::Source # :nodoc:
 end

data/lib/dtas/source/av.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../../dtas'
 require_relative 'av_ff_common'

data/lib/dtas/source/av_ff_common.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../../dtas'
 require_relative '../source'
@@ -109,13 +109,17 @@ def av_ff_ok?
       f = $1.dup
       f =~ /^duration=([\d\.]+)\s*$/nm and @duration = $1.to_f
       # TODO: multi-line/multi-value/repeated tags
-      f.gsub!(/^TAG:([^=]+)=(.*)$/ni) { |_| @comments[$1.upcase.freeze] = $2 }
+      f.gsub!(/^TAG:([^=]+)=(.*)$/ni) { |_|
+        @comments[DTAS.dedupe_str($1.upcase)] = DTAS.dedupe_str($2)
+      }
     end
 
     # new avprobe
     s.scan(%r{^\[format\.tags\]\n(.*?)\n\n}m) do |_|
       f = $1.dup
-      f.gsub!(/^([^=]+)=(.*)$/ni) { |_| @comments[$1.upcase.freeze] = $2 }
+      f.gsub!(/^([^=]+)=(.*)$/ni) { |_|
+        @comments[DTAS.dedupe_str($1.upcase)] = DTAS.dedupe_str($2)
+      }
     end
     s.scan(%r{^\[format\]\n(.*?)\n\n}m) do |_|
       f = $1.dup

data/lib/dtas/source/cmd.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../../dtas'
 require_relative '../source'

data/lib/dtas/source/common.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 module DTAS::Source::Common # :nodoc:
   attr_reader :dst_zero_byte # first byte this source object saw
   attr_reader :dst

data/lib/dtas/source/ff.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../../dtas'
 require_relative 'av_ff_common'

data/lib/dtas/source/file.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../../dtas'
 require_relative '../source'

data/lib/dtas/source/mp3gain.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../process'
 

data/lib/dtas/source/sox.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 # encoding: binary
 require_relative '../../dtas'
@@ -20,37 +20,70 @@ class DTAS::Source::Sox # :nodoc:
     "tryorder" => 0,
   )
 
-  # we use this to be less noisy when seeking a file
-  def try_to_fail_harder(infile, s, cmd)
-    msg = nil
-    case s
-    when %r{\A0\s*\z} then msg = "detected zero samples"
-    when Process::Status then msg = "failed with #{s.exitstatus}"
+  def soxi_failed(infile, msg)
+    return if @last_failed == infile
+    @last_failed = infile
+    case msg
+    when Process::Status then msg = "failed with #{msg.exitstatus}"
+    when 0 then msg = 'detected zero samples'
     end
-    if msg
-      return if @last_failed == infile
-      @last_failed = infile
-      return warn("`#{xs(cmd)}' #{msg}")
-    end
-    true
+    warn("soxi #{infile}: #{msg}\n")
   end
 
-  def initialize
+  def initialize(mcache = nil)
+    @mcache = nil
     @last_failed = nil
     command_init(SOX_DEFAULTS)
   end
 
+  def mcache_lookup(infile)
+    (@mcache ||= DTAS::Mcache.new).lookup(infile) do |input, dst|
+      err = ''.b
+      out = qx(@env.dup, %W(soxi #{input}), err_str: err, no_raise: true)
+      return soxi_failed(infile, out) if Process::Status === out
+      return soxi_failed(infile, err) if err =~ /soxi FAIL formats:/
+      out =~ /^Duration\s*:[^=]*= (\d+) samples /n
+      samples = dst['samples'] = $1.to_i
+      return soxi_failed(infile, 0) if samples == 0
+
+      out =~ /^Channels\s*:\s*(\d+)/n and dst['channels'] = $1.to_i
+      out =~ /^Sample Rate\s*:\s*(\d+)/n and dst['rate'] = $1.to_i
+      out =~ /^Precision\s*:\s*(\d+)-bit/n and dst['bits'] = $1.to_i
+
+      if out =~ /\nComments\s*:[ \t]*\n?(.*)\z/mn
+        comments = dst['comments'] = {}
+        key = nil
+        $1.split(/\n/n).each do |line|
+          if line.sub!(/^([^=]+)=/ni, '')
+            key = DTAS.dedupe_str($1.upcase)
+          end
+          (comments[key] ||= ''.b) << "#{line}\n" unless line.empty?
+        end
+        comments.each do |k,v|
+          v.chomp!
+          comments[k] = DTAS.dedupe_str(v)
+        end
+      end
+      dst
+    end
+  end
+
   def try(infile, offset = nil, trim = nil)
-    err = "".b
-    cmd = %W(soxi -s #{infile})
-    s = qx(@env.dup, cmd, err_str: err, no_raise: true)
-    return if err =~ /soxi FAIL formats:/
-    try_to_fail_harder(infile, s, cmd) or return
-    source_file_dup(infile, offset, trim)
+    ent = mcache_lookup(infile) or return
+    ret = source_file_dup(infile, offset, trim)
+    ret.instance_eval do
+      @samples = ent['samples']
+      @format = DTAS::Format.load(ent)
+      @comments = ent['comments']
+    end
+    ret
   end
 
   def format
-    @format ||= DTAS::Format.from_file(@env, @infile)
+    @format ||= begin
+      ent = mcache_lookup(@infile)
+      ent ? DTAS::Format.load(ent) : nil
+    end
   end
 
   def duration
@@ -60,23 +93,17 @@ def duration
   # This is the number of samples according to the samples in the source
   # file itself, not the decoded output
   def samples
-    @samples ||= qx(@env, %W(soxi -s #@infile)).to_i
-  rescue => e
-    warn e.message
-    0
+    (@samples ||= begin
+      ent = mcache_lookup(@infile)
+      ent ? ent['samples'] : nil
+     end) || 0
   end
 
-  # just run soxi -a
   def __load_comments
     tmp = {}
     case @infile
     when String
-      qx(@env, %W(soxi -a #@infile)).split("\n").each do |line|
-        key, value = line.split('=', 2)
-        key && value or next
-        # TODO: multi-line/multi-value/repeated tags
-        tmp[key.upcase.freeze] = value
-      end
+      ent = mcache_lookup(@infile) and tmp = ent['comments']
     end
     tmp
   end

data/lib/dtas/spawn_fix.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # workaround for older Rubies: https://bugs.ruby-lang.org/issues/8770
 module DTAS::SpawnFix # :nodoc:
   def spawn(*args)

data/lib/dtas/splitfx.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../dtas'
 require_relative 'format'
@@ -38,7 +38,14 @@ def commit(advance_track_samples)
       tlen = advance_track_samples - tbeg
       trimfx = "trim #{tbeg}s #{tlen}s".dup
       if fade_in
-        trimfx << " #{fade_in}"
+        # generate fade-in effect
+        # $1 = "t 4" => "fade t 4 0 0"
+        tmp = fade_in.dup
+        fade_in_len = tmp.pop or
+                         raise ArgumentError, 'fade_in needs a time value'
+        fade_type = tmp.pop # may be nil
+        fade = " fade #{fade_type} #{fade_in_len} 0 0"
+        trimfx << fade
       end
       if fade_out
         tmp = fade_out.dup
@@ -287,10 +294,8 @@ def parse_track(argv)
 
       argv.each do |arg|
         case arg
-        when %r{\Afade_in=(.+)\z}
-          # generate fade-in effect
-          # $1 = "t 4" => "fade t 4 0 0"
-          t.fade_in = "fade #$1 0 0"
+        when %r{\Afade_in=(.+)\z} # $1 = "t 4" or just "4"
+          t.fade_in = $1.split(/\s+/)
         when %r{\Afade_out=(.+)\z} # $1 = "t 4" or just "4"
           t.fade_out = $1.split(/\s+/)
         when %r{\A\.(\w+)=(.+)\z} then t.comments[$1] = $2

data/lib/dtas/state_file.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'yaml'
 require 'tempfile'

data/lib/dtas/tfx.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../dtas'
 require_relative 'parse_time'

data/lib/dtas/track.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../dtas'
 

data/lib/dtas/tracklist.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../dtas'
 require_relative 'serialize'

data/lib/dtas/unix_accepted.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'socket'
 require 'io/wait'

data/lib/dtas/unix_client.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../dtas'
 require_relative 'xs'

data/lib/dtas/unix_server.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require 'socket'
 require_relative '../dtas'

data/lib/dtas/util.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../dtas'
 

data/lib/dtas/writable_iter.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../dtas'
 

data/lib/dtas/xs.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative '../dtas'
 require 'shellwords'

data/perl/dtas-graph

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 use strict;
 use Graph::Easy; # for ASCII-art graphs
 $^O =~ /linux/ or print STDERR "$0 probably only works on Linux...\n";

data/test/covshow.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 #
 # this works with the __covmerge method in test/helper.rb

data/test/helper.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 $stdout.sync = $stderr.sync = Thread.abort_on_exception = true
 require 'thread'

data/test/player_integration.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require './test/helper'
 require 'dtas/player'

data/test/test_buffer.rb

@@ -1,11 +1,15 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require './test/helper'
 require 'stringio'
 require 'dtas/buffer'
 
 class TestBuffer < Testcase
+
+  @@max_size = File.read("/proc/sys/fs/pipe-max-size").to_i
+  @@max_size = nil if @@max_size == 0
+
   def teardown
     @to_close.each { |io| io.close unless io.closed? }
   end
@@ -43,16 +47,16 @@ def new_buffer
 
   def test_set_buffer_size
     buf = new_buffer
-    buf.buffer_size = DTAS::Buffer::MAX_SIZE
-    assert_equal DTAS::Buffer::MAX_SIZE, buf.buffer_size
-  end if defined?(DTAS::Buffer::MAX_SIZE)
+    buf.buffer_size = @@max_size
+    assert_equal @@max_size, buf.buffer_size
+  end if @@max_size
 
   def test_buffer_size
     buf = new_buffer
     assert_operator buf.buffer_size, :>, 128
-    buf.buffer_size = DTAS::Buffer::MAX_SIZE
-    assert_equal DTAS::Buffer::MAX_SIZE, buf.buffer_size
-  end if defined?(DTAS::Buffer::MAX_SIZE)
+    buf.buffer_size = @@max_size
+    assert_equal @@max_size, buf.buffer_size
+  end if @@max_size
 
   def test_broadcast_1
     buf = new_buffer

data/test/test_env.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative 'helper'
 require 'dtas/process'

data/test/test_fadefx.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require_relative 'helper'
 require 'dtas/fadefx'

data/test/test_format.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
-# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 require './test/helper'
 require 'tempfile'