dtas 0.2.0 → 0.3.0

data/README

@@ -68,15 +68,20 @@ See http://www.git-scm.com/ for more information on git.
 
 ## Contact
 
-Feedback (results, bug reports, patches, pull-requests) via plain-text
-email is very much appreciated.
+All feedback (comments, results, feature requests, bug reports, patches,
+pull-requests) via plain-text mail to the mailing list is very much
+appreciated.
 
-Please send plain-text email to Eric Wong <normalperson@yhbt.net>.
-HTML will not be read.  dtas is for GUI-phobes, by GUI-phobes.
-Public mailing list coming soon.
+Please send plain-text mail to the list at <dtas-all@nongnu.org>\
+HTML will not be read.  dtas is for GUI-phobes, by GUI-phobes.\
+Mailing list archives available at <ftp://lists.gnu.org/dtas-all/>\
+No subscription is necessary to post to the mailing list.
 
 ## Copyright
 
+Copyright 2013, Eric Wong <normalperson@yhbt.net> and all contributors.\
+License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt>
+
 dtas is copyrighted Free Software by all contributors, see logs
 in revision control for names and email addresses of all of them.
 
@@ -93,11 +98,6 @@ for more details.
 You should have received a copy of the GNU General Public License along
 with this program; if not, see https://www.gnu.org/licenses/gpl-3.0.txt
 
-dtas is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
 Note: The GPL does not and can not apply to external commands run by
 dtas scripts, so users _may_ run any non-Free Software you want via dtas
 (just like one may do so via bash).  However, the dtas project does not

data/Rakefile

@@ -41,7 +41,8 @@ if ! File.exist?(manifest) || File.stat(manifest).mtime < gitidx.mtime
     end
 
     fp.write("\n# COPYRIGHT\n")
-    fp.puts "Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors"
+    bdfl = 'Eric Wong <normalperson@yhbt.net>'
+    fp.puts "Copyright (C) 2013, #{bdfl} and all contributors"
     fp.puts "License: GPLv3 or later (http://www.gnu.org/licenses/gpl-3.0.txt)"
   end
 end
@@ -70,6 +71,7 @@ task :rsync_docs do
   files = []
 
   # git-set-file-times is distributed with rsync,
+  # Also available at: http://yhbt.net/git-set-file-times
   # on Debian systems: /usr/share/doc/rsync/scripts/git-set-file-times.gz
   sh("git", "set-file-times", "Documentation")
 

data/bin/dtas-console

@@ -1,19 +1,21 @@
 #!/usr/bin/env ruby
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # 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
 require 'dtas/unix_client'
 require 'dtas/rg_state'
+require 'dtas/sigevent'
 require 'curses'
 require 'yaml'
 
+se = DTAS::Sigevent.new
+trap(:WINCH) { se.signal }
 w = DTAS::UNIXClient.new
 w.req_ok('watch')
 c = DTAS::UNIXClient.new
 cur = YAML.load(c.req('current'))
-readable = [ w, $stdin ]
+readable = [ se, w, $stdin ]
 
 # current rg mode
 rg_mode = DTAS::RGState::RG_MODE.keys.unshift("off")
@@ -146,6 +148,9 @@ begin
     r = IO.select(readable, nil, nil, current ? interval : nil) or next
     r[0].each do |io|
       case io
+      when se
+        se.readable_iter {} # noop, just consume the event
+        Curses.clear
       when w
         event = w.res_wait
         events << "#{Time.now.strftime(tfmt)} #{event}"

data/bin/dtas-ctl

@@ -1,10 +1,7 @@
 #!/usr/bin/env ruby
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'dtas/unix_client'
 
-# Unix paths are encoding agnostic
-ARGV.map! { |arg| arg.b }
 c = DTAS::UNIXClient.new
 puts c.req(ARGV)

data/bin/dtas-cueedit

@@ -1,16 +1,15 @@
 #!/usr/bin/env ruby
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'tempfile'
-require 'shellwords'
+require 'dtas/xs'
 usage = "Usage: #$0 FILENAME"
 editor = ENV["VISUAL"] || ENV["EDITOR"] || "vi"
 ARGV.size > 0 or abort usage
+include DTAS::XS
 
 def err_msg(cmd, status)
-  err_cmd = cmd.map { |f| Shellwords.escape(f) }.join(' ')
-  "E: #{err_cmd} failed: #{status.inspect}"
+  "E: #{xs(cmd)} failed: #{status.inspect}"
 end
 
 def x!(*cmd)
@@ -52,7 +51,7 @@ ARGV.each do |file|
     # avoid an expensive update if the user didn't change anything
     current = File.binread(tmp.path)
     if current == original
-      $stderr.puts "tags for #{Shellwords.escape(file)} unchanged" if $DEBUG
+      $stderr.puts "tags for #{xs(Array(file))} unchanged" if $DEBUG
       next
     end
 
@@ -68,7 +67,7 @@ ARGV.each do |file|
       warn err_msg(cmd, $?)
       warn "E: restoring original from backup"
       x!(*%W(metaflac --import-cuesheet-from=#{backup.path} #{file}))
-      warn "E: backup cuesheet restored, #{Shellwords.escape(file)} unchanged"
+      warn "E: backup cuesheet restored, #{xs(Array(file))} unchanged"
       exit(false)
     end
   ensure

data/bin/dtas-enq

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'dtas/unix_client'

data/bin/dtas-msinkctl

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'yaml'

data/bin/dtas-player

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 Thread.abort_on_exception = $stderr.sync = $stdout.sync = true
@@ -27,7 +26,10 @@ else
   player.socket = sock
 end
 
-at_exit { player.close }
+at_exit do
+  player.close
+  Process.waitall
+end
 player.bind
 trap(:INT) { exit }
 trap(:TERM) { exit }

data/bin/dtas-sinkedit

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'dtas/edit_client'

data/bin/dtas-sourceedit

@@ -1,27 +1,37 @@
 #!/usr/bin/env ruby
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'dtas/edit_client'
 include DTAS::EditClient
 c = client_socket
 sources = c.req('source ls') || "(unknown)"
-usage = "Usage: #{DTAS_PROGNAME} SOURCENAME\n" \
+usage = "Usage: #{DTAS_PROGNAME} [-n|--dry-run][-V|--verbose] SOURCENAME\n" \
         "available SOURCENAME values: #{sources}"
+
+# use a real option parser if we have anything more complex
+dry_run = !!(ARGV.delete('-n') || ARGV.delete('--dry-run'))
+verbose = !!(ARGV.delete('-V') || ARGV.delete('--verbose'))
+
 ARGV.size <= 1 or abort usage
 name = ARGV[0] || "sox"
 
-tmp = tmpyaml
+st_in = $stdin.stat
+
 buf = c.req(%W(source cat #{name}))
 abort(buf) if buf =~ /\AERR/
 orig = YAML.load(buf)
 
-tmp.write(buf << DTAS_DISCLAIMER)
-cmd = "#{editor} #{tmp.path}"
-system(cmd) or abort "#{cmd} failed: #$?"
-tmp.rewind
-source = YAML.load(tmp.read)
+if st_in.file? || st_in.pipe?
+  tmp = $stdin
+else
+  tmp = tmpyaml
+  tmp.write(buf << DTAS_DISCLAIMER)
+  cmd = "#{editor} #{tmp.path}"
+  system(cmd) or abort "#{cmd} failed: #$?"
+  tmp.rewind
+end
 
+source = YAML.load(tmp.read)
 cmd = %W(source ed #{name})
 update_cmd_env(cmd, orig, source)
 
@@ -30,4 +40,8 @@ update_cmd_env(cmd, orig, source)
   cmd << "#{field}=#{source[field]}"
 end
 
-c.req_ok(cmd)
+if verbose || dry_run
+  warn Shellwords.join(cmd)
+end
+
+c.req_ok(cmd) unless dry_run

data/bin/dtas-xdelay

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 USAGE = "Usage: #$0 [-x FREQ] [-l] /dev/fd/LO /dev/fd/HI DELAY [DELAY ...]"
@@ -74,6 +73,7 @@ when "sox"
   args.unshift "sox"
   args.concat(%W(-t#{out_type} -c#{out_channels} -r#{out_rate} -))
 when "play"
+  args.unshift "-q"
   args.unshift "play"
 else
   abort "BUG: bad cmd=#{cmd.inspect}"

data/dtas-linux.gemspec

@@ -1,4 +1,6 @@
-# -*- encoding: binary -*-
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+#
 # this just declares dependencies to make gem installation a little easier
 # for Linux users
 Gem::Specification.new do |s|

data/dtas-mpris.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: binary -*-
 # Copyright 2013, Eric Wong <normalperson@yhbt.net> and all contributors.
 # License: GPLv2 or later <http://www.gnu.org/licenses/gpl-2.0.txt>
 # This is GPLv2+ instead of GPLv3+ because ruby-dbus is LGPLv2.1 (only)

data/lib/dtas.rb

@@ -1,4 +1,3 @@
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 module DTAS # :nodoc:

data/lib/dtas/buffer.rb

@@ -1,4 +1,3 @@
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../dtas'

data/lib/dtas/buffer/read_write.rb

@@ -1,4 +1,3 @@
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'io/wait'

data/lib/dtas/buffer/splice.rb

@@ -1,4 +1,3 @@
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'io/wait'

data/lib/dtas/command.rb

@@ -1,4 +1,3 @@
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 # common code for wrapping SoX/ecasound/... commands

data/lib/dtas/compat_onenine.rb

@@ -1,4 +1,3 @@
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 

data/lib/dtas/disclaimer.rb

@@ -1,4 +1,3 @@
-# -*- encoding: binary -*-
 # :enddoc:
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -6,14 +5,14 @@ DTAS_PROGNAME = File.basename($0)
 DTAS_DISCLAIMER = <<EOF
 # WARNING!
 #
-# Ignorant or improper use of #{DTAS_PROGNAME} may lead to
-# data loss, hearing loss, and damage to audio equipment.
+# Ignorant or improper use of #{DTAS_PROGNAME}
+# may lead to data loss, hearing loss, and damage to audio equipment.
 #
 # Please read and understand the documentation of all commands you
 # attempt to configure.
 #
-# #{DTAS_PROGNAME} will never prevent you from doing stupid things.
+# dtas will never prevent you from doing stupid things.
 #
-# There is no warranty, the developers of #{DTAS_PROGNAME}
-# are not responsible for your actions.
+# There is no warranty, the developers of dtas are not responsible
+# for your actions.
 EOF

data/lib/dtas/edit_client.rb

@@ -1,4 +1,3 @@
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'tempfile'

data/lib/dtas/format.rb

@@ -1,4 +1,3 @@
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 # class represents an audio format (type/bits/channels/sample rate/...)
@@ -9,6 +8,7 @@ require_relative 'serialize'
 class DTAS::Format # :nodoc:
   include DTAS::Process
   include DTAS::Serialize
+
   NATIVE_ENDIAN = [1].pack("l") == [1].pack("l>") ? "big" : "little"
 
   attr_accessor :type # s32, f32, f64 ... any point in others?
@@ -63,10 +63,6 @@ class DTAS::Format # :nodoc:
     %W(-f #{@type}_#{endian2},#@channels,#@rate)
   end
 
-  def inspect
-    "<#{self.class}(#{Shellwords.join(to_sox_arg)})>"
-  end
-
   def to_hsh
     to_hash.delete_if { |k,v| v == FORMAT_DEFAULTS[k] }
   end

data/lib/dtas/pipe.rb

@@ -1,4 +1,3 @@
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 begin

data/lib/dtas/player.rb

@@ -1,9 +1,9 @@
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'yaml'
 require 'shellwords'
 require_relative '../dtas'
+require_relative 'xs'
 require_relative 'source'
 require_relative 'source/sox'
 require_relative 'source/av'
@@ -18,6 +18,7 @@ require_relative 'state_file'
 
 class DTAS::Player # :nodoc:
   require_relative 'player/client_handler'
+  include DTAS::XS
   include DTAS::Player::ClientHandler
   attr_accessor :state_file
   attr_accessor :socket
@@ -52,7 +53,7 @@ class DTAS::Player # :nodoc:
   end
 
   def echo(msg)
-    msg = Shellwords.join(msg) if Array === msg
+    msg = xs(Array(msg))
     @watchers.delete_if do |io, _|
       if io.closed?
         true
@@ -211,6 +212,8 @@ class DTAS::Player # :nodoc:
       io.emit("OK")
     when "source"
       source_handler(io, msg)
+    when "state"
+      state_file_handler(io, msg)
     when "cd"
       chdir_handler(io, msg)
     when "pwd"
@@ -416,6 +419,7 @@ class DTAS::Player # :nodoc:
     end while true
   ensure
     __current_requeue
+    stop_sinks
     trap(:CHLD, old_chld)
     sev.close if sev
     # for state file

data/lib/dtas/player/client_handler.rb

@@ -1,7 +1,8 @@
-# -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require_relative '../xs'
 module DTAS::Player::ClientHandler # :nodoc:
+  include DTAS::XS
 
   # returns true on success, wait_ctl arg on error
   def set_bool(io, kv, v)
@@ -116,7 +117,7 @@ module DTAS::Player::ClientHandler # :nodoc:
     name = msg[1]
     case msg[0]
     when "ls"
-      io.emit(Shellwords.join(@sinks.keys.sort))
+      io.emit(xs(@sinks.keys.sort))
     when "rm"
       sink = @sinks.delete(name) or return io.emit("ERR #{name} not found")
       drop_sink(sink)
@@ -384,7 +385,7 @@ module DTAS::Player::ClientHandler # :nodoc:
   def restart_pipeline
     return if @paused
     __current_requeue
-    @targets.each { |t| drop_target(t) }.clear
+    stop_sinks
   end
 
   def format_handler(io, msg)
@@ -415,6 +416,14 @@ module DTAS::Player::ClientHandler # :nodoc:
   end
 
   def env_handler(io, msg)
+    if msg.empty?
+      # this may fail for large envs due to SEQPACKET size restrictions
+      # do we care?
+      env = ENV.map do |k,v|
+        "#{Shellwords.escape(k)}=#{Shellwords.escape(v)}"
+      end.join(' ')
+      return io.emit(env)
+    end
     msg.each do |kv|
       case kv
       when %r{\A([^=]+)=(.*)\z}
@@ -478,5 +487,26 @@ module DTAS::Player::ClientHandler # :nodoc:
     # echo(%W(cd msg[0])) # should we broadcast this?
     io.emit("OK")
   end
+
+  def state_file_handler(io, msg)
+    case msg.shift
+    when "dump"
+      dest = msg.shift
+      if dest
+        sf = DTAS::StateFile.new(dest, false)
+      elsif @state_file
+        sf = @state_file
+        dest = sf.path
+      else
+        return io.emit("ERR no state file configured")
+      end
+      begin
+        sf.dump(self)
+      rescue => e
+        return io.emit("ERR dumping to #{xs(Array(dest))} #{e.message}")
+      end
+    end
+    io.emit("OK")
+  end
 end
 # :startdoc: