ruby-mp3info 0.6.10 → 0.6.11

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.6.11 / 2009-01-27
+
+* the library doesn't raise an ID3v2Error anymore when a id3v2 tag size is incorrect, but just output
+  a warning. (Fixes bug #23619)
+
 === 0.6.10 / 2008-11-27
 
 * processing of tags (read and write) can be disabled with :parse_tags => false

data/README.txt

@@ -3,6 +3,7 @@ ruby-mp3info
 by Guillaume Pierronnet
 * http://ruby-mp3info.rubyforge.org/
 * http://rubyforge.org/projects/ruby-mp3info/
+* mercurial repository since v0.6.10: http://www.bitbucket.org/moumar/ruby-mp3info/overview/
 
 == DESCRIPTION:
 

data/lib/mp3info.rb

@@ -18,7 +18,7 @@ end
 
 class Mp3Info
 
-  VERSION = "0.6.10"
+  VERSION = "0.6.11"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = {
@@ -305,7 +305,7 @@ class Mp3Info
 	@vbr = true
       else
 	# for cbr, calculate duration with the given bitrate
-	stream_size = @file.stat.size - (hastag1? ? TAG1_SIZE : 0) - (@tag2.valid? ? @tag2.io_position : 0)
+	stream_size = @file.stat.size - (hastag1? ? TAG1_SIZE : 0) - (@tag2.io_position || 0)
 	@length = ((stream_size << 3)/1000.0)/@bitrate
         # read the first 100 frames and decide if the mp3 is vbr and needs full scan
         begin
@@ -386,7 +386,7 @@ class Mp3Info
 
   # Does the file has an id3v1 or v2 tag?
   def hastag?
-    hastag1? or hastag2?
+    hastag1? || hastag2?
   end
 
   # Does the file has an id3v1 tag?
@@ -396,7 +396,7 @@ class Mp3Info
 
   # Does the file has an id3v2 tag?
   def hastag2?
-    @tag2.valid?
+    @tag2.parsed?
   end
 
   # write to another filename at close()
@@ -482,7 +482,7 @@ class Mp3Info
       tempfile_name = nil
       File.open(@filename, 'rb+') do |file|
 	#if tag2 already exists, seek to end of it
-	if @tag2.valid?
+	if @tag2.parsed?
 	  file.seek(@tag2.io_position)
 	end
   #      if @file.read(3) == "ID3"
@@ -543,7 +543,7 @@ private
     unless @tag1_parsed         # v1 tag at end
       # this preserves the file pos if tag2 found, since gettag2 leaves
       # the file at the best guess as to the first MPEG frame
-      pos = (@tag2.valid? ? @file.pos : 0)
+      pos = (@tag2.io_position || 0)
       # seek to where id3v1 tag should be
       @file.seek(-TAG1_SIZE, IO::SEEK_END) 
       if @file.read(3) == "TAG"

data/lib/mp3info/id3v2.rb

@@ -123,13 +123,13 @@ class ID3v2 < DelegateClass(Hash)
     #TAGS.keys.each { |k| @hash[k] = nil }
     @hash_orig = {}
     super(@hash)
-    @valid = false
+    @parsed = false
     @version_maj = @version_min = nil
   end
 
   # does this tag has been correctly read ?
-  def valid?
-    @valid
+  def parsed?
+    @parsed
   end
 
   # does this tag has been changed ?
@@ -140,7 +140,7 @@ class ID3v2 < DelegateClass(Hash)
   # full version of this tag (like "2.3.0") or nil
   # if tag was not correctly read
   def version
-    if valid?
+    if @version_maj && @version_min
       "2.#{@version_maj}.#{@version_min}"
     else
       nil
@@ -156,29 +156,26 @@ class ID3v2 < DelegateClass(Hash)
     @unsync, ext_header, experimental, footer = (0..3).collect { |i| flags[i].chr == '1' }
     raise(ID3v2Error, "can't find version_maj ('#{version_maj}')") unless [2, 3, 4].include?(version_maj)
     @version_maj, @version_min = version_maj, version_min
-    @valid = true
     @tag_length = @io.get_syncsafe
-    case @version_maj
-      when 2
-        read_id3v2_2_frames
-      when 3, 4
-        # seek past extended header if present
-        @io.seek(@io.get_syncsafe - 4, IO::SEEK_CUR) if ext_header
-        read_id3v2_3_frames
+    @io_position = original_pos + @tag_length
+    
+    @parsed = true
+    begin
+      case @version_maj
+        when 2
+          read_id3v2_2_frames
+        when 3, 4
+          # seek past extended header if present
+          @io.seek(@io.get_syncsafe - 4, IO::SEEK_CUR) if ext_header
+          read_id3v2_3_frames
+      end
+    rescue ID3v2Error => e
+      warn("warning: id3v2 tag not fully parsed: #{e.message}")
     end
 
-    @io.seek(original_pos + @tag_length, IO::SEEK_SET)
-
-    # skip padding zeros at the end of the tag
-    while @io.getbyte == 0; end
-
-    @io.seek(-1, IO::SEEK_CUR)
-    @io_position = @io.pos
-    
     @hash_orig = @hash.dup
     #no more reading
     @io = nil
-    # we should now have io sitting at the first MPEG frame
   end
 
   # dump tag for writing. Version is always 2.#{WRITE_VERSION}.0.
@@ -264,13 +261,13 @@ class ID3v2 < DelegateClass(Hash)
 	  begin
 	    Iconv.iconv(@options[:encoding], TEXT_ENCODINGS[encoding], out).first
 	  rescue Iconv::Failure
-	    out
+	    return out
 	  end
 	else
-	  out
+	  return out
 	end
       else
-        raw_value
+        return raw_value
     end
   end
 
@@ -321,13 +318,13 @@ class ID3v2 < DelegateClass(Hash)
     puts "add_value_to_tag2" if $DEBUG
 
     if size > 50_000_000
-      raise ID3v2Error, "tag size too big for tag '#{name}'"
+      raise ID3v2Error, "tag size is > 50_000_000"
     end
       
     data_io = @io.read(size)
     data = decode_tag(name, data_io)
     # remove padding zeros for textual tags
-    if name =~ /^T/
+    if data && name =~ /^T/
       data.sub!(/\0*$/, '')
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-mp3info
 version: !ruby/object:Gem::Version 
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors: 
 - Guillaume Pierronnet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-27 00:00:00 +01:00
+date: 2009-01-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-mp3info
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: ruby-mp3info is a pure-ruby library to retrieve low level informations on mp3 files and manipulate id3v1 and id3v2 tags