dtas 0.18.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e243e5ce687818e957241adc639e6a0557d6b4caff54fe423241a30cfbd0368f
-  data.tar.gz: 54d936c09a7ca62d97ce41f23e9c3db70b92765cea257cc34f7bbd21059ba938
+  metadata.gz: '08c87e61b5fe14796e7415b25cf1df9acaff5fbf280643b33745457dc97e72be'
+  data.tar.gz: fefae588f265012deaa56108c1c6f4fc9f930a1c8827a166fd58ed2b6a844540
 SHA512:
-  metadata.gz: 937e5a36a9fcfe06011871c047a6cda9a8d402a3fea84a68a7214315e9228db03d8f7277d29adca0139ccc7358897a4985d606a96c156432ce53cba1a51fd801
-  data.tar.gz: 9aaed956fd48e6b5c0d45c0ef91a440bd6c4f53def5bfa5390ea5bd2315686dc199e0c0c007e2c1d8c2992bf9c386d3991b7c6fd183577f4e00bda860c09cf36
+  metadata.gz: 8401be0d9a2a8c0e315c9b19964405dfe5bb515997546e6014bea370a96053d288d5597056839096cf1469b43094467680b206cb371133eefba48ef1fe6ca85b
+  data.tar.gz: 50d96fa7791a55aea522aaec18886fcfc330290bae169e41f4c754f04c60729f73f201d1d9172ff52a7978759a93c918b76b6f7d60db330d649b41a044b2ec0b

data/Documentation/dtas-splitfx.pod

@@ -26,7 +26,8 @@ to use L<ecasound(1)>, too.
 =item -j, --jobs [JOBS]
 
 Number of jobs to run in parallel.  If no number is specified, all
-jobs are run in parallel.
+jobs are run in parallel.  Default: number of CPUS (dtas 0.20.0+),
+previous versions of dtas defaulted to 1.
 
 =item -n, --dry-run
 
@@ -76,6 +77,16 @@ outputs the result as a single file with the TRACKNUMBER
 of "000".  For ease-of-typing, commas in this command-line
 argument are automatically expanded to spaces when passed to sox.
 
+This switch may not be combined with L</--filter>
+
+=item -f, --filter [FIELD=]VALUE
+
+Only process tracks matching a given comment FIELD and VALUE.
+If no C<=> is exists, then all comment fields are matched
+against the specified VALUE.
+
+This switch may not be combined with L</--trim>
+
 =item -p, --sox-pipe
 
 Used in place of an output target to specify outputting audio data in
@@ -90,9 +101,9 @@ moves printing of output to stderr and disables parallel job invocation.
 
 =item infile - string, the pathname of the original audio file
 
-=item env - ordered hash of environment variables to set for all commands
+=item env - hash of environment variables to set for all commands
 
-    env: !omap
+    env:
       FX: gain 3 stats
 
 =item comments - hash of common tags for all audio (e.g. ARTIST, ALBUM, YEAR)
@@ -121,7 +132,12 @@ highest-numbered track.  Default: true
 
 =item targets - hash, see "TARGETS" section
 
-=item command - used only by L<dtas-player(1)>
+=item command - override the default sox invocation
+
+This command may be used to specify an alternate command to process each
+track.
+
+Default: sox "$INFILE" $COMMENTS $OUTFMT $OUTDST $TRIMFX $FX $RATEFX $DITHERFX
 
 =back
 
@@ -133,11 +149,22 @@ segment.
 
 =over
 
-=item t TIME TITLE [fade_in/fade_out=FADE_ARGS]
+=item t TIME TITLE [fade_in/fade_out=FADE_ARGS] [.FIELD=VALUE] [env.X=Y]
+
+The start of a new track at TIME with TITLE.
+An optional L</fade_in> and L</fade_out> may be specified for any tracks.
+Per-track comments may be specified in the form of C<.FIELD=VALUE>.
+Using per-track C<.ARTIST=FOO> allows proper tagging of multi-artist
+compilations.
 
-The start of a new track
-at TIME with TITLE.  An optional fade_in and fade_out may be specified
-for the first/last tracks.
+Per-track environment variables may be specified in the form
+of C<env.K=V> where C<K> is the environment variable name and
+C<V> is its value.  Per-track environment variables do not affect
+playback of YAML files via L<dtas-player(1)> nor use of the L</--trim>
+command-line option.  However, per-track environment variables do affect
+any tracks written to the filesystem, including those using the L</--filter>
+switch.   These environment variables are intended to affect the specified
+L</command> or default L<sox(1)> invocation.
 
 =item skip TIME - skip a segment starting at TIME
 
@@ -268,7 +295,7 @@ imbalance in a live concert recording from the audience:
 
 =head1 COPYRIGHT
 
-Copyright 2013-2020 all contributors L<mailto:dtas-all@nongnu.org>
+Copyright all contributors L<mailto:dtas-all@nongnu.org>
 
 License: GPL-3.0+ L<https://www.gnu.org/licenses/gpl-3.0.txt>
 

data/Documentation/dtas-tl.pod

@@ -60,6 +60,8 @@ optionally seek to POS.  POS should be a timestamp in HH:MM:SS.FRAC format.
 
 =item prev - play the previous track in the tracklist
 
+=item prune - cull non-existent pathnames from the tracklist
+
 =item repeat 1 - repeat the current track
 
 =item repeat false - disable repeat
@@ -120,7 +122,7 @@ No subscription is necessary to post to the mailing list.
 
 =head1 COPYRIGHT
 
-Copyright 2013-2020 all contributors L<mailto:dtas-all@nongnu.org>
+Copyright all contributors L<mailto:dtas-all@nongnu.org>
 
 License: GPL-3.0+ L<https://www.gnu.org/licenses/gpl-3.0.txt>
 

data/GIT-VERSION-FILE

@@ -1 +1 @@
-VERSION = 0.18.1
+VERSION = 0.21.0

data/GIT-VERSION-GEN

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2013-2021 all contributors <dtas-all@nongnu.org>
+# Copyright (C) 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"
 RVF = "lib/dtas/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v0.18.0"
+DEF_VER = "v0.21.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-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>
 all::
 pkg = dtas
@@ -74,5 +74,17 @@ $(pkgtgz): .tgz-manifest
 
 package: $(pkgtgz) $(pkggem)
 
+# Install symlinks to ~/bin (which is hopefuly in PATH) which point to
+# this source tree.
+# prefix + bindir matches git.git Makefile:
+prefix = $(HOME)
+bindir = $(prefix)/bin
+symlink-install :
+	mkdir -p $(bindir)
+	dtas=$(CURDIR)/dtas.sh && cd $(bindir) && \
+	for x in $(CURDIR)/bin/*; do \
+		ln -sf "$$dtas" $$(basename "$$x"); \
+	done
+
 .PHONY: all .FORCE-GIT-VERSION-FILE test $(test_units) NEWS
 .PHONY: check-warnings fix-perms

data/INSTALL

@@ -1,7 +1,8 @@
-Uncommon for audio software, dtas is currently implemented in Ruby.
+Uncommon for audio software, dtas is currently implemented in Ruby
+(and some Perl5).
 
 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.
+However, Ruby 2.3 and later works, but older versions of Ruby do not.
 
 SoX is a dependency of dtas-player.  While not _strictly_ required,
 dtas-player uses SoX by default and you will need it unless you've
@@ -25,20 +26,20 @@ For future upgrades of dtas
 
     sudo gem install dtas
 
-# installing dtas via tarball and setup.rb
+# installing dtas via tarball
 
 Grab the latest tarball from our HTTPS site:
 
-    https://80x24.org/dtas/2021/dtas-0.18.1.tar.gz
+    https://80x24.org/dtas/2022/dtas-0.21.0.tar.gz
 
-    $ tar zxvf dtas-0.18.1.tar.gz
-    $ cd dtas-0.18.1
-    $ sudo ruby setup.rb
+    $ tar zxvf dtas-0.21.0.tar.gz
+    $ cd dtas-0.21.0
 
-GNU/Linux users may optionally install the "sleepy_penguin" RubyGem
-for a tiny speed improvement over the default "fiddle" RubyGem.
+    # To install symlinks into ~/bin (assuming your Ruby executable is "ruby")
+    $ make symlink-install
 
-    * sleepy_penguin - https://yhbt.net/sleepy_penguin/
+    # or using setup.rb:
+    $ sudo ruby setup.rb
 
 # CONTACT
 
@@ -50,5 +51,5 @@ No subscription is necessary to post to the mailing list.
 
 # COPYRIGHT
 
-Copyright 2013-2021 all contributors <dtas-all@nongnu.org>
+Copyright all contributors <dtas-all@nongnu.org>
 License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>

data/NEWS

@@ -1,3 +1,93 @@
+# 0.21.0 / 2022-09-06
+
+dtas 0.21.0
+
+
+There's two minor fixes for dtas-splitfx, and one for
+dtas-player users using the rate=bypass optimization.
+
+3 changes since v0.20.0 (2022-02-03):
+
+      splitfx: fix error reporting of failed tracks
+      splitfx: warn on improper encodings for titles
+      player: drain sinks completely before changing sink rate
+
+# 0.20.0 / 2022-02-03
+
+dtas 0.20.0 - ruby 3.1+ compatibility, splitfx improvements
+
+
+This release catches up with Psych (YAML) changes in Ruby 3.1+
+Ruby 2.3+ is now the minimum version, though keep in mind the
+ruby-core team already dropped support for it long ago.
+
+Most of the features are focused on audio engineering
+capabilities of dtas-splitfx.  dtas-splitfx gains the --filter
+switch, along with per-track environment variables and comments.
+These new features have made my workflow significantly better.
+
+dtas-archive supports explicit comments, and omits the default
+SoX comment.  To better cope with temporary and modified files
+during editing, dtas-player metadata now checks ctime before
+reusing the cache, handy for frequently-modified files.
+"dtas-tl prune" is now supported to cull temporary files from
+the player tracklist.
+
+There's a few dtas-console improvements, too.
+
+28 changes since v0.19.0 (2021-09-05):
+
+      archive: support comments, default to none
+      splitfx: use Etc.nprocessors for jobs if unspecified
+      dtas-console: set X11 terminal title iff DISPLAY is set
+      dtas-console: add 'i' toggle to show comments (metadata)
+      splitfx: fix track_zpad with integer arg
+      doc: drop ordered map from examples
+      player: reduce syscalls when splicing to single target
+      dtas-console: support Wayland terminal titles, too
+      console: workaround safe warnings in outdated `curses' gem
+      require Ruby 2.3+
+      get rid of DTAS.dedupe_str wrapper
+      move dtas-graph into script/, support Perl for dtas.sh
+      use YAML.unsafe_load in Psych 4.x (Ruby 3.1+)
+      deduplicate and freeze pathnames + metadata
+      player: remove omap conversion
+      dtas: drop unnecessary "require 'yaml'" statements
+      dtas-tl prune: cull missing files from tracklist
+      dtas-tl: drop encoding hacks, use binary stdout+stderr
+      use IO#wait_readable consistently
+      get rid of DTAS::Nonblock wrapper for Ruby <= 2.0
+      unix_accepted: drop Ruby < 2.3 support code
+      do not check IO#closed? before calling IO#close
+      splitfx: support per-track environment variables
+      splitfx: add --filter option to limit match to comments
+      player: expire sox metadata cache on file st_ctime changes
+      readahead: do not call -@ on non-String
+      splitfx: disallow combining --trim and --filter
+      splitfx: document changes ahead of 0.20.0 release
+
+# 0.19.0 / 2021-09-05
+
+dtas 0.19.0 - odd pathname fixes
+
+
+Non-UTF-8-encoded pathnames now handled properly by dtas-mlib.
+Shell-unfriendly filenames are handled properly if they require
+ffmpeg (they were always handled properly when using sox).
+
+Some minor URL and doc updates, too, and there's a new
+"make symlink-install" target for users who lack permissions
+to install RubyGems.
+
+6 changes since v0.18.1 (2021-02-13):
+
+      mlib: pathnames may be blobs
+      README: replace NNTP URL with NNTPS
+      gemspec: allow building gem without setting VERSION
+      build: add "symlink-install" target
+      do not shell-quote filenames for environment
+      doc: use Tor v3 .onion URLs
+
 # 0.18.1 / 2021-02-13
 
 dtas 0.18.1

data/README

@@ -81,18 +81,18 @@ 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://ou63pmih66umazou.onion/inbox.comp.audio.dtas>
+NNTP: <nntps://news.public-inbox.org/inbox.comp.audio.dtas>
+	<nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.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>
+	<imap://anon:mous@7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.audio.dtas.0>
 Atom: <https://80x24.org/dtas-all/new.atom>
-	<http://ou63pmih66umazou.onion/dtas-all/new.atom>
+	<http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/dtas-all/new.atom>
 (.onion URLs require Tor: <https://www.torproject.org/>)
 
 ## Copyright
 
-Copyright 2013-2020 all contributors <dtas-all@nongnu.org>
+Copyright all contributors <dtas-all@nongnu.org>
 License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 
 dtas is copyrighted Free Software by all contributors, see logs

data/bin/dtas-archive

@@ -29,6 +29,7 @@ repeat = 1
 stats = false
 keep_going = false
 compression = []
+comment = []
 
 OptionParser.new('', 24, '  ') do |op|
   op.banner = usage
@@ -36,6 +37,7 @@ OptionParser.new('', 24, '  ') do |op|
   op.on('-C', '--compression [FACTOR]', 'compression factor for sox') { |c|
     compression = [ '-C', c ]
   }
+  op.on('--comment=TEXT', String) { |c| comment.push('--comment', c) }
   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 }
@@ -53,6 +55,8 @@ OptionParser.new('', 24, '  ') do |op|
   op.parse!(ARGV)
 end
 
+comment.push('--comment', '') if comment.empty?
+
 dst = ARGV.pop
 src = ARGV.dup
 
@@ -137,7 +141,7 @@ thrs = jobs.times.map do |i|
 
       if dry_run || !silent
         names = job.map { |x| Shellwords.escape(x) }
-        cmd = [ 'sox', *names ]
+        cmd = [ 'sox', names[0], *compression, *comment, names[1] ]
         if stats
           cmd << 'stats'
           cmd << "2>#{Shellwords.escape(stats_out)}"
@@ -151,7 +155,7 @@ thrs = jobs.times.map do |i|
         end
       end
 
-      cmd = [ 'sox', input, *compression, output ]
+      cmd = [ 'sox', input, *compression, *comment, output ]
       if stats
         cmd << 'stats'
         cmd = [ *cmd, { err: stats_out } ]

data/bin/dtas-console

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2013-2021 all contributors <dtas-all@nongnu.org>
+# Copyright (C) all contributors <dtas-all@nongnu.org>
 # License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 #
@@ -11,21 +11,24 @@ require 'dtas/sigevent'
 require 'dtas/process'
 require 'dtas/format'
 include DTAS::Process
-require 'yaml'
 begin
   require 'curses'
 rescue LoadError
   abort "please install the 'curses' RubyGem to use #$0"
 end
 
+# workaround https://bugs.debian.org/958973
+$VERBOSE = nil if RUBY_VERSION.to_f < 3.0
+
 tsec = false
 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'))
+cur = DTAS.yaml_load(c.req('current'))
 readable = [ se, w, $stdin ]
+set_title = (ENV['DISPLAY'] || ENV['WAYLAND_DISPLAY']) ? $stdout : nil
 
 # current rg mode
 rg_mode = DTAS::RGState::RG_MODE.keys.unshift("off")
@@ -34,6 +37,7 @@ if (rg = cur["rg"]) && (rg = rg["mode"])
 else
   rg_mode_i = 0
 end
+show_info = false
 
 def update_tfmt(prec, tsec)
   if tsec
@@ -167,6 +171,10 @@ begin
       # and risk mojibake...
       infile.encode(enc_locale,
                     undef: :replace, invalid: :replace, replace: '?')
+      if set_title
+        dir, base = File.split(infile)
+        set_title.syswrite("\033]0;#{base} dtas-console\07")
+      end
       Curses.setpos(lineno += 1, 0)
       Curses.clrtoeol
       Curses.addstr(infile)
@@ -203,6 +211,27 @@ begin
     Curses.addstr(extra.join(' '))
     pre_mute_vol = cur_vol if cur_vol != 0
 
+    if show_info && current && comments = current['comments']
+      Curses.setpos(lineno += 1, 0)
+      Curses.clrtoeol
+      Curses.addstr('comments:')
+      comments.each do |k,v|
+        v = v.split(/\n+/)
+        k = k.dump if /[[:cntrl:]]/ =~ k
+        if first = v.shift
+          Curses.setpos(lineno += 1, 0)
+          Curses.clrtoeol
+          first = first.dump if /[[:cntrl:]]/ =~ first
+          Curses.addstr("  #{k}: #{first}")
+          v.each do |val|
+            val = val.dump if /[[:cntrl:]]/ =~ val
+            Curses.setpos(lineno += 1, 0)
+            Curses.clrtoeol
+            Curses.addstr("   #{val}")
+          end
+        end
+      end
+    end
     show_events(lineno, screen, events)
 
     Curses.refresh # draw and wait
@@ -224,7 +253,7 @@ begin
         events << "#{Time.now.strftime(tfmt)} #{event}"
         # something happened, refresh current
         # we could be more intelligent here, maybe, but too much work.
-        cur = YAML.load(c.req('current'))
+        cur = DTAS.yaml_load(c.req('current'))
       when $stdin
         # keybindings taken from mplayer / vi
         case key = Curses.getch
@@ -272,6 +301,9 @@ begin
             interval = 1.0 / 10 ** prec_nr
           end
         when 27 # TODO readline/edit mode?
+        when 'i'
+          show_info = !show_info
+          Curses.clear if !show_info
         else
           Curses.setpos(screen.maxy - 1, 0)
           Curses.clrtoeol

data/bin/dtas-msinkctl

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2013-2020 all contributors <dtas-all@nongnu.org>
+# Copyright (C) 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"
 c = DTAS::UNIXClient.new
@@ -29,7 +28,7 @@ def filter(c, player_sinks, key)
   rv = []
   player_sinks.each do |name|
     buf = c.req("sink cat #{name}")
-    sink = YAML.load(buf)
+    sink = DTAS.yaml_load(buf)
     rv << sink["name"] if sink[key]
   end
   rv

data/bin/dtas-partstats

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2013-2020 all contributors <dtas-all@nongnu.org>
+# Copyright (C) all contributors <dtas-all@nongnu.org>
 # License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 # TODO
@@ -8,17 +8,11 @@
 # - configurable output formatting
 # - Sequel/SQLite support
 require 'dtas/partstats'
+require 'etc'
 infile = ARGV[0] or abort "usage: #$0 INFILE"
 ps = DTAS::PartStats.new(infile)
 
-def nproc
-  require 'etc'
-  Etc.nprocessors
-rescue NoMethodError
-  `nproc 2>/dev/null || echo 2`.to_i
-end
-
-opts = { jobs: nproc }
+opts = { jobs: Etc.nprocessors }
 stats = ps.run(opts)
 
 headers = ps.key_idx.to_a

data/bin/dtas-player

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2013-2020 all contributors <dtas-all@nongnu.org>
+# Copyright (C) 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'
 sock = (ENV["DTAS_PLAYER_SOCK"] || File.expand_path("~/.dtas/player.sock"))
 state = (ENV["DTAS_PLAYER_STATE"] ||

data/bin/dtas-readahead

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2015-2020 all contributors <dtas-all@nongnu.org>
+# Copyright (C) all contributors <dtas-all@nongnu.org>
 # License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 #
@@ -12,13 +12,11 @@ end
 @ffprobe = 'ffprobe'
 @avprobe = 'avprobe'
 
-require 'yaml'
 require 'io/wait'
 require 'dtas/unix_client'
 require 'dtas/process'
 
 include DTAS::Process
-include DTAS::SpawnFix
 trap(:CHLD) { DTAS::Process.reaper {} }
 trap(:INT) { exit(0) }
 trap(:TERM) { exit(0) }
@@ -30,18 +28,6 @@ null = DTAS.null
 @redir = { err: null, out: null, in: null }.freeze
 require 'pp'
 
-if RUBY_VERSION.to_r >= '2.3'.to_r
-  # Old Rubies did FIONREAD, which breaks on SOCK_SEQPACKET
-  def wait_read(w, timeout)
-    w.to_io.wait_readable(timeout)
-  end
-else
-  def wait_read(w, timeout)
-    r = IO.select([w], nil, nil, timeout)
-    r ? r[0] : nil
-  end
-end
-
 def seek_to_cur_pos(cur_pid, fp)
   cur_fd = []
   fpst = fp.stat
@@ -122,7 +108,7 @@ def do_ra(fp, pos, w)
     len -= n
 
     # stop reading immediately if there's an event
-    if wait_read(w, 0)
+    if w.to_io.wait_readable(0)
       adj = @todo_ra
       pos += size
       break
@@ -141,8 +127,8 @@ def do_open(path)
       when "---\n"
         buf << fp.read(fp.size - 4)
         Dir.chdir(File.dirname(path)) do
-          yml = YAML.load(buf)
-          x = yml['infile'] and return File.open(File.expand_path(x).freeze)
+          yml = DTAS.yaml_load(buf)
+          x = yml['infile'] and return File.open(-File.expand_path(x))
         end
       end
     end
@@ -156,12 +142,12 @@ begin
   @todo_ra = @max_ra
   t0 = DTAS.now
   fp = nil
-  cur = YAML.load(c.req('current'))
+  cur = DTAS.yaml_load(c.req('current'))
   while @todo_ra > 0 && fp.nil?
     if current = cur['current']
       track = current['infile']
       break unless track.kind_of?(String)
-      track.freeze
+      track = -track
       fp = work[track] ||= do_open(track)
       cur_pid = current['pid']
       if fp
@@ -178,7 +164,7 @@ begin
     end
 
     # queue has priority, work on it, first
-    queue = YAML.load(c.req('queue cat'))
+    queue = DTAS.yaml_load(c.req('queue cat'))
     while @todo_ra > 0 && track = queue.shift
       next unless track.kind_of?(String)
       fp = nil
@@ -198,7 +184,7 @@ begin
     repeat = c.req('tl repeat').split[-1]
     while @todo_ra > 0 && idx && (cid = ids[idx])
       fp = nil
-      track = c.req("tl get #{cid}").sub!(/\A1 \d+=/, '').freeze
+      track = -(c.req("tl get #{cid}").sub!(/\A1 \d+=/, ''))
       begin
         fp = work[track] ||= do_open(track)
       rescue SystemCallError
@@ -210,7 +196,7 @@ begin
       end
     end
     idx or break
-    cur = YAML.load(c.req('current'))
+    cur = DTAS.yaml_load(c.req('current'))
     current = cur['current'] or break
   end
   if current
@@ -220,10 +206,10 @@ begin
     timeout = 0 if timeout < 0
   else
     work.each_value(&:close).clear
-    fp.close if fp && !fp.closed?
+    fp.close if fp
     fp = timeout = nil
   end
-  r = wait_read(w, timeout)
+  r = w.to_io.wait_readable(timeout)
   p w.res_wait if r
 rescue EOFError
   abort "dtas-player exited"

data/bin/dtas-sinkedit

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2013-2020 all contributors <dtas-all@nongnu.org>
+# Copyright (C) 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'
@@ -36,10 +36,10 @@ st_in = $stdin.stat
 
 buf = c.req(%W(sink cat #{name}))
 abort(buf) if buf =~ /\AERR/
-orig = YAML.load(buf)
+orig = DTAS.yaml_load(buf)
 
 commit_update = lambda do |buf|
-  sink = YAML.load(buf)
+  sink = DTAS.yaml_load(buf)
   cmd = %W(sink ed #{name})
   update_cmd_env(cmd, orig, sink)
 
@@ -68,7 +68,6 @@ if st_in.file? || st_in.pipe?
   buf = $stdin.read
   commit_update.call(buf)
 else
-  include DTAS::SpawnFix
   tmp = tmpyaml
   tmp_path = tmp.path
   do_update = lambda { commit_update.call(File.read(tmp_path)) }