dtas 0.9.0 → 0.10.0

data/Documentation/dtas-splitfx.txt

@@ -38,7 +38,9 @@ to use ecasound(1), too.
 # FILE FORMAT
 
 * infile - string, the pathname of the original audio file
-* env - hash of environment variables to set for all commands
+* env - ordered hash of environment variables to set for all commands
+    env: !omap
+      FX: vol +3dB stats
 * comments - hash of common tags for all audio (e.g. ARTIST, ALBUM, YEAR)
     comments:
       ARTIST: John Smith
@@ -52,6 +54,7 @@ to use ecasound(1), too.
   highest-numbered track (default: true)
 * tracks - array, see "TRACKS" section
 * targets - hash, see "TARGETS" section
+* command - used only by dtas-player(1)
 
 # TRACKS
 
@@ -96,14 +99,20 @@ dtas-splitfx sets several default environment variables for commands to
 use in targets:
 
 * INFILE - this matches the "infile" directive in the YAML file
+* INDIR - the directory INFILE belongs to, without trailing slash
+* INBASE - the basename of INFILE
+* TBEG - the integer sample offset where the sox(1) trim effect starts
+* TLEN - the integer sample count representing the length of the trim
 * TRIMFX - essential, this supplys the necessary sox(1) trim effect to
-  each track.
+  each track. In other words, this is: "trim ${TBEG}s ${TLEN}s"
 * COMMENTS - expands to --comment-file=PATH for sox(1)
-* OUTFMT - sox(1) arguments for the output format (e.g. "-ts32 -c2 -r44100"
+* OUTFMT - sox(1) arguments for the output format (e.g. "-ts32 -c2 * -r44100")
 * SUFFIX - the suffix of the output format without "." (e.g. "flac", "ogg")
 * TRACKNUMBER - the track number, useful for comments and filenames
 * RATEFX - rate effect and arguments for sox(1) resampling
 * DITHERFX - dither effect and arguments for sox(1) dithering
+* FX - any user-specified sox effects which encompases the entire file.
+  (e.g. "highpass 35 vol +3dB stats")
 
 # TARGETS
 
@@ -163,9 +172,9 @@ For reference, the "opusenc" default target is implemented as follows:
 
 # COPYRIGHT
 
-Copyright 2013-2014, Eric Wong <e@80x24.org> and all contributors.\
+Copyright 2013-2015 all contributors <dtas-all@nongnu.org>.\
 License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt>
 
 # SEE ALSO
 
-sox(1), ecasound(1), flac(1), opusenc(1)
+sox(1), ecasound(1), flac(1), opusenc(1), dtas-player(1)

data/Documentation/dtas-tl.txt

@@ -64,13 +64,14 @@ This defaults to ~/.dtas/player.sock
 
 # CONTACT
 
-All feedback welcome via plain-text mail to <dtas-all@nongnu.org>\
-Mailing list archives available at <ftp://lists.gnu.org/dtas-all/>\
+All feedback welcome via plain-text mail to: <dtas-all@nongnu.org>\
+Mailing list archives available at <http://80x24.org/dtas-all/> and
+<ftp://lists.gnu.org/dtas-all/>\
 No subscription is necessary to post to the mailing list.
 
 # COPYRIGHT
 
-Copyright 2013-2014, Eric Wong <e@80x24.org> and all contributors.\
+Copyright 2013-2015 all contributors <dtas-all@nongnu.org>.\
 License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt>
 
 # SEE ALSO

data/Documentation/dtas-xdelay.txt

@@ -61,13 +61,14 @@ greatly appreciated.
 
 # CONTACT
 
-All feedback welcome via plain-text mail to <dtas-all@nongnu.org>\
-Mailing list archives available at <ftp://lists.gnu.org/dtas-all/>\
+All feedback welcome via plain-text mail to: <dtas-all@nongnu.org>\
+Mailing list archives available at <http://80x24.org/dtas-all/> and
+<ftp://lists.gnu.org/dtas-all/>\
 No subscription is necessary to post to the mailing list.
 
 # COPYRIGHT
 
-Copyright 2013-2014, Eric Wong <e@80x24.org> and all contributors.\
+Copyright 2013-2015 all contributors <dtas-all@nongnu.org>.\
 License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt>
 
 # SEE ALSO

data/Documentation/update-footer.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+# Copyright 2015 all contributors <dtas-all@nongnu.org>
+# License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt>
+contact = %q{
+All feedback welcome via plain-text mail to: <dtas-all@nongnu.org>\
+Mailing list archives available at <http://80x24.org/dtas-all/> and
+<ftp://lists.gnu.org/dtas-all/>\
+No subscription is necessary to post to the mailing list.
+}
+
+copyright = %q{
+Copyright %s all contributors <dtas-all@nongnu.org>.\
+License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt>
+}
+
+ENV['TZ'] = 'UTC'
+now_year = Time.now.strftime("%Y")
+ARGV.each do |file|
+  cmd = %W(git log --reverse --pretty=format:%ad --date=short -- #{file})
+  beg_year = IO.popen(cmd, &:gets).split('-')[0]
+  years = beg_year == now_year ? beg_year : "#{beg_year}-#{now_year}"
+
+  File.open(file, "r+") do |fp|
+    state = :top
+    sections = [ state ]
+    sec = { state => "" }
+    fp.each_line do |l|
+      case l
+      when /^(#.+)$/
+        state = $1.freeze
+        sections << state
+        sec[state] = ""
+      else
+        sec[state] << l
+      end
+    end
+
+    fp.truncate(0)
+    fp.rewind
+    sec["# CONTACT"] = contact
+    sec["# COPYRIGHT"] = sprintf(copyright, years)
+    while section = sections.shift
+      fp.puts(section) if String === section
+      blob = sec[section].sub(/\A\n+/, '').sub(/\n+\z/, '')
+      fp.puts("\n") if String === section
+      fp.write(blob)
+      fp.puts("\n")
+      fp.puts("\n") if sections[0]
+    end
+    fp.rewind
+  end
+end

data/GIT-VERSION-GEN

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 CONSTANT = "DTAS::VERSION"
 RVF = "lib/dtas/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v0.9.0"
+DEF_VER = "v0.10.0"
 vn = DEF_VER
 
 # First see if there is a version file (included in release tarballs),

data/GNUmakefile

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 all::
 pkg = dtas

data/HACKING

@@ -17,10 +17,11 @@ We use git(7) and develop dtas on a public mailing list like git
 developers do.  Please send patches via git-send-email(1) to the public
 mailing list at <dtas-all@nongnu.org>.  Pull requests should be
 formatted using git-request-pull(1).\
-Mailing list archives available at <ftp://lists.gnu.org/dtas-all/>\
+Mailing list archives available at <http://80x24.org/dtas-all/> and
+<ftp://lists.gnu.org/dtas-all/>\
 No subscription is necessary to post to the mailing list.
 
 # COPYRIGHT
 
-Copyright 2013-2014, Eric Wong <e@80x24.org> and all contributors.\
+Copyright 2013-2015 all contributors <dtas-all@nongnu.org>.\
 License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt>

data/INSTALL

@@ -40,10 +40,10 @@ For future upgrades of dtas (upgrades to dtas-linux will be infrequent)
 
 Grab the latest tarball from our HTTP site:
 
-    http://dtas.80x24.org/2014/dtas-0.9.0.tar.gz
+    http://dtas.80x24.org/2015/dtas-0.10.0.tar.gz
 
-    $ tar zxvf dtas-0.9.0.tar.gz
-    $ cd dtas-0.9.0
+    $ tar zxvf dtas-0.10.0.tar.gz
+    $ cd dtas-0.10.0
     $ sudo ruby setup.rb
 
 GNU/Linux users may optionally install "io_splice" and
@@ -56,11 +56,11 @@ GNU/Linux users may optionally install "io_splice" and
 
 Please do not hesitate to send plain-text mail to <dtas-all@nongnu.org>
 regarding installation and to share your notes/experiences.
-Mailing list archives available at <ftp://lists.gnu.org/dtas-all>
-or <http://80x24.org/dtas-all/>
+Mailing list archives available at <http://80x24.org/dtas-all/> or
+<ftp://lists.gnu.org/dtas-all>\
 No subscription is necessary to post to the mailing list.
 
 # COPYRIGHT
 
-Copyright 2013-2014, Eric Wong <e@80x24.org> and all contributors.\
+Copyright 2013-2015 all contributors <dtas-all@nongnu.org>\
 License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt>

data/README

@@ -81,7 +81,7 @@ No subscription is necessary to post to the mailing list.
 
 ## Copyright
 
-Copyright 2013-2014, Eric Wong <e@80x24.org> and all contributors.\
+Copyright 2013-2015 all contributors <dtas-all@nongnu.org>\
 License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt>
 
 dtas is copyrighted Free Software by all contributors, see logs

data/Rakefile

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>.
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'tempfile'
 include Rake::DSL
@@ -23,8 +23,7 @@ task "NEWS" do
   end
   fp.puts "Unreleased" unless fp.size > 0
   fp.puts "# COPYRIGHT"
-  bdfl = 'Eric Wong <e@80x24.org>'
-  fp.puts "Copyright (C) 2013, #{bdfl} and all contributors"
+  fp.puts "Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>"
   fp.puts "License: GPLv3 or later (http://www.gnu.org/licenses/gpl-3.0.txt)"
   fp.rewind
   assert_equal fp.read, File.read("NEWS") rescue nil

data/TODO

@@ -5,5 +5,5 @@
 
 # COPYRIGHT
 
-Copyright 2013-2014, Eric Wong <e@80x24.org> and all contributors.\
+Copyright 2013-2015 all contributors <dtas-all@nongnu.org>\
 License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt>

data/bin/dtas-archive

@@ -0,0 +1,187 @@
+#!/usr/bin/env ruby
+# Copyright (C) 2015 all contributors <dtas-all@nongnu.org>
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+usage = "#$0 SOURCE DESTINATION"
+
+# We could use the equivalent sox command here, but some folks working on
+# dtas is more likely to write patches for sox (and thus introduce bugs
+# into it), so we'll use sndfile-cmp as it lives in a different source tree
+%w(sndfile-cmp sox).each do |cmd|
+  `which #{cmd} 2>/dev/null`.chomp.empty? and abort "#{cmd} not found in PATH"
+end
+
+RUBY_PLATFORM =~ /linux/ or
+  warn "#$0 is unproven without Linux kernel fadvise semantics"
+have_advise = IO.instance_methods.include?(:advise)
+have_advise or warn "#$0 does not work reliably without IO#advise support"
+
+require 'shellwords'
+require 'fileutils'
+require 'find'
+require 'optparse'
+Thread.abort_on_exception = true
+dry_run = false
+silent = false
+type = 'flac'
+jobs = 1
+repeat = 1
+stats = false
+keep_going = false
+
+OptionParser.new('', 24, '  ') do |op|
+  op.banner = usage
+  op.on('-t', '--type [TYPE]', 'FILE-TYPE (default: flac)') { |t| type = t }
+  op.on('-j', '--jobs [JOBS]', Integer) { |j| jobs = j }
+  op.on('-S', '--stats', 'save stats on the file') { stats = true }
+  op.on('-k', '--keep-going', 'continue after error') { keep_going = true }
+  op.on('-n', '--dry-run', 'only print commands, do not run them') do
+    dry_run = true
+  end
+  op.on('-r', '--repeat [COUNT]', 'number of times to check', Integer) do |r|
+    repeat = r
+  end
+  op.on('-s', '--quiet', '--silent') { silent = true }
+  op.on('-h', '--help') do
+    puts(op.to_s)
+    exit
+  end
+  op.parse!(ARGV)
+end
+
+dst = ARGV.pop
+src = ARGV.dup
+
+FileUtils.mkpath(dst) unless File.exist?(dst)
+src_files = Hash.new { |h,dest_dir| h[dest_dir] = [] }
+
+src.each do |s|
+  src_st = File.stat(s)
+  if src_st.directory?
+    Find.find(s) do |path|
+      File.file?(path) or next
+      dir = File.dirname(path)
+      dir_st = File.stat(dir)
+      if dir_st.ino == src_st.ino && dir_st.dev == src_st.dev
+        src_files['.'] << path
+      else
+        dir = File.basename(File.dirname(path))
+        src_files[dir] << path
+      end
+    end
+  else
+    src_files['.'] << s
+  end
+end
+
+pairs = []
+type = ".#{type}" unless type.start_with?('.')
+
+src_files.each do |dir, files|
+  dir = dir == '.' ? dst : File.join(dst, dir)
+  if dry_run || !silent
+    puts "mkdir -p #{Shellwords.escape(dir)}"
+  end
+  FileUtils.mkpath(dir) unless dry_run
+
+  files.each do |path|
+    base = File.basename(path).sub(/\.[^\.]+\z/, type)
+    out = File.join(dir, base)
+    pairs << [ path, out ]
+  end
+end
+
+mtx = Mutex.new # protects fails and pairs
+fails = []
+mismatches = []
+
+on_fail = lambda do |job, status|
+  mtx.synchronize do
+    pairs.clear unless keep_going
+    fails << [ job, status ]
+  end
+end
+
+on_mismatch = lambda do |job, status|
+  mtx.synchronize do
+    mismatches << [ job, status ]
+  end
+end
+
+exiting = false
+%w(INT TERM).each do |s|
+  trap(s) do
+    warn "Caught SIG#{s}, stopping gracefully..."
+    exiting = true
+    trap(s, 'DEFAULT') # non-graceful if signaled again
+  end
+end
+
+thrs = jobs.times.map do |i|
+  Thread.new do
+    while job = mtx.synchronize { pairs.shift }
+      break if exiting
+
+      input, output = *job
+
+      unless system('soxi', '-s', input, out: IO::NULL, err: IO::NULL)
+        warn "skipping #{input.inspect}, not an audio file"
+        next
+      end
+
+      stats_out = "#{output.sub(/\.[\.]+\z/, '')}.stats" if stats
+
+      if dry_run || !silent
+        names = job.map { |x| Shellwords.escape(x) }
+        cmd = [ 'sox', *names ]
+        if stats
+          cmd << 'stats'
+          cmd << "2>#{Shellwords.escape(stats_out)}"
+        end
+
+        puts cmd.join(' ')
+        cmpcmd = "sndfile-cmp #{names[0]} #{names[1]}"
+        if dry_run
+          puts cmpcmd
+          next
+        end
+      end
+
+      cmd = [ 'sox', input, output ]
+      if stats
+        cmd << 'stats'
+        cmd = [ *cmd, { err: stats_out } ]
+      end
+      system(*cmd) or on_fail.call(job, $?)
+
+      # clear kernel caches, this relies on Linux behavior
+      repeat.times do
+        if have_advise
+          th = Thread.new { File.open(input) { |fp| fp.advise(:dontneed) } }
+          File.open(output, 'ab') do |fp|
+            fp.fsync
+            fp.advise(:dontneed)
+          end
+          th.join
+        end
+
+        puts cmpcmd unless silent
+        system('sndfile-cmp', input, output) or on_mismatch.call(job, $?)
+      end
+      st = File.stat(input)
+      File.utime(st.atime, st.mtime, output)
+    end
+  end
+end
+
+thrs.each(&:join)
+ok = true
+fails.each do |job, status|
+  $stderr.puts "#{job.inspect} failed: #{status.inspect}"
+  ok = false
+end
+mismatches.each do |job, status|
+  $stderr.puts "#{job.inspect} mismatched: #{status.inspect}"
+  ok = false
+end
+
+exit ok

data/bin/dtas-console

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 #
 # Note: no idea what I'm doing, especially w.r.t. curses
@@ -104,6 +104,10 @@ def rg_string(rg, current)
   rv
 end
 
+def may_fail(res, events)
+  events << res if res != "OK"
+end
+
 enc_locale = Encoding.find("locale")
 $stdout.set_encoding(enc_locale)
 enc_opts = { undef: :replace, invalid: :replace, replace: '?' }
@@ -202,6 +206,8 @@ begin
         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 " "
           c.req("play_pause")
         when "r" # cycle through replaygain modes