diff options
author | Eric Wong <e@80x24.org> | 2015-04-13 00:59:02 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2015-04-13 00:59:02 +0000 |
commit | 7681d9416cae1236e31cdada571ec163b3d02d9b (patch) | |
tree | 8317f6ebe52cce5f9399bab9de82c8a789c5cb27 | |
parent | c4ffed8a441fb0f16f0d206218b3580ae4460797 (diff) | |
download | dtas-7681d9416cae1236e31cdada571ec163b3d02d9b.tar.gz |
We already convert xs arg to be an Array, so avoid bloating our code with redundancy.
-rwxr-xr-x | bin/dtas-cueedit | 4 | ||||
-rw-r--r-- | lib/dtas/player.rb | 2 | ||||
-rw-r--r-- | lib/dtas/player/client_handler.rb | 2 | ||||
-rw-r--r-- | lib/dtas/process.rb | 2 | ||||
-rw-r--r-- | 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 |