everything related to duct tape audio suite (dtas)
 help / color / mirror / code / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [PATCH 3/3] cleanup: avoid redundant Array conversion for escapes
  2015-04-13  1:04  7% [PATCH 0/3] filename escaping fixups Eric Wong
@ 2015-04-13  1:04  6% ` Eric Wong
  0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2015-04-13  1:04 UTC (permalink / raw)
  To: dtas-all

We already convert xs arg to be an Array, so avoid bloating
our code with redundancy.
---
 bin/dtas-cueedit                  | 4 ++--
 lib/dtas/player.rb                | 2 +-
 lib/dtas/player/client_handler.rb | 2 +-
 lib/dtas/process.rb               | 2 +-
 lib/dtas/splitfx.rb               | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/dtas-cueedit b/bin/dtas-cueedit
index a2056d3..603bf28 100755
--- a/bin/dtas-cueedit
+++ b/bin/dtas-cueedit
@@ -49,7 +49,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 #{xs(Array(file))} unchanged" if $DEBUG
+      $stderr.puts "tags for #{xs(file)} unchanged" if $DEBUG
       next
     end
 
@@ -65,7 +65,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, #{xs(Array(file))} unchanged"
+      warn "E: backup cuesheet restored, #{xs(file)} unchanged"
       exit(false)
     end
   ensure
diff --git a/lib/dtas/player.rb b/lib/dtas/player.rb
index ea04dca..cdf1265 100644
--- a/lib/dtas/player.rb
+++ b/lib/dtas/player.rb
@@ -60,7 +60,7 @@ class DTAS::Player # :nodoc:
   end
 
   def wall(msg)
-    __wall(xs(Array(msg)))
+    __wall(xs(msg))
   end
 
   def __wall(msg)
diff --git a/lib/dtas/player/client_handler.rb b/lib/dtas/player/client_handler.rb
index a867265..b04872b 100644
--- a/lib/dtas/player/client_handler.rb
+++ b/lib/dtas/player/client_handler.rb
@@ -535,7 +535,7 @@ module DTAS::Player::ClientHandler # :nodoc:
       begin
         sf.dump(self)
       rescue => e
-        return io.emit("ERR dumping to #{xs(Array(dest))} #{e.message}")
+        return io.emit("ERR dumping to #{xs(dest)} #{e.message}")
       end
     end
     io.emit("OK")
diff --git a/lib/dtas/process.rb b/lib/dtas/process.rb
index ab4b2d5..5be107f 100644
--- a/lib/dtas/process.rb
+++ b/lib/dtas/process.rb
@@ -99,6 +99,6 @@ module DTAS::Process # :nodoc:
     _, status = Process.waitpid2(pid)
     return res if status.success?
     return status if no_raise
-    raise RuntimeError, "`#{xs(Array(cmd))}' failed: #{status.inspect}"
+    raise RuntimeError, "`#{xs(cmd)}' failed: #{status.inspect}"
   end
 end
diff --git a/lib/dtas/splitfx.rb b/lib/dtas/splitfx.rb
index fcd0028..6271fb0 100644
--- a/lib/dtas/splitfx.rb
+++ b/lib/dtas/splitfx.rb
@@ -298,7 +298,7 @@ class DTAS::SplitFX # :nodoc:
       samples = @t2s.call(stop_time)
       prev = @tracks.last and prev.commit(samples)
     else
-      raise ArgumentError, "unknown command: #{xs(Array(cmd))}"
+      raise ArgumentError, "unknown command: #{xs(cmd)}"
     end
   end
 
-- 
EW



^ permalink raw reply related	[relevance 6%]

* [PATCH 0/3] filename escaping fixups
@ 2015-04-13  1:04  7% Eric Wong
  2015-04-13  1:04  6% ` [PATCH 3/3] cleanup: avoid redundant Array conversion for escapes Eric Wong
  0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2015-04-13  1:04 UTC (permalink / raw)
  To: dtas-all

There was a problem found while attempting to play a file with the '`'
(backtick) character in it, 2/3 is a critical fix.  1/3 is a minor
preparation cleanup and 3/3 was a following cleanup for existing call
sites.

New release coming in a day or so since this is a user-visible bug
(and we might as well release with some of our new features anyways,
since I might not have time to work on more fadefx processing for
another 2-3 weeks).

[PATCH 1/3] xs: allow taking a string as input
[PATCH 2/3] escape INFILE and related environment variables
[PATCH 3/3] cleanup: avoid redundant Array conversion for escapes

 bin/dtas-cueedit                  | 4 ++--
 lib/dtas/partstats.rb             | 2 +-
 lib/dtas/player.rb                | 2 +-
 lib/dtas/player/client_handler.rb | 2 +-
 lib/dtas/process.rb               | 2 +-
 lib/dtas/source/av_ff_common.rb   | 2 +-
 lib/dtas/source/sox.rb            | 2 +-
 lib/dtas/splitfx.rb               | 8 +++++---
 lib/dtas/xs.rb                    | 2 +-
 9 files changed, 14 insertions(+), 12 deletions(-)


^ permalink raw reply	[relevance 7%]

Results 1-2 of 2 | reverse | sort options + mbox downloads above
-- links below jump to the message on this page --
2015-04-13  1:04  7% [PATCH 0/3] filename escaping fixups Eric Wong
2015-04-13  1:04  6% ` [PATCH 3/3] cleanup: avoid redundant Array conversion for escapes Eric Wong

Code repositories for project(s) associated with this public inbox

	https://80x24.org/dtas.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).