dtas 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecfd08e9b59d26d7762e9e40709ce4e7a40ed629
-  data.tar.gz: 6188c723ac2d87daf5e3ef9bdc0f040d8a73ff71
+  metadata.gz: 22d6c76202aedaacaf6ed0beb48a801f4d7f5e45
+  data.tar.gz: f7f54c79b652b9539f8b639c42ffb89bf041b161
 SHA512:
-  metadata.gz: 7756d98e964479361d04d346c3e601196578c9d79967847dddcdb78e109b13237a8ab1832e13f4166adef5ae72745c90ff13927d89a94868e8c4682512282c6a
-  data.tar.gz: 2450045f4fa44b4897abda0486ee2d0138f1d6b492d6309b3578877870973dfbdcb4e235163aac7bac376e55b1e72c63d6c4b2067fb678ee2029ac960c6e6a5b
+  metadata.gz: c47a803a3f398c8ceaddfe17f50ff5a23028688effca8baa3d3c0ecaf71d842b8905a91a25b4a8fb2908af00f32bf908f4850011a0bb529e8e218ccbdfcf36f8
+  data.tar.gz: 9fe65caf3eb58e7faefda98952d2ba44f97b10c45f5d6cc5d7a86780d105e4c5b22fc0f04fb55ff4d6ceaa03e77361caca6776e3bf8dd6235701883b52df50b8

data/GIT-VERSION-GEN

@@ -5,7 +5,7 @@
 CONSTANT = "DTAS::VERSION"
 RVF = "lib/dtas/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v0.13.0"
+DEF_VER = "v0.13.1"
 vn = DEF_VER
 
 # First see if there is a version file (included in release tarballs),

data/INSTALL

@@ -39,10 +39,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/2016/dtas-0.13.0.tar.gz
+    http://dtas.80x24.org/2016/dtas-0.13.1.tar.gz
 
-    $ tar zxvf dtas-0.13.0.tar.gz
-    $ cd dtas-0.13.0
+    $ tar zxvf dtas-0.13.1.tar.gz
+    $ cd dtas-0.13.1
     $ sudo ruby setup.rb
 
 GNU/Linux users may optionally install "io_splice" and

data/bin/dtas-mlib

@@ -46,7 +46,7 @@ def mlib(db, migrate = false)
 when 'dump' # mainly for debugging
   directory = ARGV.shift || '/'
   mlib(db).dump(directory, {}, lambda do |parent, node, comments|
-    puts "Path: #{parent[:dirname]}/#{node[:name]}"
+    puts "Path: #{parent[:dirname]}#{node[:name]}"
     puts "Length: #{node[:tlen]}"
     return if comments.empty?
     puts 'Comments:'

data/bin/dtas-tl

@@ -2,6 +2,7 @@
 # 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
+# encoding: binary
 # WARNING: totally unstable API, use dtas-ctl for scripting (but the protocol
 # itself is also unstable, but better than this one probably).
 require 'dtas/unix_client'
@@ -15,6 +16,11 @@ def get_track_ids(c)
   track_ids
 end
 
+def fix_enc!(str, enc)
+  str.force_encoding(enc)
+  str.force_encoding(Encoding::ASCII_8BIT) unless str.valid_encoding?
+end
+
 def do_edit(c)
   require 'dtas/edit_client'
   require 'yaml'
@@ -25,12 +31,14 @@ def do_edit(c)
   tmp_path = tmp.path
   orig = []
   orig_idx = {}
+  enc = Encoding.default_external
 
   get_track_ids(c).each_slice(128) do |track_ids|
     res = c.req("tl get #{track_ids.join(' ')}")
     res = Shellwords.split(res.sub!(/\A\d+ /, ''))
     while line = res.shift
-      line.sub!(/\A(\d+)=/, '') or abort "unexpected line=#{line.inspect}\n"
+      line.sub!(/\A(\d+)=/n, '') or abort "unexpected line=#{line.inspect}\n"
+      fix_enc!(line, enc)
       track_id = $1.to_i
       orig_idx[track_id] = orig.size
       orig << track_id
@@ -58,18 +66,19 @@ def do_edit(c)
   add = []
   # editor may rename/link a new file into place
   File.open(tmp_path) do |fp|
+    fp.binmode
     while line = fp.gets
       line.chomp!
-      if line.sub!(/ =(\d+)\z/, '') # existing tracks
+      if line.sub!(/ =(\d+)\z/n, '') # existing tracks
         track_id = $1.to_i
         if edit_idx[track_id] # somebody copy+pasted an existing line
-          add << [ File.expand_path(line), edit.last ]
+          add << [ line, edit.last ]
         else # moved line
           edit_idx[track_id] = edit.size
           edit << track_id
         end
       else # entirely new line
-        add << [ File.expand_path(line), edit.last ]
+        add << [ line, edit.last ]
       end
     end
   end
@@ -88,12 +97,31 @@ def do_edit(c)
   end
 
   prev_added_id = last_after_id = nil
+  non_existent = []
   add.each do |path, after_id|
-    cmd = %W(tl add #{path})
-    id = after_id == last_after_id ? prev_added_id : after_id
-    cmd << id.to_s if id
-    prev_added_id = c.req(cmd).to_i
-    last_after_id = after_id
+    orig = path
+    path = Shellwords.split(path)[0]
+    path = File.expand_path(path)
+    unless File.exist?(path)
+      path = orig.dup
+      fix_enc!(path, enc)
+      path = Shellwords.split(path)[0]
+      path = File.expand_path(path)
+    end
+
+    if File.exist?(path)
+      cmd = %W(tl add #{path})
+      id = after_id == last_after_id ? prev_added_id : after_id
+      cmd << id.to_s if id
+      prev_added_id = c.req(cmd).to_i
+      last_after_id = after_id
+    else
+      non_existent << orig
+    end
+  end
+  if non_existent[0]
+    $stderr.puts "Failed to add #{non_existent.size} paths"
+    non_existent.each { |path| $stderr.puts path }
   end
 ensure
   tmp.close! if tmp
@@ -113,10 +141,15 @@ def add_after(c, argv, last_id)
 c = DTAS::UNIXClient.new
 case cmd = ARGV[0]
 when "cat"
-  get_track_ids(c).each do |track_id|
-    res = c.req("tl get #{track_id}")
-    res.sub!(/\A1 /, '')
-    print "#{res}\n"
+  enc = Encoding.default_external
+  get_track_ids(c).each_slice(128) do |track_ids|
+    res = c.req("tl get #{track_ids.join(' ')}")
+    res = Shellwords.split(res.sub!(/\A\d+ /, ''))
+    while line = res.shift
+      line.sub!(/\A(\d+)=/n, '') or abort "unexpected line=#{line.inspect}\n"
+      fix_enc!(line, enc)
+      print "#{line}\n"
+    end
   end
 when 'aac' # add-after-current
   ARGV.shift

data/lib/dtas/mlib.rb

@@ -430,15 +430,25 @@ def remove_entry(node)
     node_id = node[:id]
     q = { parent_id: node_id }
     nodes = @db[:nodes]
+    comments = @db[:comments]
+
+    # remove children, step 1
     nodes.where(q).each do |nd|
-      next if nd[:id] == root_id
+      nd_id = nd[:id]
+      next if nd_id == root_id
       case nd[:tlen]
       when DM_DIR, DM_IGN
         remove_entry(nd)
+      else
+        comments.where(node_id: nd_id).delete
       end
     end
+
+    # remove children, step 2
     nodes.where(q).delete
-    @db[:comments].where(node_id: node_id).delete
+
+    # finally remove ourselves
+    comments.where(node_id: node_id).delete
     nodes.where(id: node_id).delete
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtas
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - dtas hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Free Software command-line tools for audio playback, mastering, and