ruby-mp3info 0.4 → 0.5

data/CHANGELOG

@@ -0,0 +1,61 @@
+[0.5 06/12/2005]
+
+* id3v2 writing and removing support added. tag2 attribute is r/w now
+* max guess size to find a valid frame set to 2Mb
+* implemented a new class ID3v2, ID2TAGS moved into it
+* Mp3Info.tag is r/w now and has priority over @tag1 and @tag2 when writing
+* added Mp3Info#rename() method to change the filename written at close
+* clean up: all overloaded standards classes replaced by including modules
+* FIXED bug in reading id3v2 tags tagged with olds versions of "mp3ext" ( http://www.mutschler.de/mp3ext/ )
+* FIXED bug on calculating id3v2 frame size
+* FIXED bug when multiple TLEN tags
+* FIXED bug when converting text tag from Unicode
+* FIXED bug: file was not closed, causing too many opened files and test failure on win32
+
+
+[0.4 26/04/2005]
+
+* fixes in vbr mode
+* removed extract_info_from_head() function
+* now try several times to find a good header frame before giving up
+* correct handling of unicode in v2 tags. Require standard "iconv" library if such tags are used
+* FIXED if a tag appears more than one time, create an array with every value found for this tag
+
+
+[0.3 04/05/2004]
+
+* massive changes of most of the code to make it easier to read & hopefully run faster
+* ID2TAGS hash is just informative now, no use of it in the code. id3v2 tag fields are read in directly
+* added support for id3 v2.2 and v2.4 (0.2.1 only supported v2.3)
+* much improved vbr duration guessing
+* made Mp3Info#to_s output to be prettier
+* moved hastag1? and hastag2? to be class booleans instead of functions (now named hastag1 and hastag2)
+* fixed a bug on computing "error_protection" attribute
+* new attribute "tag", which is a sort of "universal" tag, regardless of the tag version, 1 or 2, with the same keys as @tag1
+* new method hastag?, which test the presence of any tag
+
+
+[0.2.1 04/09/2003]
+
+* filename attribute added
+* mp3 files are opened read-only now [Alan Davies <alan__DOT_davies__AT__thomson.com>]
+* Mp3Info#initialize: bugfixes [Alan Davies <alan__DOT_davies__AT__thomson.com>]
+* put NULLs in year field in id3v1 tags instead of zeros [Alan Davies <alan__DOT_davies__AT__thomson.com>]
+* Mp3Info#gettag1: remove null at end of strings [Alan Davies <alan__DOT_davies__AT__thomson.com>]
+* Mp3Info#extract_infos_from_head(): some brackets missed [Alan Davies <alan__DOT_davies__AT__thomson.com>]
+
+
+[0.2 18/08/2003]
+
+* writing, reading and removing of id3v1 tags
+* reading of id3v2 tags
+* test suite improved
+* to_s method added
+* length attribute is a Float now
+
+
+[0.1 17/03/2003]
+
+* Initial version
+
+

data/EXAMPLES

@@ -0,0 +1,40 @@
+= Examples
+
+ 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

data/README

@@ -0,0 +1,28 @@
+= Description
+ruby-mp3info gives you access to low level informations on mp3 files
+(bitrate, length, samplerate, etc...). It can read, write, remove id3v1 and
+id3v2 tags. It is written in pure ruby.
+
+
+= Download
+
+ get tar.gz at
+ http://rubyforge.org/projects/ruby-mp3info/
+
+
+= Installation
+
+ $ ruby install.rb config
+ $ ruby install.rb setup
+ # ruby install.rb install
+
+or
+
+ # gem install ruby-mp3info
+
+
+= Todo
+
+* encoder detection
+* support for more tags in id3v2
+* generalize id3v2 with other audio formats (APE, MPC, OGG, etc...)

data/lib/mp3info.rb

@@ -1,143 +1,24 @@
 # $Id: mp3info.rb,v 1.5 2005/04/26 13:41:41 moumar Exp $
-# = Description
-#
-# ruby-mp3info gives you access to low level informations on mp3 files
-# (bitrate, length, samplerate, etc...). It can read, write, remove id3v1 tag
-# and read id3v2. It is written in pure ruby.
-#
-#
-# = Download
-#
-# get tar.gz at
-# http://rubyforge.org/projects/ruby-mp3info/
-#
-#
-# = Installation
-#
-#   $ ruby install.rb config
-#   $ ruby install.rb setup
-#   # ruby install.rb install
-#
-#   or
-#
-#   # gem install ruby-mp3info
-#
-#
-# = Example
-#
-#   require "mp3info"
-#
-#   mp3info = Mp3Info.new("myfile.mp3")
-#   puts mp3info
-#
-#
-# = Testing
-#
-# Test::Unit library is used for tests. see http://testunit.talbott.ws/
-#
-#  $ ruby test.rb
-#
-#
-# = ToDo
-#
-# * adding write support for ID3v2 tags
-# * adding a test for id3v2
-# * encoder detection
-#
-#
-# = Changelog
-#
-# [0.4 26/04/2005]
-#
-# * fixes in vbr mode
-# * removed extract_info_from_head() function
-# * now try several times to find a good header frame before giving up
-# * correct handling of unicode in v2 tags. Require standard "iconv" library if such tags are used
-# * FIXED if a tag appears more than one time, create an array with every value found for this tag
-#
-#
-# [0.3 04/05/2004]
-#
-# * massive changes of most of the code to make it easier to read & hopefully run faster
-# * ID2TAGS hash is just informative now, no use of it in the code. id3v2 tag fields are read in directly
-# * added support for id3 v2.2 and v2.4 (0.2.1 only supported v2.3)
-# * much improved vbr duration guessing
-# * made Mp3Info#to_s output to be prettier
-# * moved hastag1? and hastag2? to be class booleans instead of functions (now named hastag1 and hastag2)
-# * fixed a bug on computing "error_protection" attribute
-# * new attribute "tag", which is a sort of "universal" tag, regardless of the tag version, 1 or 2, with the same keys as @tag1
-# * new method hastag?, which test the presence of any tag
-#
-#
-# [0.2.1 04/09/2003]
-# 
-# * filename attribute added
-# * mp3 files are opened read-only now [Alan Davies <alan__DOT_davies__AT__thomson.com>]
-# * Mp3Info#initialize: bugfixes [Alan Davies <alan__DOT_davies__AT__thomson.com>]
-# * put NULLs in year field in id3v1 tags instead of zeros [Alan Davies <alan__DOT_davies__AT__thomson.com>]
-# * Mp3Info#gettag1: remove null at end of strings [Alan Davies <alan__DOT_davies__AT__thomson.com>]
-# * Mp3Info#extract_infos_from_head(): some brackets missed [Alan Davies <alan__DOT_davies__AT__thomson.com>]
-#
-# 
-# [0.2 18/08/2003]
-#
-# * writing, reading and removing of id3v1 tags
-# * reading of id3v2 tags
-# * test suite improved
-# * to_s method added
-# * length attribute is a Float now
-#
-#
-# [0.1 17/03/2003]
-#
-# * Initial version
-#
-#
 # 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"
+
+# ruby -d to display debugging infos
+
 # Raised on any kind of error related to ruby-mp3info
 class Mp3InfoError < StandardError ; end
 
 class Mp3InfoInternalError < StandardError #:nodoc:
 end
 
-class Numeric
-  ### returns the selected bit range (b, a) as a number
-  ### NOTE: b > a  if not, returns 0
-  def bits(b, a)
-    t = 0
-    b.downto(a) { |i| t += t + self[i] }
-    t
-  end
-end
-
-class Hash
-   ### lets you specify hash["key"] as hash.key
-   ### this came from CodingInRuby on RubyGarden
-   ### http://www.rubygarden.org/ruby?CodingInRuby
-   def method_missing(meth,*args)
-     if /=$/=~(meth=meth.id2name) then
-       self[meth[0...-1]] = (args.length<2 ? args[0] : args)
-     else
-       self[meth]
-     end
-   end
-end
-
-class File
-  def get32bits
-    (getc << 24) + (getc << 16) + (getc << 8) + getc
-  end
-  def get_syncsafe
-    (getc << 21) + (getc << 14) + (getc << 7) + getc
-  end
-end
-
 class Mp3Info
 
-  VERSION = "0.4"
+  VERSION = "0.5"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = [
@@ -185,86 +66,18 @@ class Mp3Info
     "Christian Rock", "Merengue", "Salsa", "Thrash Metal", "Anime", "JPop",
     "SynthPop" ]
 
-  
-  ID2TAGS = {
-    "AENC" => "Audio encryption",
-    "APIC" => "Attached picture",
-    "COMM" => "Comments",
-    "COMR" => "Commercial frame",
-    "ENCR" => "Encryption method registration",
-    "EQUA" => "Equalization",
-    "ETCO" => "Event timing codes",
-    "GEOB" => "General encapsulated object",
-    "GRID" => "Group identification registration",
-    "IPLS" => "Involved people list",
-    "LINK" => "Linked information",
-    "MCDI" => "Music CD identifier",
-    "MLLT" => "MPEG location lookup table",
-    "OWNE" => "Ownership frame",
-    "PRIV" => "Private frame",
-    "PCNT" => "Play counter",
-    "POPM" => "Popularimeter",
-    "POSS" => "Position synchronisation frame",
-    "RBUF" => "Recommended buffer size",
-    "RVAD" => "Relative volume adjustment",
-    "RVRB" => "Reverb",
-    "SYLT" => "Synchronized lyric/text",
-    "SYTC" => "Synchronized tempo codes",
-    "TALB" => "Album/Movie/Show title",
-    "TBPM" => "BPM (beats per minute)",
-    "TCOM" => "Composer",
-    "TCON" => "Content type",
-    "TCOP" => "Copyright message",
-    "TDAT" => "Date",
-    "TDLY" => "Playlist delay",
-    "TENC" => "Encoded by",
-    "TEXT" => "Lyricist/Text writer",
-    "TFLT" => "File type",
-    "TIME" => "Time",
-    "TIT1" => "Content group description",
-    "TIT2" => "Title/songname/content description",
-    "TIT3" => "Subtitle/Description refinement",
-    "TKEY" => "Initial key",
-    "TLAN" => "Language(s)",
-    "TLEN" => "Length",
-    "TMED" => "Media type",
-    "TOAL" => "Original album/movie/show title",
-    "TOFN" => "Original filename",
-    "TOLY" => "Original lyricist(s)/text writer(s)",
-    "TOPE" => "Original artist(s)/performer(s)",
-    "TORY" => "Original release year",
-    "TOWN" => "File owner/licensee",
-    "TPE1" => "Lead performer(s)/Soloist(s)",
-    "TPE2" => "Band/orchestra/accompaniment",
-    "TPE3" => "Conductor/performer refinement",
-    "TPE4" => "Interpreted, remixed, or otherwise modified by",
-    "TPOS" => "Part of a set",
-    "TPUB" => "Publisher",
-    "TRCK" => "Track number/Position in set",
-    "TRDA" => "Recording dates",
-    "TRSN" => "Internet radio station name",
-    "TRSO" => "Internet radio station owner",
-    "TSIZ" => "Size",
-    "TSRC" => "ISRC (international standard recording code)",
-    "TSSE" => "Software/Hardware and settings used for encoding",
-    "TYER" => "Year",
-    "TXXX" => "User defined text information frame",
-    "UFID" => "Unique file identifier",
-    "USER" => "Terms of use",
-    "USLT" => "Unsychronized lyric/text transcription",
-    "WCOM" => "Commercial information",
-    "WCOP" => "Copyright/Legal information",
-    "WOAF" => "Official audio file webpage",
-    "WOAR" => "Official artist/performer webpage",
-    "WOAS" => "Official audio source webpage",
-    "WORS" => "Official internet radio station homepage",
-    "WPAY" => "Payment",
-    "WPUB" => "Publishers official webpage",
-    "WXXX" => "User defined URL link frame"
-  }
-
   TAGSIZE = 128
   #MAX_FRAME_COUNT = 6  #number of frame to read for encoder detection
+  V1_V2_TAG_MAPPING = { 
+    "title"    => "TIT2",
+    "artist"   => "TPE1", 
+    "album"    => "TALB",
+    "year"     => "TYER",
+    "tracknum" => "TRCK",
+    "comments" => "COMM",
+    "genre_s"  => "TCON"
+  }
+
 
   # mpeg version = 1 or 2
   attr_reader(:mpeg_version)
@@ -291,14 +104,16 @@ class Mp3Info
   attr_reader(:error_protection)
 
   #a sort of "universal" tag, regardless of the tag version, 1 or 2, with the same keys as @tag1
+  #this tag has priority over @tag1 and @tag2 when writing the tag with #close
   attr_reader(:tag)
 
-  # id3v1 tag has a Hash. You can modify it, it will be written when calling
+  # id3v1 tag as a Hash. You can modify it, it will be written when calling
   # "close" method.
   attr_accessor(:tag1)
 
-  # id3v2 tag as a Hash
-  attr_reader(:tag2)
+  # id3v2 tag attribute as an ID3v2 object. You can modify it, it will be written when calling
+  # "close" method.
+  attr_accessor(:tag2)
 
   # the original filename
   attr_reader(:filename)
@@ -326,7 +141,14 @@ class Mp3Info
   def self.removetag1(filename)
     if self.hastag1?(filename)
       newsize = File.size(filename) - TAGSIZE
-      File.open(filename, "r+") { |f| f.truncate(newsize) }
+      File.open(filename, "rb+") { |f| f.truncate(newsize) }
+    end
+  end
+  
+  # Remove id3v2 tag from +filename+
+  def self.removetag2(filename)
+    self.open(filename) do |mp3|
+      mp3.tag2.clear
     end
   end
 
@@ -335,95 +157,112 @@ class Mp3Info
     $stderr.puts("#{self.class}::new() does not take block; use #{self.class}::open() instead") if block_given?
     raise(Mp3InfoError, "empty file") unless File.stat(filename).size? #FIXME
     @filename = filename
-    @hastag1, @hastag2 = false
-    @tag = Hash.new
-    @tag1 = Hash.new
-    @tag2 = Hash.new
+    @hastag1 = false
+    
+    @tag1 = {}
+    @tag1.extend(HashKeys)
+
+    @tag2 = ID3v2.new
 
     @file = File.new(filename, "rb")
-    parse_tags
-    @tag_orig = @tag1.dup
-
-    #creation of a sort of "universal" tag, regardless of the tag version
-    if hastag2?
-      h = { 
-        "title"    => "TIT2",
-        "artist"   => "TPE1", 
-	"album"    => "TALB",
-	"year"     => "TYER",
-	"tracknum" => "TRCK",
-	"comments" => "COMM",
-	"genre"    => 255,
-	"genre_s"  => "TCON"
-      }
-
-      h.each { |k, v| @tag[k] = @tag2[v] }
-
-    elsif hastag1?
-      @tag = @tag1.dup
-    end
+    @file.extend(Mp3FileMethods)
+    
+    begin
+      parse_tags
+      @tag1_orig = @tag1.dup
 
+      @tag = {}
 
-    ### extracts MPEG info from MPEG header and stores it in the hash @mpeg
-    ###  head (fixnum) = valid 4 byte MPEG header
-    
-    found = false
+      if hastag1?
+	@tag = @tag1.dup
+      end
 
-    5.times do
-      head = find_next_frame() 
-      @mpeg_version = [2, 1][head[19]]
-      @layer = LAYER[head.bits(18,17)]
-      next if @layer.nil?
-      @bitrate = BITRATE[@mpeg_version-1][@layer-1][head.bits(15,12)-1]
-      @error_protection = head[16] == 0 ? true : false
-      @samplerate = SAMPLERATE[@mpeg_version-1][head.bits(11,10)]
-      @padding = (head[9] == 1 ? true : false)
-      @channel_mode = CHANNEL_MODE[@channel_num = head.bits(7,6)]
-      @copyright = (head[3] == 1 ? true : false)
-      @original = (head[2] == 1 ? true : false)
-      @vbr = false
-      found = true
-      break
-    end
+      if hastag2?
+	@tag = {}
+      #creation of a sort of "universal" tag, regardless of the tag version
+	V1_V2_TAG_MAPPING.each do |key1, key2| 
+	  t2 = @tag2[key2]
+	  next unless t2
+	  @tag[key1] = t2.is_a?(Array) ? t2.first : t2
+
+	  if key1 == "tracknum"
+	    val = @tag2[key2].is_a?(Array) ? @tag2[key2].first : @tag2[key2]
+	    @tag[key1] = val.to_i
+	  end
+	end
+      end
 
-    raise(Mp3InfoError, "Cannot find good frame") unless found
+      @tag.extend(HashKeys)
+      @tag_orig = @tag.dup
 
 
-    seek = @mpeg_version == 1 ? 
-      (@channel_num == 3 ? 17 : 32) :       
-      (@channel_num == 3 ?  9 : 17)
+      ### extracts MPEG info from MPEG header and stores it in the hash @mpeg
+      ###  head (fixnum) = valid 4 byte MPEG header
+      
+    found = false
 
-    @file.seek(seek, IO::SEEK_CUR)
-    
-    vbr_head = @file.read(4)
-    if vbr_head == "Xing"
-      flags = @file.get32bits
-      @streamsize = @frames = 0
-      flags[1] == 1 and @frames = @file.get32bits
-      flags[2] == 1 and @streamsize = @file.get32bits 
-      # currently this just skips the TOC entries if they're found
-      @file.seek(100, IO::SEEK_CUR) if flags[0] == 1
-      @vbr_quality = @file.get32bits if flags[3] == 1
-      @length = (26/1000.0)*@frames
-      @bitrate = (((@streamsize/@frames)*@samplerate)/144) >> 10
-      @vbr = true
-    else
-      # for cbr, calculate duration with the given bitrate
-      @streamsize = @file.stat.size - (@hastag1 ? TAGSIZE : 0) - (@hastag2 ? @tag2["length"] : 0)
-      @length = ((@streamsize << 3)/1000.0)/@bitrate
-      if @tag2["TLEN"]
-        # but if another duration is given and it isn't close (within 5%)
-        #  assume the mp3 is vbr and go with the given duration
-        tlen = (@tag2["TLEN"].to_i)/1000
-        percent_diff = ((@length.to_i-tlen)/tlen.to_f)
-        if percent_diff.abs > 0.05
-          # without the xing header, this is the best guess without reading
-          #  every single frame
-          @vbr = true
-          @length = @tag2["TLEN"].to_i/1000
-          @bitrate = (@streamsize / @bitrate) >> 10
-        end
+      5.times do
+	head = find_next_frame() 
+	head.extend(NumericBits)
+	@mpeg_version = [2, 1][head[19]]
+	@layer = LAYER[head.bits(18,17)]
+	next if @layer.nil?
+	@bitrate = BITRATE[@mpeg_version-1][@layer-1][head.bits(15,12)-1]
+	@error_protection = head[16] == 0 ? true : false
+	@samplerate = SAMPLERATE[@mpeg_version-1][head.bits(11,10)]
+	@padding = (head[9] == 1 ? true : false)
+	@channel_mode = CHANNEL_MODE[@channel_num = head.bits(7,6)]
+	@copyright = (head[3] == 1 ? true : false)
+	@original = (head[2] == 1 ? true : false)
+	@vbr = false
+	found = true
+	break
+      end
+
+      raise(Mp3InfoError, "Cannot find good frame") unless found
+
+
+      seek = @mpeg_version == 1 ? 
+	(@channel_num == 3 ? 17 : 32) :       
+	(@channel_num == 3 ?  9 : 17)
+
+      @file.seek(seek, IO::SEEK_CUR)
+      
+      vbr_head = @file.read(4)
+      if vbr_head == "Xing"
+	puts "Xing header (VBR) detected" if $DEBUG
+	flags = @file.get32bits
+	@streamsize = @frames = 0
+	flags[1] == 1 and @frames = @file.get32bits
+	flags[2] == 1 and @streamsize = @file.get32bits 
+	puts "#{@frames} frames" if $DEBUG
+	raise(Mp3InfoError, "bad VBR header") if @frames.zero?
+	# currently this just skips the TOC entries if they're found
+	@file.seek(100, IO::SEEK_CUR) if flags[0] == 1
+	@vbr_quality = @file.get32bits if flags[3] == 1
+	@length = (26/1000.0)*@frames
+	@bitrate = (((@streamsize/@frames)*@samplerate)/144) >> 10
+	@vbr = true
+      else
+	# for cbr, calculate duration with the given bitrate
+	@streamsize = @file.stat.size - (@hastag1 ? TAGSIZE : 0) - (@tag2.valid? ? @tag2.io_position : 0)
+	@length = ((@streamsize << 3)/1000.0)/@bitrate
+	if @tag2["TLEN"]
+	  # but if another duration is given and it isn't close (within 5%)
+	  #  assume the mp3 is vbr and go with the given duration
+	  tlen = (@tag2["TLEN"].is_a?(Array) ? @tag2["TLEN"].last : @tag2["TLEN"]).to_i/1000
+	  percent_diff = ((@length.to_i-tlen)/tlen.to_f)
+	  if percent_diff.abs > 0.05
+	    # without the xing header, this is the best guess without reading
+	    #  every single frame
+	    @vbr = true
+	    @length = @tag2["TLEN"].to_i/1000
+	    @bitrate = (@streamsize / @bitrate) >> 10
+	  end
+	end
       end
+    ensure
+      @file.close
     end
   end
 
@@ -452,50 +291,104 @@ class Mp3Info
     end
     self
   end
+  
+  def removetag2
+    @tag2.clear
+  end
 
-  # Has file an id3v1 or v2 tag? true or false
+  # Does the file has an id3v1 or v2 tag?
   def hastag?
-    @hastag1 or @hastag2
+    @hastag1 or @tag2.valid?
   end
 
-  # Has file an id3v1 tag? true or false
+  # Does the file has an id3v1 tag?
   def hastag1?
     @hastag1
   end
 
-  # Has file an id3v2 tag? true or false
+  # Does the file has an id3v2 tag?
   def hastag2?
-    @hastag2
+    @tag2.valid?
   end
 
+  # write to another filename at close()
+  def rename(new_filename)
+    @filename = new_filename
+  end
 
   # Flush pending modifications to tags and close the file
   def close
-    return if @file.nil?
-    if @tag1 != @tag_orig
-      @tag_orig.update(@tag1)
-      #puts "@tag_orig: #{@tag_orig.inspect}"
-      @file.reopen(@filename, 'rb+')
-      @file.seek(-TAGSIZE, File::SEEK_END)
-      t = @file.read(3)
-      if t != 'TAG'
-        #append new tag
-        @file.seek(0, File::SEEK_END)
-        @file.write('TAG')
+    puts "close" if $DEBUG
+    if @tag != @tag_orig
+      puts "@tag has changed" if $DEBUG
+      @tag.each do |k, v|
+        @tag1[k] = v
+      end
+      
+      V1_V2_TAG_MAPPING.each do |key1, key2|
+        @tag2[key2] = @tag[key1] if @tag[key1]
+      end
+    end
+
+    if @tag1 != @tag1_orig
+      puts "@tag1 has changed" if $DEBUG
+      raise(Mp3InfoError, "file is not writable") unless File.writable?(@filename)
+      @tag1_orig.update(@tag1)
+      #puts "@tag1_orig: #{@tag1_orig.inspect}"
+      File.open(@filename, 'rb+') do |file|
+	file.seek(-TAGSIZE, File::SEEK_END)
+	t = file.read(3)
+	if t != 'TAG'
+	  #append new tag
+	  file.seek(0, File::SEEK_END)
+	  file.write('TAG')
+	end
+	str = [
+	  @tag1_orig["title"]||"",
+	  @tag1_orig["artist"]||"",
+	  @tag1_orig["album"]||"",
+	  ((@tag1_orig["year"] != 0) ? ("%04d" % @tag1_orig["year"].to_i) : "\0\0\0\0"),
+	  @tag1_orig["comments"]||"",
+	  0,
+	  @tag1_orig["tracknum"]||0,
+	  @tag1_orig["genre"]||255
+	  ].pack("Z30Z30Z30Z4Z28CCC")
+	file.write(str)
+      end
+    end
+
+    if @tag2.changed?
+      puts "@tag2 has changed" if $DEBUG
+      raise(Mp3InfoError, "file is not writable") unless File.writable?(@filename)
+      tempfile_name = nil
+      File.open(@filename, 'rb+') do |file|
+	
+	#if tag2 already exists, seek to end of it
+	if @tag2.valid?
+	  file.seek(@tag2.io_position)
+	end
+  #      if @file.read(3) == "ID3"
+  #        version_maj, version_min, flags = @file.read(3).unpack("CCB4")
+  #        unsync, ext_header, experimental, footer = (0..3).collect { |i| flags[i].chr == '1' }
+  #	tag2_len = @file.get_syncsafe
+  #        @file.seek(@file.get_syncsafe - 4, IO::SEEK_CUR) if ext_header
+  #	@file.seek(tag2_len, IO::SEEK_CUR)
+  #      end
+	tempfile_name = @filename + ".tmp"
+	File.open(tempfile_name, "wb") do |tempfile|
+	  unless @tag2.empty?
+	    tempfile.write("ID3")
+	    tempfile.write(@tag2.to_bin)
+	  end
+
+	  bufsiz = file.stat.blksize || 4096
+	  while buf = file.read(bufsiz)
+	    tempfile.write(buf)
+	  end
+	end
       end
-      str = [
-        @tag_orig["title"]||"",
-        @tag_orig["artist"]||"",
-        @tag_orig["album"]||"",
-        ((@tag_orig["year"] != 0) ? ("%04d" % @tag_orig["year"]) : "\0\0\0\0"),
-        @tag_orig["comments"]||"",
-        0,
-        @tag_orig["tracknum"]||0,
-        @tag_orig["genre"]||255
-        ].pack("Z30Z30Z30Z4Z28CCC")
-      @file.write(str)
+      File.rename(tempfile_name, @filename)
     end
-    @file.close
     @file = nil
   end
 
@@ -503,24 +396,25 @@ class Mp3Info
   def to_s
     s = "MPEG #{@mpeg_version} Layer #{@layer} #{@vbr ? "VBR" : "CBR"} #{@bitrate} Kbps #{@channel_mode} #{@samplerate} Hz length #{@length} sec. error protection #{@error_protection} "
     s << "tag1: "+@tag1.inspect+"\n" if @hastag1
-    s << "tag2: "+@tag2.inspect+"\n" if @hastag2
+    s << "tag2: "+@tag2.inspect+"\n" if @tag2.valid?
     s
   end
 
 
 private
-
+  
   ### parses the id3 tags of the currently open @file
   def parse_tags
     return if @file.stat.size < TAGSIZE  # file is too small
     @file.seek(0)
     f3 = @file.read(3)
     gettag1 if f3 == "TAG"  # v1 tag at beginning
-    gettag2 if f3 == "ID3"  # v2 tag at beginning
+    @tag2.from_io(@file) if f3 == "ID3"  # v2 tag at beginning
+      
     unless @hastag1         # 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 = (@hastag2 ? @file.pos : 0)
+        pos = (@tag2.valid? ? @file.pos : 0)
         # seek to where id3v1 tag should be
         @file.seek(-TAGSIZE, IO::SEEK_END) 
         gettag1 if @file.read(3) == "TAG"
@@ -564,109 +458,6 @@ private
     @tag1["genre_s"] = GENRES[@tag1["genre"]] || ""
   end
 
-  ### gets id3v2 tag information from @file
-  def gettag2
-    @file.seek(3)
-    version_maj, version_min, flags = @file.read(3).unpack("CCB4")
-    unsync, ext_header, experimental, footer = (0..3).collect { |i| flags[i].chr == '1' }
-    return unless [2, 3, 4].include?(version_maj)
-    @hastag2 = true
-    @tag2["version"] = "2.#{version_maj}.#{version_min}"
-    tag2_len = @file.get_syncsafe
-    case version_maj
-      when 2
-        read_id3v2_2_frames(tag2_len)
-      when 3,4
-        # seek past extended header if present
-        @file.seek(@file.get_syncsafe - 4, IO::SEEK_CUR) if ext_header
-        read_id3v2_3_frames(tag2_len)
-    end
-    tag2["length"] = @file.pos
-    # we should now have @file sitting at the first MPEG frame
-  end
-
-  ### runs thru @file one char at a time looking for best guess of first MPEG
-  ###  frame, which should be first 0xff byte after id3v2 padding zero's
-  ### returns true
-  def v2_end?
-    until @file.getc == 0xff
-    end
-    @file.seek(-1, IO::SEEK_CUR)
-    true
-  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)
-    v2end_found = false
-    until v2end_found                   # there are 2 ways to end the loop
-      name = @file.read(4)
-      if name[0] == 0
-        @file.seek(-4, IO::SEEK_CUR)    # 1. find a padding zero,
-        v2end_found = v2_end?       #    so we seek to end of zeros
-      else
-        size = @file.get32bits
-        @file.seek(2, IO::SEEK_CUR)     # skip flags
-	add_value_to_tag2(name, size)
-#        case name
-#          when /T[A-Z]+|COMM/
-#	    data = read_id3_string(size-1)
-#	    add_value_to_tag2(name, data)
-#          else
-#            @file.seek(size-1, IO::SEEK_CUR)  
-#        end
-        v2end_found = true if @file.pos >= tag2_len # 2. reach length from header
-      end
-    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)
-    v2end_found = false
-    until v2end_found
-      name = @file.read(3)
-      if name[0] == 0
-        @file.seek(-3, IO::SEEK_CUR)
-        v2end_found = v2_end?
-      else
-        size = (@file.getc << 16) + (@file.getc << 8) + @file.getc
-	add_value_to_tag2(name, size)
-        v2end_found = true if @file.pos >= tag2_len
-      end
-    end
-  end    
-
-  ### Add data to tag2["name"]
-  ### read lang_encoding, decode data if unicode and
-  ### create an array if the key ever exists in the tag
-  def add_value_to_tag2(name, size)
-    lang_encoding = @file.getc     # language encoding bit 0 for iso_8859_1, 1 for unicode
-    data = size == 0 ? "" : @file.read(size-1)
-    
-    if lang_encoding == 1 and name[0] == ?T
-      require "iconv"
-
-      #strip byte-order bytes at the beginning of the unicode string if they exists
-      data[0..3] =~ /^[\xff\xfe]+$/ and data = data[2..-1]
-
-      data = Iconv.iconv("ISO-8859-1", "UNICODE", data)[0] 
-    end
-
-    if @tag2.keys.include?(name)
-      unless @tag2[name].is_a?(Array)
-        keep = @tag2[name]
-        @tag2[name] = []
-        @tag2[name] << keep
-      end
-      @tag2[name] << data
-    else
-      @tag2[name] = data 
-    end
-  end
-  
   ### reads through @file from current pos until it finds a valid MPEG header
   ### returns the MPEG header as FixNum
   def find_next_frame
@@ -674,11 +465,14 @@ private
     # It should be at byte 0 when there's no id3v2 tag.
     # It should be at the end of the id3v2 tag or the zero padding if there
     #   is a id3v2 tag.
-    start_pos = @file.pos
-    dummyproof = @file.stat.size - @file.pos
+
+    #dummyproof = @file.stat.size - @file.pos => WAS TOO MUCH
+    dummyproof = [ @file.stat.size - @file.pos, 2000000 ].min
     dummyproof.times do |i|
       if @file.getc == 0xff
-        head = 0xff000000 + (@file.getc << 16) + (@file.getc << 8) + @file.getc
+        data = @file.read(3)
+	raise Mp3InfoError if @file.eof?
+        head = 0xff000000 + (data[0] << 16) + (data[1] << 8) + data[2]
         if check_head(head)
             return head
         else
@@ -686,7 +480,7 @@ private
         end
       end
     end
-    raise Mp3InfoError
+    raise Mp3InfoError, "cannot find a valid frame after reading #{dummyproof} bytes"
   end
 
   ### checks the given header to see if it is valid