dtas 0.12.1 → 0.13.0

data/bin/dtas-tl

@@ -1,7 +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
 # 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'
@@ -10,7 +10,7 @@
 def get_track_ids(c)
   track_ids = c.req("tl tracks")
   # we could get more, but SEQPACKET limits size...
-  track_ids = track_ids.split(/ /)
+  track_ids = track_ids.split(' ')
   track_ids.shift
   track_ids
 end
@@ -86,15 +86,30 @@ def do_edit(c)
   orig.each do |track_id|
     edit_idx[track_id] or c.req("tl remove #{track_id}")
   end
-  add.reverse_each do |path, after_id|
+
+  prev_added_id = last_after_id = nil
+  add.each do |path, after_id|
     cmd = %W(tl add #{path})
-    cmd << after_id.to_s if after_id
-    c.req(cmd)
+    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
   end
 ensure
   tmp.close! if tmp
 end
 
+def add_after(c, argv, last_id)
+  argv.each do |path|
+    path = File.expand_path(path)
+    req = %W(tl add #{path})
+    req << last_id.to_s if last_id
+    res = c.req(req)
+    print "#{path} #{res}\n"
+    last_id = res if res =~ /\A\d+\z/
+  end
+end
+
 c = DTAS::UNIXClient.new
 case cmd = ARGV[0]
 when "cat"
@@ -103,9 +118,14 @@ def do_edit(c)
     res.sub!(/\A1 /, '')
     print "#{res}\n"
   end
+when 'aac' # add-after-current
+  ARGV.shift
+  rv = c.req(%w(tl current-id))
+  last_id = rv =~ %r{\A\d+\z} ? rv.to_i : nil
+  add_after(c, ARGV, last_id)
 when "addhead"
   ARGV.shift
-  ARGV.reverse.each do |path|
+  ARGV.reverse_each do |path|
     path = File.expand_path(path)
     res = c.req(%W(tl add #{path}))
     print "#{path} #{res}\n"
@@ -114,14 +134,7 @@ def do_edit(c)
   ARGV.shift
   track_ids = get_track_ids(c)
   last_id = track_ids.pop
-  ARGV.each do |path|
-    path = File.expand_path(path)
-    req = %W(tl add #{path})
-    req << last_id.to_s if last_id
-    res = c.req(req)
-    print "#{path} #{res}\n"
-    last_id = res if res =~ /\A\d+\z/
-  end
+  add_after(c, ARGV, last_id)
 when "reto"
   fixed = ARGV.delete("-F")
   ignorecase = ARGV.delete("-i")

data/bin/dtas-xdelay

@@ -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
 USAGE = "Usage: #$0 [-x FREQ] [-l] /dev/fd/LO /dev/fd/HI DELAY [DELAY ...]"
 require 'optparse'
 dryrun = false

data/dtas-linux.gemspec

@@ -1,5 +1,5 @@
-# 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)
 #
 # this just declares dependencies to make gem installation a little easier
 # for Linux users
@@ -16,5 +16,5 @@
   s.add_dependency(%q<dtas>)
   s.add_dependency(%q<io_splice>, '~> 4')
   s.add_dependency(%q<sleepy_penguin>, '~> 3')
-  s.licenses = "GPLv3+"
+  s.licenses = 'GPL-3.0+'
 end

data/dtas-mpris.gemspec

@@ -1,6 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# 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)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-2.0+ or later <http://www.gnu.org/licenses/gpl-2.0.txt>
+# This is GPL-2.0+ instead of GPL-3.0+ because ruby-dbus is LGPL-2.1 (only)
 Gem::Specification.new do |s|
   s.name = %q{dtas-mpris}
   s.version = '0.0.0'
@@ -14,5 +14,5 @@
   s.homepage = 'http://dtas.80x24.org/'
   s.add_dependency(%q<dtas>)
   s.add_dependency(%q<ruby-dbus>)
-  s.licenses = "GPLv2+"
+  s.licenses = 'GPL-2.0+'
 end

data/dtas.gemspec

@@ -1,5 +1,5 @@
-# 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)
 Gem::Specification.new do |s|
   manifest = File.read('.gem-manifest').split(/\n/)
   s.name = %q{dtas}
@@ -12,4 +12,5 @@
   s.files = manifest
   s.homepage = 'http://dtas.80x24.org/'
   s.licenses = "GPL-3.0+"
+  s.required_ruby_version = '>= 1.9.3'
 end

data/lib/dtas.rb

@@ -1,23 +1,30 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
-module DTAS # :nodoc:
+# 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
+
+# DTAS currently exposes no public API for Ruby programmers.
+# See http://dtas.80x24.org/ for more info.
+module DTAS
+
   # try to use the monotonic clock in Ruby >= 2.1, it is immune to clock
   # offset adjustments and generates less garbage (Float vs Time object)
+  # :stopdoc:
   begin
     ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-    def self.now
+    def self.now # :nodoc:
       ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
     end
   rescue NameError, NoMethodError
-    def self.now # Ruby <= 2.0
-      Time.now.to_f
+    def self.now # :nodoc:
+      Time.now.to_f # Ruby <= 2.0
     end
   end
 
   @null = nil
-  def self.null
+  def self.null # :nodoc:
     @null ||= File.open('/dev/null', 'r+')
   end
+  # :startdoc:
 end
 
 require_relative 'dtas/compat_onenine'

data/lib/dtas/buffer.rb

@@ -1,5 +1,6 @@
-# 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 'io/wait'
 require_relative '../dtas'
 

data/lib/dtas/buffer/read_write.rb

@@ -1,5 +1,6 @@
-# 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 'io/nonblock'
 require_relative '../../dtas'
 require_relative '../pipe'
@@ -12,7 +13,7 @@ module DTAS::Buffer::ReadWrite # :nodoc:
   attr_accessor :buffer_size
 
   def _rbuf
-    Thread.current[:dtas_pbuf] ||= ""
+    Thread.current[:dtas_pbuf] ||= ''.b
   end
 
   # be sure to only call this with nil when all writers to @wr are done

data/lib/dtas/buffer/splice.rb

@@ -1,5 +1,6 @@
-# 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 'io/nonblock'
 require 'io/splice'
 require_relative '../../dtas'

data/lib/dtas/command.rb

@@ -1,5 +1,6 @@
-# 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_relative 'serialize'
 require 'shellwords'
 

data/lib/dtas/compat_onenine.rb

@@ -1,5 +1,5 @@
-# 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)
 
 # Make Ruby 1.9.3 look like Ruby 2.0.0 to us
 # This exists for Debian wheezy users using the stock Ruby 1.9.3 install.

data/lib/dtas/cue_index.rb

@@ -1,9 +1,10 @@
-# 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_relative '../dtas'
 
 # embedded CUE sheet representation for -player
-class DTAS::CueIndex
+class DTAS::CueIndex # :nodoc:
   attr_reader :offset
   attr_reader :index
 

data/lib/dtas/disclaimer.rb

@@ -1,6 +1,7 @@
 # :enddoc:
-# 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
 DTAS_PROGNAME = File.basename($0)
 DTAS_DISCLAIMER = <<EOF
 # WARNING!

data/lib/dtas/edit_client.rb

@@ -1,5 +1,6 @@
-# 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 'yaml'
 require_relative 'unix_client'
@@ -13,7 +14,7 @@ def editor
       v.empty? and next
       return v
     end
-    "vi"
+    'vi'.freeze
   end
 
   def client_socket

data/lib/dtas/fadefx.rb

@@ -1,5 +1,6 @@
-# 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_relative '../dtas'
 require_relative 'parse_time'
 require_relative 'xs'
@@ -94,7 +95,7 @@ def fade_in_next_fx(format, tbeg, tlen)
   def parse!(str)
     return nil if str.empty?
     type = "t"
-    str.sub!(/\A([a-z])/, "") and type = $1
+    str.sub!(/\A([a-z])/, "") and type = $1.freeze
     F.new(type, parse_time(str))
   end
 end

data/lib/dtas/format.rb

@@ -1,5 +1,6 @@
-# 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_relative '../dtas'
 require_relative 'process'
 require_relative 'serialize'
@@ -86,16 +87,6 @@ def endian2
     end
   end
 
-  # returns 1 or 0 depending on endianess
-  def endian_opusenc
-    case e = @endian || NATIVE_ENDIAN
-    when "big" then "1"
-    when "little" then "0"
-    else
-      raise"unsupported endian=#{e}"
-    end
-  end
-
   def to_eca_arg
     %W(-f #{@type}_#{endian2},#@channels,#@rate)
   end
@@ -137,7 +128,6 @@ def to_env
       "SOXFMT" => to_sox_arg.join(' '),
       "ECAFMT" => to_eca_arg.join(' '),
       "ENDIAN2" => endian2,
-      "ENDIAN_OPUSENC" => endian_opusenc,
     }
     begin # don't set these if we can't get them, SOX_FILETYPE may be enough
       rv["BITS_PER_SAMPLE"] = bits_per_sample.to_s

data/lib/dtas/mlib.rb

@@ -1,13 +1,14 @@
 # -*- encoding: utf-8 -*-
-# 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
+#
 require_relative '../dtas'
 require_relative 'process'
 require 'socket'
 
 # For the DTAS Music Library, based on what MPD uses.
-class DTAS::Mlib
+class DTAS::Mlib # :nodoc:
   attr_accessor :follow_outside_symlinks
   attr_accessor :follow_inside_symlinks
   attr_accessor :tags
@@ -40,6 +41,8 @@ def initialize(db)
       db.transaction_mode = :immediate
       db.synchronous = :off
       db.case_sensitive_like = false
+    else
+      warn 'non-SQLite databases may not work in the future'
     end
     @db = db
     @pwd = nil
@@ -97,9 +100,9 @@ def worker_work(job)
     return ignore(job) unless String === buf
 
     # no, we don't support comments with newlines in them
-    buf = buf.split("\n".freeze)
+    buf = buf.split("\n")
     while line = buf.shift
-      tag, value = line.split('='.freeze, 2)
+      tag, value = line.split('=', 2)
       tag && value or next
       tag.downcase!
       tag_id = @tag_map[tag] or next
@@ -213,7 +216,12 @@ def root_node
       parent_id: 1, # self
       name: '',
     }
-    node = @db[:nodes][q] and return (@root_node = node)
+    node = @db[:nodes][q]
+    if node
+      node[:dirname] = ''
+      @root_node = node
+      return node
+    end
     begin
       q[:tlen] = DM_DIR
       q[:id] = @db[:nodes].insert(q)
@@ -378,10 +386,10 @@ def stats
 
   def path_of(node, cache)
     base = node[:name]
-    return '/' if base == ''
+    return '/' if base == '' # root_node
     parent_id = node[:parent_id]
     base += '/' unless node[:tlen] >= 0
-    ppath = cache[parent_id] and return "#{ppath}#{base}"
+    ppath = cache[parent_id] and return "#{ppath}/#{base}"
     parts = []
     begin
       node = @db[:nodes][id: node[:parent_id]]
@@ -389,8 +397,9 @@ def path_of(node, cache)
       parts.unshift node[:name]
     end while true
     parts.unshift('')
-    parts << base
     cache[parent_id] = parts.join('/')
+    parts << base
+    parts.join('/').freeze
   end
 
   def emit_recurse(node, cache, cb)

data/lib/dtas/mlib/migrations/0001_initial.rb

@@ -1,5 +1,5 @@
-# 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)
 
 Sequel.migration do
   up do

data/lib/dtas/nonblock.rb

@@ -1,7 +1,7 @@
-# Copyright (C) 2015 all contributors <dtas-all@nongnu.org>
+# Copyright (C) 2015-2016 all contributors <dtas-all@nongnu.org>
 # License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 
-class DTAS::Nonblock < IO
+class DTAS::Nonblock < IO # :nodoc:
   if RUBY_VERSION.to_f <= 2.0
     EX = {}.freeze
     def read_nonblock(len, buf = nil, opts = EX)

data/lib/dtas/parse_freq.rb

@@ -1,8 +1,8 @@
-# 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
 require_relative '../dtas'
-module DTAS::ParseFreq
+module DTAS::ParseFreq # :nodoc:
 
   # may return a negative frequency meaning lowpass
   def parse_freq(val, round = true)