ruby-ogginfo 0.3 → 0.3.1

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.3.1 / 2008-03-16
+
+* bug fixed #18852 "OggInfo#close(): close @ic only if not nil"
+* bug fixed on encoding handling
+
 === 0.3 / 2008-03-15
 
 * write support through "vorbiscomment" binary

data/lib/ogginfo.rb

@@ -1,4 +1,4 @@
-# $Id: ogginfo.rb 36 2008-03-15 01:01:51Z moumar $
+# $Id: ogginfo.rb 39 2008-03-15 17:21:31Z moumar $
 #
 # see http://www.xiph.org/ogg/vorbis/docs.html for documentation on vorbis format
 # http://www.xiph.org/ogg/vorbis/doc/v-comment.html
@@ -22,7 +22,7 @@ end
 class OggInfoError < StandardError ; end
 
 class OggInfo
-  VERSION = "0.3"
+  VERSION = "0.3.1"
   attr_reader :channels, :samplerate, :bitrate, :nominal_bitrate, :length
   
   # +tag+ is a hash containing the vorbis tag like "Artist", "Title", and the like
@@ -30,18 +30,19 @@ class OggInfo
 
   # create new instance of OggInfo, using +charset+ to convert tags to
   def initialize(filename, charset = "iso-8859-1")
-    @file = File.new(filename, "rb")
-    if charset !~ /^utf-?8$/i
-      @ic = Iconv.new(charset, "utf8")
-    end
+    @filename = filename
+    @charset = charset
+    @file = File.new(@filename, "rb")
 
     find_next_page
     extract_infos
     find_next_page
-    extract_tag(charset)
+    extract_tag
+    convert_tag_charset("utf-8", @charset)
     @saved_tag = @tag.dup
     extract_end
     @bitrate = @file.stat.size.to_f*8/@length
+    @file.close
   end
 
   # "block version" of ::new()
@@ -62,15 +63,14 @@ class OggInfo
 
   # write any tags to file
   def close
-    @ic.close
-    @file.close if @file and not @file.closed?
     if @tag != @saved_tag
       cmd = %w{vorbiscomment -w} 
+      convert_tag_charset(@charset, "utf-8")
 
       @tag.each do |k,v|
         cmd.concat(["-t", k.upcase+"="+v])
       end
-      cmd << @file.path
+      cmd << @filename
       system(*cmd)
     end
   end
@@ -112,7 +112,7 @@ private
     end
   end
 
-  def extract_tag(charset)
+  def extract_tag
     @tag = {}
     @file.seek(22, IO::SEEK_CUR)
     segs = @file.read(1).unpack("C")[0]
@@ -124,9 +124,6 @@ private
     tag_size.times do |i|
       size = @file.read(4).unpack("V")[0]
       comment = @file.read(size)
-      if @ic
-        comment = @ic.iconv( com ) rescue comment
-      end
       key, val = comment.split(/=/)
       @tag[key.downcase] = val
     end
@@ -142,4 +139,12 @@ private
       @length = 0
     end
   end
+
+  def convert_tag_charset(from_charset, to_charset)
+    Iconv.open(to_charset, from_charset) do |ic|
+      @tag.each do |k, v|
+        @tag[k] = ic.iconv(v)
+      end
+    end
+  end
 end

data/test/test_ruby-ogginfo.rb

@@ -142,6 +142,17 @@ class OggInfoTest < Test::Unit::TestCase
     end
   end
 
+  def test_charset
+    generate_ogg
+    OggInfo.open("test.ogg", "utf-8") do |ogg|
+      ogg.tag["title"] = "hello\303\251"
+    end
+
+    OggInfo.open("test.ogg", "iso-8859-1") do |ogg|
+      assert_equal "hello\xe9", ogg.tag["title"] 
+    end
+  end
+
   def generate_ogg
     unless test(?f, "test.ogg")
       system("dd if=/dev/urandom bs=1024 count=3000 | oggenc -q0 --raw -o test.ogg -") or

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-ogginfo
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.3.1
 platform: ruby
 authors: 
 - Guillaume Pierronnet