ruby-mp3info 0.6.1 → 0.6.2

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.6.2 / 2008-03-02
+
+* better handling of frames: 
+  decode and encode as raw string by default,
+  or handle charset decoding/encoding for /^T/ and 
+  COMM frames
+
 === 0.6.1 / 2008-02-28
 
 * FIXED: fails to read id3v2 tags when iconv fails

data/lib/mp3info.rb

@@ -1,4 +1,4 @@
-# $Id: mp3info.rb 69 2008-02-28 09:29:08Z moumar $
+# $Id: mp3info.rb 71 2008-03-02 07:10:26Z moumar $
 # License:: Ruby
 # Author:: Guillaume Pierronnet (mailto:moumar_AT__rubyforge_DOT_org)
 # Website:: http://ruby-mp3info.rubyforge.org/
@@ -18,7 +18,7 @@ end
 
 class Mp3Info
 
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = [

data/lib/mp3info/id3v2.rb

@@ -194,7 +194,7 @@ class ID3v2 < DelegateClass(Hash)
     puts "encode_tag(#{name.inspect}, #{value.inspect}, #{version})" if $DEBUG
 
     text_encoding_index = @text_encoding_index 
-    if version == 3
+    if (name[0] == ?T || name == "COMM" ) && version == 3
       # in id3v2.3 tags, there is only 2 encodings possible
       transcoded_value = value
       if text_encoding_index >= 2
@@ -206,38 +206,38 @@ class ID3v2 < DelegateClass(Hash)
     case name
       when "COMM"
 	[ text_encoding_index , @options[:lang], 0, transcoded_value ].pack("ca3ca*")
-      when "UFID", /^W/ # URL link frames
-        value
-      else
+      when /^T/
 	text_encoding_index.chr + transcoded_value
+      else
+        value
     end
   end
 
   ### Read a tag from file and perform UNICODE translation if needed
   def decode_tag(name, value)
+    puts("decode_tag(#{name.inspect}, #{value.inspect})") if $DEBUG
     case name
       when "COMM"
         #FIXME improve this
 	encoding, lang, str = value.unpack("ca3a*")
 	out = value.split(0.chr).last
-      when "UFID", /^W/ # URL link frames
-        out = value
-      else
+      when /^T/
 	encoding = value[0]     # language encoding (see TEXT_ENCODINGS constant)
 	out = value[1..-1] 
+	# we need to convert the string in order to match
+	# the requested encoding
+	if encoding != @text_encoding_index
+	  begin
+	    Iconv.iconv(@options[:encoding], TEXT_ENCODINGS[encoding], out)[0]
+	  rescue Iconv::Failure
+	    out
+	  end
+	else
+	  out
+	end
+      else
+        value
     end
-    
-    printf("encoding: %d, value: %s\n", encoding, value.inspect) if $DEBUG
-    # we need to convert the string in order to match
-    # the requested encoding
-    if encoding && encoding != @text_encoding_index
-      begin
-        return Iconv.iconv(@options[:encoding], TEXT_ENCODINGS[encoding], out)[0]
-      rescue Iconv::Failure
-        return out
-      end
-    end
-    out
   end
 
   ### reads id3 ver 2.3.x/2.4.x frames and adds the contents to @tag2 hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-mp3info
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Guillaume Pierronnet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-28 00:00:00 +01:00
+date: 2008-03-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency