dtas 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3234969a259bbd208ab8990043cada0a730f7a26fbd926e9faa8e7a817900f6
-  data.tar.gz: 20a1d5e7e193a8121c004e87cbe24dd15b760c3a680eb5a85652d5620a06d3b8
+  metadata.gz: e243e5ce687818e957241adc639e6a0557d6b4caff54fe423241a30cfbd0368f
+  data.tar.gz: 54d936c09a7ca62d97ce41f23e9c3db70b92765cea257cc34f7bbd21059ba938
 SHA512:
-  metadata.gz: c8538abec27232c2a97be96e9f5d6983fc073c138f78df7472971c2d35242026dc889ab58daddead8e461835cfc334c9a55a9b41035ae4fd685b552e2af618bc
-  data.tar.gz: 9919b3bbeeead4c49d07a68e9f65451c243564815f532ba36c85cd3f04dc948af652952fae4168992538f5c17469b8a9a75ca07d81bf75856ee79edfebf4b2c9
+  metadata.gz: 937e5a36a9fcfe06011871c047a6cda9a8d402a3fea84a68a7214315e9228db03d8f7277d29adca0139ccc7358897a4985d606a96c156432ce53cba1a51fd801
+  data.tar.gz: 9aaed956fd48e6b5c0d45c0ef91a440bd6c4f53def5bfa5390ea5bd2315686dc199e0c0c007e2c1d8c2992bf9c386d3991b7c6fd183577f4e00bda860c09cf36

data/Documentation/dtas-splitfx.pod

@@ -41,6 +41,12 @@ Silent operation, commands are not printed as executed
 Disable automatic setting of the DITHERFX env.  This also passes
 the option to L<sox(1)> via SOX_OPTS.
 
+=item -E, --err-suffix SUFFIX
+
+Write the contents of C<stderr>.  This is useful for capturing
+the per-track output of the L<sox(1)> C<stats> effect when
+combined with parallel C<--jobs>.
+
 =item -O, --outdir OUTDIR
 
 Set output directory instead of current directory.

data/GIT-VERSION-GEN

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2013-2020 all contributors <dtas-all@nongnu.org>
+# Copyright (C) 2013-2021 all contributors <dtas-all@nongnu.org>
 # License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 CONSTANT = "DTAS::VERSION"

data/INSTALL

@@ -1,4 +1,4 @@
-Uncommon for audio software, dtas is implemented in Ruby.
+Uncommon for audio software, dtas is currently implemented in Ruby.
 
 The latest stable release or development snapshot of Ruby is recommended.
 However, Ruby 1.9.3 and later works, but older versions of Ruby do not.
@@ -8,13 +8,14 @@ dtas-player uses SoX by default and you will need it unless you've
 reconfigured dtas-player to use something else.
 
 mp3gain is required if you want to use ReplayGain with MP3s
+(it is no longer in new versions of Debian)
 
 If you only intend to use dtas-cueedit, you will need metaflac(1) from
 the FLAC package.
 
-Debian 7+ users can install dependencies easily:
+Debian 10+ users can install dependencies easily:
 
-    sudo apt-get install sox libsox-fmt-all mp3gain flac ruby-dev
+    sudo apt-get install sox libsox-fmt-all flac ruby-dev ruby-charlock-holmes
 
 For future upgrades of dtas
 
@@ -28,10 +29,10 @@ For future upgrades of dtas
 
 Grab the latest tarball from our HTTPS site:
 
-    https://80x24.org/dtas/2020/dtas-0.18.0.tar.gz
+    https://80x24.org/dtas/2021/dtas-0.18.1.tar.gz
 
-    $ tar zxvf dtas-0.18.0.tar.gz
-    $ cd dtas-0.18.0
+    $ tar zxvf dtas-0.18.1.tar.gz
+    $ cd dtas-0.18.1
     $ sudo ruby setup.rb
 
 GNU/Linux users may optionally install the "sleepy_penguin" RubyGem
@@ -49,5 +50,5 @@ No subscription is necessary to post to the mailing list.
 
 # COPYRIGHT
 
-Copyright 2013-2020 all contributors <dtas-all@nongnu.org>
+Copyright 2013-2021 all contributors <dtas-all@nongnu.org>
 License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>

data/README

@@ -82,8 +82,13 @@ Mailing list archives available at <https://80x24.org/dtas-all/> or
 No subscription is necessary to post to the mailing list.
 You may also read via:
 NNTP: <nntp://news.public-inbox.org/inbox.comp.audio.dtas>
-	<nntp://news.gmane.org/gmane.comp.audio.dtas.general>
+	<nntp://ou63pmih66umazou.onion/inbox.comp.audio.dtas>
+	<nntp://news.gmane.io/gmane.comp.audio.dtas.general>
+IMAP: <imaps://anon:mous@public-inbox.org/inbox.comp.audio.dtas.0>
+	<imap://anon:mous@ou63pmih66umazou.onion/inbox.comp.audio.dtas.0>
 Atom: <https://80x24.org/dtas-all/new.atom>
+	<http://ou63pmih66umazou.onion/dtas-all/new.atom>
+(.onion URLs require Tor: <https://www.torproject.org/>)
 
 ## Copyright
 

data/bin/dtas-console

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2013-2020 all contributors <dtas-all@nongnu.org>
+# Copyright (C) 2013-2021 all contributors <dtas-all@nongnu.org>
 # License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 #
@@ -112,7 +112,8 @@ def rg_string(rg, current)
   rv
 end
 
-def may_fail(res, events)
+def may_fail(c, req, events)
+  res = c.req(req)
   events << res if res != "OK"
 end
 
@@ -227,17 +228,17 @@ def may_fail(res, events)
       when $stdin
         # keybindings taken from mplayer / vi
         case key = Curses.getch
-        when "j" then c.req_ok("seek -5")
-        when "k" then c.req_ok("seek +5")
+        when "j" then may_fail(c, "seek -5", events)
+        when "k" then may_fail(c, "seek +5", events)
         when "q" then exit(0)
-        when Curses::KEY_DOWN then c.req_ok("seek -60")
-        when Curses::KEY_UP then c.req_ok("seek +60")
-        when Curses::KEY_LEFT then c.req_ok("seek -10")
-        when Curses::KEY_RIGHT then c.req_ok("seek +10")
-        when Curses::KEY_BACKSPACE then c.req_ok("seek 0")
+        when Curses::KEY_DOWN then may_fail(c, "seek -60", events)
+        when Curses::KEY_UP then may_fail(c, "seek +60", events)
+        when Curses::KEY_LEFT then may_fail(c, "seek -10", events)
+        when Curses::KEY_RIGHT then may_fail(c, "seek +10", events)
+        when Curses::KEY_BACKSPACE then may_fail(c, "seek 0", events)
         # yes, some of us have long audio files
-        when Curses::KEY_PPAGE then c.req_ok("seek +600")
-        when Curses::KEY_NPAGE then c.req_ok("seek -600")
+        when Curses::KEY_PPAGE then may_fail(c, "seek +600", events)
+        when Curses::KEY_NPAGE then may_fail(c, "seek -600", events)
         when '9' then c.req_ok('rg volume-=0.01')
         when '0' then c.req_ok('rg volume+=0.01')
         when '=' then c.req_ok('rg volume=1')
@@ -248,8 +249,8 @@ def may_fail(res, events)
         when "f" then c.req_ok("rg fallback_gain-=1")
         when ">" then c.req_ok("tl next")
         when "<" then c.req_ok("tl prev")
-        when "!" then may_fail(c.req("cue prev"), events)
-        when "@" then may_fail(c.req("cue next"), events)
+        when "!" then may_fail(c, "cue prev", events)
+        when "@" then may_fail(c, "cue next", events)
         when "o" then tfmt = update_tfmt(prec_step[prec_nr], tsec = !tsec)
         when " "
           c.req("play_pause")

data/bin/dtas-splitfx

@@ -23,6 +23,9 @@
   end
   op.on('-b', '--bits RATE', Integer) { |val| opts[:bits] = val }
   op.on('-t', '--trim POSITION') { |val| opts[:trim] = val.tr(',', ' ') }
+  op.on('-E', '--err-suffix SUFFIX') do |val|
+    opts[:err_suffix] = val.start_with?('.') ? val.freeze : ".#{val}"
+  end
   op.on('-p', '--sox-pipe') do
     opts[:sox_pipe] = true
     default_target = 'sox'
@@ -30,6 +33,10 @@
   op.parse!(ARGV)
 end
 
+if opts[:sox_pipe] && opts[:err_suffix]
+  abort '--err-suffix and --sox-pipe are mutually exclusive'
+end
+
 args = []
 ARGV.each do |arg|
   case arg

data/lib/dtas/encoding.rb

@@ -11,15 +11,14 @@ def self.extended(mod)
 private
 
   def try_enc_harder(str, enc, old) # :nodoc:
+    begin
+      require 'charlock_holmes'
+      @charlock_holmes = CharlockHolmes::EncodingDetector.new
+    rescue LoadError
+      @charlock_holmes = false
+    end if @charlock_holmes.nil?
+
     case @charlock_holmes
-    when nil
-      begin
-        require 'charlock_holmes'
-        @charlock_holmes = CharlockHolmes::EncodingDetector.new
-      rescue LoadError
-        warn "`charlock_holmes` gem not available for encoding detection"
-        @charlock_holmes = false
-      end
     when false
       enc_fallback(str, enc, old)
     else

data/lib/dtas/player/client_handler.rb

@@ -197,19 +197,20 @@ def __goto_offset_samples(offset)
     end
   end
 
+  def __offset_to_i(offset, src)
+    # either "999s" for 999 samples or HH:MM:SS for time
+    offset.sub!(/s\z/, '') ? offset.to_i : src.format.hhmmss_to_samples(offset)
+  end
+
   def __offset_to_samples(offset)
-    offset.sub!(/s\z/, '') and return offset.to_i
-    @current.format.hhmmss_to_samples(offset)
+    __offset_to_i(offset, @current)
   end
 
   # returns seek offset as an Integer in sample count
-  def __seek_offset_adj(dir, offset)
-    if offset.sub!(/s\z/, '')
-      offset = offset.to_i
-    else # time
-      offset = @current.format.hhmmss_to_samples(offset)
-    end
-    n = __current_decoded_samples + (dir * offset)
+  def __seek_offset_adj(dir, offset,
+                        src = @current,
+                        current_decoded_samples = __current_decoded_samples)
+    n = current_decoded_samples + (dir * __offset_to_i(offset, src))
     n = 0 if n < 0
     "#{n}s"
   end
@@ -391,15 +392,17 @@ def seek_internal(cur, offset)
     end
   end
 
+  def __offset_direction(offset)
+    offset.sub!(/\A\+/, '') ? 1 : (offset.sub!(/\A-/, '') ? -1 : nil)
+  end
+
   def dpc_seek(io, msg)
     offset = msg[0] or return io.emit('ERR usage: seek OFFSET')
     if @current
       if @current.respond_to?(:infile)
         begin
-          if offset.sub!(/\A\+/, '')
-            offset = __seek_offset_adj(1, offset)
-          elsif offset.sub!(/\A-/, '')
-            offset = __seek_offset_adj(-1, offset)
+          if direction = __offset_direction(offset)
+            offset = __seek_offset_adj(direction, offset)
           # else: pass to sox directly
           end
         rescue ArgumentError
@@ -413,7 +416,12 @@ def dpc_seek(io, msg)
       case file = @queue[0]
       when String
         @queue[0] = [ file, offset ]
-      when Array
+      when Array # offset already stored, adjust
+        if direction = __offset_direction(offset)
+          tmp = try_file(*file)
+          cur_off = __offset_to_i(file[1].dup, tmp)
+          offset = __seek_offset_adj(direction, offset, tmp, cur_off)
+        end
         file[1] = offset
       else
         return io.emit("ERR unseekable")

data/lib/dtas/splitfx.rb

@@ -207,11 +207,11 @@ def splitfx_spawn(target, t, opts)
       env["DITHERFX"] = "dither -s"
     end
     comments = Tempfile.new(%W(dtas-splitfx-#{t.comments["TRACKNUMBER"]} .txt))
-    comments.sync = true
     t.comments.each do |k,v|
       env[k] = v.to_s
       comments.puts("#{k}=#{v}")
     end
+    comments.flush
     env["COMMENTS"] = "--comment-file=#{comments.path}"
     infile_env(env, @infile)
     outarg = outfmt.to_sox_arg
@@ -250,7 +250,10 @@ def splitfx_spawn(target, t, opts)
     command = 'true' if opts[:dryrun] # still gotta fork
 
     # pgroup: false so Ctrl-C on command-line will immediately stop everything
-    [ dtas_spawn(env, command, pgroup: false), comments ]
+    o = { pgroup: false }
+    e = opts[:err_suffix] and
+      o[:err] = [ "#{env['OUTDIR']}#{env['TRACKNUMBER']}#{e}", 'a' ]
+    [ dtas_spawn(env, command, o), comments ]
   end
 
   def load_tracks!(hash)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtas
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - dtas hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2021-02-13 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Free Software command-line tools for audio playback, mastering, and