dtas 0.12.1 → 0.13.0

data/Rakefile

@@ -1,21 +1,39 @@
-# 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 'tempfile'
 include Rake::DSL
+
+def tags
+  timefmt = '%Y-%m-%dT%H:%M:%SZ'
+  @tags ||= `git tag -l --sort=-v:refname`.split(/\n/).map do |tag|
+    if %r{\Av[\d\.]+} =~ tag
+      header, subject, body = `git cat-file tag #{tag}`.split(/\n\n/, 3)
+      header = header.split(/\n/)
+      tagger = header.grep(/\Atagger /).first
+      {
+        time: Time.at(tagger.split(' ')[-2].to_i).utc.strftime(timefmt),
+        tagger_name: %r{^tagger ([^<]+)}.match(tagger)[1].strip,
+        tagger_email: %r{<([^>]+)>}.match(tagger)[1].strip,
+        id: `git rev-parse refs/tags/#{tag}`.chomp!,
+        tag: tag,
+        subject: subject,
+        body: body,
+      }
+    end
+  end.compact.sort { |a,b| b[:time] <=> a[:time] }
+end
+
 task "NEWS" do
   latest = nil
   fp = Tempfile.new("NEWS", ".")
   fp.sync = true
-  `git tag -l --sort=-v:refname`.split(/\n/).each do |tag|
-    %r{\Av(.+)} =~ tag or next
-    version = $1
-    header, subject, body = `git cat-file tag #{tag}`.split(/\n\n/, 3)
-    header = header.split(/\n/)
-    tagger = header.grep(/\Atagger /)[0]
-    time = Time.at(tagger.split(/ /)[-2].to_i).utc
-    latest ||= time
-    date = time.strftime("%Y-%m-%d")
-    fp.puts "# #{version} / #{date}\n\n#{subject}"
+  tags.each do |tag|
+    version = tag[:tag].delete 'v'
+    fp.puts "# #{version} / #{tag[:time].split('T')[0]}"
+    fp.puts
+    fp.puts tag[:subject]
+    body = tag[:body]
     if body && body.strip.size > 0
       fp.puts "\n\n#{body}"
     end
@@ -24,17 +42,59 @@
   fp.puts "Unreleased" unless fp.size > 0
   fp.puts "# COPYRIGHT"
   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.puts "License: GPL-3.0+ <http://www.gnu.org/licenses/gpl-3.0.txt>"
   fp.rewind
   assert_equal fp.read, File.read("NEWS") rescue nil
   fp.chmod 0644
   File.rename(fp.path, "NEWS")
+end
+
+desc 'prints news as an Atom feed'
+task 'NEWS.atom' do
+  require 'builder' # gem install builder
+  url_base = 'http://dtas.80x24.org/'
+  cgit_url = 'http://80x24.org/dtas.git/'
+  new_tags = tags[0,10]
+  x = Builder::XmlMarkup.new
+  x.instruct! :xml, encoding: 'UTF-8', version: '1.0'
+  x.feed(xmlns: 'http://www.w3.org/2005/Atom') do
+    x.id "#{url_base}/NEWS.atom"
+    x.title "dtas news"
+    x.subtitle 'duct tape audio suite for *nix'
+    x.link rel: 'alternate', type: 'text/plain', href: "#{url_base}/NEWS"
+    x.updated(new_tags.empty? ? "1970-01-01T00:00:00Z" : new_tags.first[:time])
+    new_tags.each do |tag|
+      x.entry do
+        x.title tag[:subject]
+        x.updated tag[:time]
+        x.published tag[:time]
+        x.author {
+          x.name tag[:tagger_name]
+          x.email tag[:tagger_email]
+        }
+        url = "#{cgit_url}/tag/?id=#{tag[:tag]}"
+        x.link rel: 'alternate', type: 'text/html', href: url
+        x.id url
+        x.content(type: :xhtml) do
+          x.div(xmlns: 'http://www.w3.org/1999/xhtml') do
+            x.pre tag[:body]
+          end
+        end
+      end
+    end
+  end
+
+  fp = Tempfile.new(%w(NEWS .atom), ".")
+  fp.sync = true
+  fp.puts x.target!
+  fp.chmod 0644
+  File.rename fp.path, 'NEWS.atom'
   fp.close!
 end
 
-task rsync_docs: "NEWS" do
+task rsync_docs: %w(NEWS NEWS.atom) do
   dest = ENV["RSYNC_DEST"] || "80x24.org:/srv/dtas/"
-  top = %w(INSTALL NEWS README COPYING)
+  top = %w(INSTALL NEWS README COPYING NEWS.atom)
   files = []
 
   # git-set-file-times is distributed with rsync,

data/TODO

@@ -5,5 +5,5 @@
 
 # COPYRIGHT
 
-Copyright 2013-2015 all contributors <dtas-all@nongnu.org>\
-License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt>
+Copyright 2013-2016 all contributors <dtas-all@nongnu.org>\
+License: GPL-3.0+ <http://www.gnu.org/licenses/gpl-3.0.txt>

data/bin/dtas-archive

@@ -1,6 +1,7 @@
 #!/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)
+# 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
 usage = "#$0 SOURCE DESTINATION"
 
 # We could use the equivalent sox command here, but some folks working on

data/bin/dtas-console

@@ -1,12 +1,16 @@
 #!/usr/bin/env ruby
-# 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
 #
 # Note: no idea what I'm doing, especially w.r.t. curses
 require 'dtas'
 require 'dtas/unix_client'
 require 'dtas/rg_state'
 require 'dtas/sigevent'
+require 'dtas/process'
+require 'dtas/format'
+include DTAS::Process
 require 'yaml'
 begin
   require 'curses'
@@ -99,7 +103,7 @@ def fmt_to_s(f)
 end
 
 def rg_string(rg, current)
-  rv = "rg mode=#{rg['mode']||'off'}"
+  rv = "rg mode=#{rg['mode']||'off'}".dup
   defaults = DTAS::RGState::RG_DEFAULT
   # don't show things that are too rare
   %w(preamp fallback_gain).each do |param|
@@ -114,6 +118,7 @@ def may_fail(res, events)
   events << res if res != "OK"
 end
 
+pre_mute_vol = 1.0
 enc_locale = Encoding.find("locale")
 $stdout.set_encoding(enc_locale)
 enc_opts = { undef: :replace, invalid: :replace, replace: '?' }
@@ -128,47 +133,79 @@ def may_fail(res, events)
   loop do
     lineno = -1
     pfmt = cur['format']
+    elapsed = samples = 0
+    fmt = total = ''
+    paused = false
     if current = cur['current']
-      Curses.setpos(lineno += 1, 0)
-      Curses.clrtoeol
-      if infile = current['infile']
-        # FS encoding != locale encoding, but we need to display an FS path
-        # name to whatever locale the terminal is encoded to, so force
-        # it and risk mojibake...
-        infile.encode(enc_locale, enc_opts)
-        Curses.addstr(infile)
-      else
-        Curses.addstr(current['command'])
-      end
-
+      infile = current['infile'] || current['command']
       elapsed = DTAS.now - current['spawn_at']
       if (nr = cur['current_initial']) && (current_format = current['format'])
         rate = current_format['rate'].to_f
         elapsed += nr / rate
-        total = " [#{Time.at(current['samples'] / rate).strftime(tfmt)}]"
+        samples = current['samples']
         fmt = "(#{fmt_to_s(current_format)} > #{fmt_to_s(pfmt)})"
       else
-        total = ""
         fmt = fmt_to_s(pfmt)
         fmt = "(#{fmt} > #{fmt})"
       end
+    elsif cur['paused'] && infile = cur['current_paused']
+      fmt = "[paused] (#{fmt_to_s(pfmt)})"
+      paused = true
+      infile = infile['command'] if Hash === infile
+      if Array === infile
+        infile, elapsed = infile
+        elapsed = elapsed.to_i
+        samples = rate = 0
+        if (bypass = cur['bypass']) && bypass.include?('rate')
+          rate = pfmt['rate'].to_f
+        else
+          rate = qx(%W(soxi -r #{infile}), err: DTAS.null).to_i rescue 0
+        end
+        elapsed /= rate.to_f if rate != 0
+      end
+    end
 
+    if infile
+      # FS encoding != locale encoding, but we need to display an FS path
+      # name to whatever locale the terminal is encoded to, so force it
+      # and risk mojibake...
+      infile.encode(enc_locale, enc_opts)
+      Curses.setpos(lineno += 1, 0)
+      Curses.clrtoeol
+      Curses.addstr(infile)
+      total = " [#{Time.at(samples / rate).strftime(tfmt)}]" if samples != 0
       Curses.setpos(lineno += 1, 0)
       Curses.clrtoeol
-      Curses.addstr("#{Time.at(elapsed).strftime(tfmt)}#{total} #{fmt}")
+      if rate != 0
+        Curses.addstr("#{Time.at(elapsed).strftime(tfmt)}#{total} #{fmt}")
+      else
+        Curses.addstr("#{elapsed} samples #{total} #{fmt}")
+      end
     else
       Curses.setpos(lineno += 1, 0)
       Curses.clrtoeol
-      Curses.addstr(cur['paused'] ? "paused #{pause}" : 'idle')
+      Curses.addstr('idle')
       Curses.setpos(lineno += 1, 0)
       Curses.clrtoeol
     end
 
-    rgs = rg_string(cur["rg"] || {}, current)
+    rg = cur['rg'] || {}
+    rgs = rg_string(rg, current)
     Curses.setpos(lineno += 1, 0)
     Curses.clrtoeol
     Curses.addstr(rgs)
 
+    Curses.setpos(lineno += 1, 0)
+    Curses.clrtoeol
+    cur_vol = rg['volume'] || 1.0
+    extra = [ "volume=#{cur_vol}" ]
+    tl = cur['tracklist'] || {}
+    %w(repeat shuffle).each { |x| extra << "#{x}=#{tl[x] || 'false'}" }
+    trim = cur['trim'] || 'off'
+    extra << "trim=#{trim}"
+    Curses.addstr(extra.join(' '))
+    pre_mute_vol = cur_vol if cur_vol != 0
+
     show_events(lineno, screen, events)
 
     Curses.refresh # draw and wait
@@ -206,8 +243,12 @@ def may_fail(res, 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 "9" then c.req_ok("rg preamp-=1")
-        when "0" then c.req_ok("rg preamp+=1")
+        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')
+        when '7' then c.req_ok('rg preamp-=1')
+        when '8' then c.req_ok('rg preamp+=1')
+        when 'm' then c.req_ok("rg volume=#{cur_vol == 0 ? pre_mute_vol : 0}")
         when "F" then c.req_ok("rg fallback_gain+=1")
         when "f" then c.req_ok("rg fallback_gain-=1")
         when ">" then c.req_ok("tl next")

data/bin/dtas-ctl

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-# 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 'dtas/unix_client'
 
 c = DTAS::UNIXClient.new

data/bin/dtas-cueedit

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-# 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 'tempfile'
 require 'dtas/xs'
 usage = "Usage: #$0 FILENAME"

data/bin/dtas-enq

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-# 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 'dtas/unix_client'
 c = DTAS::UNIXClient.new
 

data/bin/dtas-mlib

@@ -1,6 +1,7 @@
 #!/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)
+# 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
 usage = "#$0 [-d DATABASE-URI] ACTION [ARGS]"
 Thread.abort_on_exception = $stderr.sync = $stdout.sync = true
 trap(:INT, 'SYSTEM_DEFAULT')
@@ -39,9 +40,30 @@ def mlib(db, migrate = false)
 when 'update', 'up'
   directory = ARGV.shift or abort "DIRECTORY required\n#{usage}"
   mlib(db, migrate = true).update(directory)
+when 'stats'
+  s = mlib(db, true).stats
+  %w(artists albums songs db_playtime).each { |k| puts "#{k}: #{s[k.to_sym]}" }
 when 'dump' # mainly for debugging
   directory = ARGV.shift || '/'
-  mlib(db).dump(directory)
+  mlib(db).dump(directory, {}, lambda do |parent, node, comments|
+    puts "Path: #{parent[:dirname]}/#{node[:name]}"
+    puts "Length: #{node[:tlen]}"
+    return if comments.empty?
+    puts 'Comments:'
+    comments.each do |k,v|
+      if v.size == 1
+        puts "\t#{k}: #{v[0]}"
+      else
+        v << ''
+        puts "\t#{k}:\n\t\t#{v.join("\t\t\n")}"
+      end
+    end
+    puts
+  end)
+when 'find', 'search'
+  m = mlib(db)
+  cache = {}
+  m.__send__(action, *ARGV) { |node| puts m.path_of(node, cache) }
 else
   abort usage
 end

data/bin/dtas-msinkctl

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-# 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 'dtas/unix_client'
 usage = "#$0 <active-set|active-add|active-sub|nonblock|active> SINK"

data/bin/dtas-partstats

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-# 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
 # TODO
 # - option parsing: sox effects, stats effect options
 # - support piping out to external processes

data/bin/dtas-player

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-# 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
 Thread.abort_on_exception = $stderr.sync = $stdout.sync = true
 require 'yaml'
 require 'dtas/player'

data/bin/dtas-readahead

@@ -1,6 +1,7 @@
 #!/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)
+# 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
 #
 # Really janky readahead script.  Requires dtas-player to be
 # running and unlikely to work outside of Linux as it depends on
@@ -95,9 +96,9 @@ def do_ra(fp, pos, w)
   pp({start_ra: File.basename(path),
       len: '%.3f' % (len / (1024 * 1024.0)),
       pos: pos })
-  Process.spawn('soxi', path, @redir)
-  Process.spawn('avprobe', path, @redir)
-  Process.spawn('ffprobe', path, @redir)
+  spawn('soxi', path, @redir)
+  spawn('avprobe', path, @redir)
+  spawn('ffprobe', path, @redir)
   fp.advise(:sequential, pos, len)
   Thread.new(fp.dup) { |d| d.advise(:willneed, pos, len); d.close }
 

data/bin/dtas-sinkedit

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-# 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 'optparse'
 require 'dtas/edit_client'
 require 'dtas/sigevent'

data/bin/dtas-sourceedit

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-# 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 'optparse'
 require 'dtas/edit_client'
 require 'dtas/sigevent'

data/bin/dtas-splitfx

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-# 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 'optparse'
 require 'dtas/splitfx'