lib/audioinfo.rb in ruby-audioinfo-0.1 vs lib/audioinfo.rb in ruby-audioinfo-0.1.1
- old
+ new
@@ -1,20 +1,20 @@
#!/usr/bin/env ruby
require "iconv"
require "stringio"
-require "shell_escape"
$: << File.dirname(__FILE__)+"/audioinfo"
require "mp3info"
require "ogginfo"
require "mpcinfo"
require "apetag"
require "wmainfo"
require "mp4info"
require "flacinfo"
+require "shell_escape"
class AudioInfoError < Exception ; end
class AudioInfo
MUSICBRAINZ_FIELDS = {
@@ -28,11 +28,11 @@
"trackid" => "Track Id"
}
SUPPORTED_EXTENSIONS = %w{mp3 ogg mpc wma mp4 aac m4a flac}
- VERSION = "0.1"
+ VERSION = "0.1.1"
attr_reader :path, :extension, :musicbrainz_infos, :tracknum, :bitrate, :vbr
attr_reader :artist, :album, :title, :length, :date
# "block version" of #new()
@@ -294,10 +294,12 @@
def convert_tags_encoding(tags_orig, from_encoding)
tags = {}
Iconv.open(@encoding, from_encoding) do |ic|
tags_orig.inject(tags) do |hash, (k, v)|
- hash[ic.iconv(k)] = ic.iconv(v)
+ if v.is_a?(String)
+ hash[ic.iconv(k)] = ic.iconv(v)
+ end
hash
end
end
tags
end