dtas 0.12.1 → 0.13.0

data/lib/dtas/source/common.rb

@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# 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,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# 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,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../../dtas'
 require_relative '../source'
 require_relative '../command'
@@ -67,7 +68,7 @@ def __offset_samples
   # creates the effect to fill the TRIMFX env
   def trimfx
     return unless @offset || @trim
-    fx = "trim #{offset_samples}s"
+    fx = "trim #{offset_samples}s".dup
     if @trim && @trim[1]
       fx << sprintf(' =%0.9gs', (@trim[0] + @trim[1]) * format.rate)
     end
@@ -91,9 +92,9 @@ def to_hash
     rv
   end
 
-  def replaygain
-    @rg ||= DTAS::ReplayGain.new(comments) ||
-            DTAS::ReplayGain.new(mp3gain_comments)
+  def replaygain(mode)
+    @rg ||= DTAS::ReplayGain.new(comments, mode) ||
+            DTAS::ReplayGain.new(mp3gain_comments, mode)
   end
 
   def to_source_cat

data/lib/dtas/source/mp3gain.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../process'
 
 module DTAS::Source::Mp3gain # :nodoc:

data/lib/dtas/source/sox.rb

@@ -1,5 +1,7 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
+# encoding: binary
 require_relative '../../dtas'
 require_relative '../source'
 require_relative '../replaygain'
@@ -39,7 +41,7 @@ def initialize
   end
 
   def try(infile, offset = nil, trim = nil)
-    err = ""
+    err = "".b
     cmd = %W(soxi -s #{infile})
     s = qx(@env.dup, cmd, err_str: err, no_raise: true)
     return if err =~ /soxi FAIL formats:/
@@ -65,8 +67,8 @@ def __load_comments
     tmp = {}
     case @infile
     when String
-      qx(@env, %W(soxi -a #@infile)).split(/\n/n).each do |line|
-        key, value = line.split(/=/n, 2)
+      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] = value

data/lib/dtas/source/splitfx.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2014-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later <https://www.gnu.org/licenses/gpl-3.0.txt>
+# Copyright (C) 2014-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
+# frozen_string_literal: true
 require 'yaml'
 require_relative 'sox'
 require_relative '../splitfx'
@@ -27,7 +28,7 @@ def try(ymlfile, offset = nil, trim = nil)
     return false if !st.file? || st.size > MAX_YAML_SIZE
 
     # read 4 bytes first to ensure we have a YAML file with a hash:
-    buf = ""
+    buf = "".dup
     File.open(ymlfile, "rb") do |fp|
       return false if fp.read(4, buf) != "---\n"
       buf << fp.read
@@ -54,7 +55,10 @@ def try(ymlfile, offset = nil, trim = nil)
   end
 
   def __load_comments
-    @ymlhash["comments"] || @sox.__load_comments
+    if c = @ymlhash["comments"]
+      return c.each { |k,v| c[k] = v.to_s }
+    end
+    @sox.__load_comments
   end
 
   def command_string

data/lib/dtas/spawn_fix.rb

@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# 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,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../dtas'
 require_relative 'format'
 require_relative 'process'
@@ -35,7 +36,7 @@ def commit(_)
   class T < Struct.new(:env, :comments, :tbeg, :fade_in, :fade_out) # :nodoc:
     def commit(advance_track_samples)
       tlen = advance_track_samples - tbeg
-      trimfx = "trim #{tbeg}s #{tlen}s"
+      trimfx = "trim #{tbeg}s #{tlen}s".dup
       if fade_in
         trimfx << " #{fade_in}"
       end
@@ -230,7 +231,7 @@ def splitfx_spawn(target, t, opts)
       }
       env['SOXFMT'] = '-tsox'
       sub_env['OUTFMT'] = env.delete('OUTFMT')
-      sub_env_s = sub_env.inject("") { |s,(k,v)| s << "#{k}=\"#{v}\" " }
+      sub_env_s = sub_env.map { |k,v| "#{k}=\"#{v}\"" }.join(' ')
       show_cmd = [ expand_cmd(env, player_cmd), '|', '(', "#{sub_env_s};",
                    expand_cmd(env.merge(sub_env), command), ')' ].flatten
       command = "#{player_cmd} | (#{sub_env_s}; #{command})"

data/lib/dtas/state_file.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# 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,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../dtas'
 require_relative 'parse_time'
 require_relative 'format'
@@ -7,7 +8,7 @@
 
 # this will represent a trim section inside -splitfx for applying
 # effects to only a part of the output
-class DTAS::TFX
+class DTAS::TFX # :nodoc:
   include DTAS::ParseTime
 
   attr_reader :tbeg
@@ -69,7 +70,7 @@ def to_sox_arg
   def parse_trim!(args)
     tbeg = parse_time(args.shift)
     if args[0] =~ /\A=?[\d\.]+\z/
-      tlen = args.shift
+      tlen = args.shift.dup
       is_stop_time = tlen.sub!(/\A=/, "") ? true : false
       tlen = parse_time(tlen)
       tlen = tlen - tbeg if is_stop_time
@@ -85,7 +86,7 @@ def <=>(other)
   end
 
   # for stable sorting
-  class TFXSort < Struct.new(:tfx, :idx)
+  class TFXSort < Struct.new(:tfx, :idx) # :nodoc:
     def <=>(other)
       cmp = tfx <=> other.tfx
       0 == cmp ? idx <=> other.idx : cmp

data/lib/dtas/track.rb

@@ -1,8 +1,9 @@
-# Copyright (C) 2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../dtas'
 
-class DTAS::Track
+class DTAS::Track # :nodoc:
   attr_reader :track_id
   attr_reader :to_path
 

data/lib/dtas/tracklist.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../dtas'
 require_relative 'serialize'
 require_relative 'track'
@@ -122,10 +123,11 @@ def advance_track(repeat_ok = true)
     @goto_pos = @goto_off = nil
     if cur[next_pos]
       @pos = next_pos
-    elsif repeat
-      next_pos = @pos = 0
     else
-      return
+      # reshuffle the tracklist when we've exhausted it
+      cur.shuffle! if @shuffle
+      return unless repeat
+      next_pos = @pos = 0
     end
     [ cur[next_pos].to_path, next_off ]
   end
@@ -193,9 +195,7 @@ def remove_track(track_id)
     end
     track = @list.delete_at(idx)
     len = @list.size
-    if @pos >= len
-      @pos = len == 0 ? TL_DEFAULTS["pos"] : len
-    end
+    @pos = len - 1 if @pos >= len
     @goto_pos = @goto_pos = nil # TODO: reposition?
     track.to_path
   end

data/lib/dtas/unix_accepted.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# 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,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../dtas'
 require_relative 'xs'
 require 'socket'

data/lib/dtas/unix_server.rb

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

data/lib/dtas/util.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../dtas'
 
 # in case we need to convert DB values to a linear scale

data/lib/dtas/watchable.rb

@@ -1,14 +1,13 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later <https://www.gnu.org/licenses/gpl-3.0.txt>
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
+# frozen_string_literal: true
 begin
-  require 'sleepy_penguin'
-rescue LoadError
-end
+require 'sleepy_penguin'
 
 # used to restart DTAS::Source::SplitFX processing in dtas-player
 # if the YAML file is edited
-module DTAS::Watchable
-  class InotifyReadableIter < SleepyPenguin::Inotify
+module DTAS::Watchable # :nodoc:
+  class InotifyReadableIter < SleepyPenguin::Inotify # :nodoc:
     def self.new
       super(:CLOEXEC)
     end
@@ -62,4 +61,7 @@ def watch_end(srv)
     srv.wait_ctl(@ino, :delete)
     @ino = @ino.close
   end
-end if defined?(SleepyPenguin::Inotify)
+end
+
+rescue LoadError
+end

data/lib/dtas/writable_iter.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../dtas'
 
 # used to manage writable state for -player pipes

data/lib/dtas/xs.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# 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-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# 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,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# 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
 # run this file after all tests are run

data/test/helper.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# 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'
 WAIT_ALL_MTX = Mutex.new

data/test/player_integration.rb

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

data/test/test_buffer.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# 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'

data/test/test_env.rb

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

data/test/test_fadefx.rb

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

data/test/test_format.rb

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

data/test/test_format_change.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require './test/player_integration'
 require 'tmpdir'
 class TestFormatChange < Testcase

data/test/test_mlib.rb

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