ruby-mp3info 0.6.2 → 0.6.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.6.3 / 2008-03-28
+
+* some internals modifications for the compatibility with ruby-audioinfo
+
 === 0.6.2 / 2008-03-02
 
 * better handling of frames: 

data/Rakefile

@@ -2,7 +2,8 @@
 
 require 'rubygems'
 require 'hoe'
-require './lib/mp3info.rb'
+$:.unshift("./lib/")
+require 'mp3info'
 
 Hoe.new('ruby-mp3info', Mp3Info::VERSION) do |p|
   p.rubyforge_name = 'ruby-mp3info'

data/lib/mp3info.rb

@@ -1,9 +1,8 @@
-# $Id: mp3info.rb 71 2008-03-02 07:10:26Z moumar $
+# $Id: mp3info.rb 74 2008-03-28 15:11:04Z moumar $
 # License:: Ruby
 # Author:: Guillaume Pierronnet (mailto:moumar_AT__rubyforge_DOT_org)
 # Website:: http://ruby-mp3info.rubyforge.org/
 
-require "delegate"
 require "fileutils"
 require "mp3info/extension_modules"
 require "mp3info/id3v2"
@@ -18,7 +17,7 @@ end
 
 class Mp3Info
 
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = [

data/lib/mp3info/id3v2.rb

@@ -1,6 +1,8 @@
-require "mp3info/extension_modules"
+require "delegate"
 require "iconv"
 
+require "mp3info/extension_modules"
+
 # This class is not intended to be used directly
 class ID3v2 < DelegateClass(Hash) 
   
@@ -89,6 +91,7 @@ class ID3v2 < DelegateClass(Hash)
 
   include Mp3Info::HashKeys
   
+  # this is the position in the file where the tag really ends
   attr_reader :io_position
 
   # :+lang+: for writing comments
@@ -137,20 +140,29 @@ class ID3v2 < DelegateClass(Hash)
   ### gets id3v2 tag information from io object (must support #seek() method)
   def from_io(io)
     @io = io
+    original_pos = @io.pos
+    @io.extend(Mp3Info::Mp3FileMethods)
     version_maj, version_min, flags = @io.read(3).unpack("CCB4")
     @unsync, ext_header, experimental, footer = (0..3).collect { |i| flags[i].chr == '1' }
     raise("can't find version_maj ('#{version_maj}')") unless [2, 3, 4].include?(version_maj)
     @version_maj, @version_min = version_maj, version_min
     @valid = true
-    tag2_len = @io.get_syncsafe
+    @tag_length = @io.get_syncsafe
     case @version_maj
       when 2
-        read_id3v2_2_frames(tag2_len)
-      when 3,4
+        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(tag2_len)
+        read_id3v2_3_frames
     end
+
+    @io.seek(original_pos + @tag_length, IO::SEEK_SET)
+
+    # skip padding zeros at the end of the tag
+    while @io.getc == 0; end
+
+    @io.seek(-1, IO::SEEK_CUR)
     @io_position = @io.pos
     
     @hash_orig = @hash.dup
@@ -241,9 +253,8 @@ class ID3v2 < DelegateClass(Hash)
   end
 
   ### reads id3 ver 2.3.x/2.4.x frames and adds the contents to @tag2 hash
-  ###  tag2_len (fixnum) = length of entire id3v2 data, as reported in header
   ### NOTE: the id3v2 header does not take padding zero's into consideration
-  def read_id3v2_3_frames(tag2_len)
+  def read_id3v2_3_frames
     loop do # there are 2 ways to end the loop
       name = @io.read(4)
       if name[0] == 0 or name == "MP3e" #bug caused by old tagging application "mp3ext" ( http://www.mutschler.de/mp3ext/ )
@@ -293,14 +304,13 @@ class ID3v2 < DelegateClass(Hash)
 #	  else
 #	end
       end
-      break if @io.pos >= tag2_len # 2. reach length from header
+      break if @io.pos >= @tag_length # 2. reach length from header
     end
   end    
 
   ### reads id3 ver 2.2.x frames and adds the contents to @tag2 hash
-  ###  tag2_len (fixnum) = length of entire id3v2 data, as reported in header
   ### NOTE: the id3v2 header does not take padding zero's into consideration
-  def read_id3v2_2_frames(tag2_len)
+  def read_id3v2_2_frames
     loop do
       name = @io.read(3)
       if name[0] == 0
@@ -310,7 +320,7 @@ class ID3v2 < DelegateClass(Hash)
       else
         size = (@io.getc << 16) + (@io.getc << 8) + @io.getc
 	add_value_to_tag2(name, size)
-        break if @io.pos >= tag2_len
+        break if @io.pos >= @tag_length
       end
     end
   end    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-mp3info
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Guillaume Pierronnet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-02 00:00:00 +01:00
+date: 2008-03-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 1.5.1
     version: 
 description: "* written in pure ruby  * read low-level informations like bitrate, length, samplerate, etc... * read, write, remove id3v1 and id3v2 tags * only 2.3 version is supported for writings id3v2 tags  == SYNOPSIS:  a good exercise is to read the test.rb to understand how the library works deeper  require \"mp3info\" # read and display infos & tags Mp3Info.open(\"myfile.mp3\") do |mp3info| puts mp3info end  # read/write tag1 and tag2 with Mp3Info#tag attribute # when reading tag2 have priority over tag1 # when writing, each tag is written. Mp3Info.open(\"myfile.mp3\") do |mp3| puts mp3.tag.title    puts mp3.tag.artist    puts mp3.tag.album puts mp3.tag.tracknum mp3.tag.title = \"track title\" mp3.tag.artist = \"artist name\" end  Mp3Info.open(\"myfile.mp3\") do |mp3| # you can access four letter v2 tags like this puts mp3.tag2.TIT2 mp3.tag2.TIT2 = \"new TIT2\" # or like that mp3.tag2[\"TIT2\"] # at this time, only COMM tag is processed after reading and before writing # according to ID3v2#options hash mp3.tag2.options[:lang] = \"FRE\" mp3.tag2.COMM = \"my comment in french, correctly handled when reading and writing\" end"
 email: moumar@rubyforge.org