ruby-audioinfo 0.1.4 → 0.1.5

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.1.5 / 2009-03-29
+
+* flac parsing more robust 
+* musicbrainz_infos support for flac
+* quick fixes in mpcinfo for id3v2 tag parsing
+
 === 0.1.4 / 2008-07-04
 
 * charset correctly set when commiting MP3 tags too

data/lib/audioinfo/mpcinfo.rb

@@ -150,7 +150,16 @@ class MpcInfo
     elsif mpc_header == "ID3"
       @id3v2_tag = ID3v2.new
       @id3v2_tag.from_io(@file)
-      parse_infos
+      @file.seek(@id3v2_tag.io_position)
+      # very dirty hack to allow parsing of mpc infos after id3v2 tag
+      while @file.read(1) != "M"; end
+      if @file.read(2) == "P+"
+        @file.seek(-3, IO::SEEK_CUR)
+        # we need to reparse the tag, since we have the beggining of the mpc file
+        parse_infos
+      else
+        raise(MpcInfoError, "cannot find MPC header after id3 tag")
+      end
     else
       raise(MpcInfoError, "cannot find MPC header")
     end

data/lib/audioinfo.rb

@@ -30,7 +30,7 @@ class AudioInfo
 
   SUPPORTED_EXTENSIONS = %w{mp3 ogg mpc wma mp4 aac m4a flac}
 
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 
   attr_reader :path, :extension, :musicbrainz_infos, :tracknum, :bitrate, :vbr
   attr_reader :artist, :album, :title, :length, :date
@@ -52,9 +52,9 @@ class AudioInfo
   end
 
   # open the file with path +fn+ and convert all tags from/to specified +encoding+
-  def initialize(fn, encoding = 'utf-8')
-    raise(AudioInfoError, "path is nil") if fn.nil?
-    @path = fn
+  def initialize(filename, encoding = 'utf-8')
+    raise(AudioInfoError, "path is nil") if filename.nil?
+    @path = filename
     ext = File.extname(@path)
     raise(AudioInfoError, "cannot find extension") if ext.empty?
     @extension = ext[1..-1].downcase
@@ -64,15 +64,16 @@ class AudioInfo
     begin
       case @extension
 	when 'mp3'
-	  @info = Mp3Info.new(fn, :encoding => @encoding)
+	  @info = Mp3Info.new(filename, :encoding => @encoding)
 	  default_tag_fill
-	#"TXXX"=>
-	#["MusicBrainz TRM Id\000",
-	 #"MusicBrainz Artist Id\000aba64937-3334-4c65-90a1-4e6b9d4d7ada",
-	 #"MusicBrainz Album Id\000e1a223c1-cbc2-427f-a192-5d22fefd7c4c",
-	 #"MusicBrainz Album Type\000album",
-	 #"MusicBrainz Album Status\000official",
-	 #"MusicBrainz Album Artist Id\000"]
+	  #"TXXX"=>
+	  #["MusicBrainz TRM Id\000",
+	  #"MusicBrainz Artist Id\000aba64937-3334-4c65-90a1-4e6b9d4d7ada",
+	  #"MusicBrainz Album Id\000e1a223c1-cbc2-427f-a192-5d22fefd7c4c",
+	  #"MusicBrainz Album Type\000album",
+	  #"MusicBrainz Album Status\000official",
+	  #"MusicBrainz Album Artist Id\000"]
+          
 	  if (arr = @info.tag2["TXXX"]).is_a?(Array)
 	    fields = MUSICBRAINZ_FIELDS.invert
 	    arr.each do |val|
@@ -91,7 +92,7 @@ class AudioInfo
 	  @info.close
 
 	when 'ogg'
-	  @info = OggInfo.new(fn, @encoding)
+	  @info = OggInfo.new(filename, @encoding)
 	  default_fill_musicbrainz_fields
 	  default_tag_fill
           @bitrate = @info.bitrate/1000
@@ -102,17 +103,17 @@ class AudioInfo
 	  @info.close
 	  
 	when 'mpc'
-	  fill_ape_tag(fn)
-	  
-	  mpc_info = MpcInfo.new(fn)
+          fill_ape_tag(filename)
+
+	  mpc_info = MpcInfo.new(filename)
           @bitrate = mpc_info.infos['bitrate']/1000
 	  @length = mpc_info.infos['length']
 
         when 'ape'
-	  fill_ape_tag(fn)
+	  fill_ape_tag(filename)
 
         when 'wma'
-	  @info = WmaInfo.new(fn, :encoding => @encoding)
+	  @info = WmaInfo.new(filename, :encoding => @encoding)
 	  @artist = @info.tags["Author"]
 	  @album = @info.tags["AlbumTitle"]
 	  @title = @info.tags["Title"]
@@ -127,7 +128,7 @@ class AudioInfo
 	  end
           
 	when 'aac', 'mp4', 'm4a'
-	  @info = MP4Info.open(fn)
+	  @info = MP4Info.open(filename)
 	  @artist = @info.ART
 	  @album = @info.ALB
 	  @title = @info.NAM
@@ -137,22 +138,27 @@ class AudioInfo
 	  @length = @info.SECS
 	  mapping = MUSICBRAINZ_FIELDS.invert
 
-	  `faad -i #{fn.shell_escape} 2>&1 `.grep(/^MusicBrainz (.+)$/) do
+	  `faad -i #{filename.shell_escape} 2>&1 `.grep(/^MusicBrainz (.+)$/) do
 	    name, value = $1.split(/: /, 2)
 	    key = mapping[name]
 	    @musicbrainz_infos[key] = value
 	  end
 	
 	when 'flac'
-	  @info = FlacInfo.new(fn)
+	  @info = FlacInfo.new(filename)
           tags = convert_tags_encoding(@info.tags, "UTF-8")
-	  @artist = tags["ARTIST"]
-	  @album = tags["ALBUM"]
-	  @title = tags["TITLE"]
-	  @tracknum = tags["TRACKNUMBER"].to_i
-	  @date = tags["DATE"]
+	  @artist = tags["ARTIST"] || tags["artist"]
+	  @album = tags["ALBUM"] || tags["album"]
+	  @title = tags["TITLE"] || tags["title"]
+	  @tracknum = (tags["TRACKNUMBER"]||tags["tracknumber"]).to_i
+	  @date = tags["DATE"]||tags["date"]
 	  @length = @info.streaminfo["total_samples"] / @info.streaminfo["samplerate"].to_f
-	  @bitrate = File.size(fn).to_f*8/@length/1024
+	  @bitrate = File.size(filename).to_f*8/@length/1024
+          tags.each do |tagname, tagvalue|
+            next unless tagname =~ /^musicbrainz_(.+)$/
+            @musicbrainz_infos[$1] = tags[tagname]
+          end
+          @musicbrainz_infos["trmid"] = tags["musicip_puid"]
 	  #default_fill_musicbrainz_fields
 
 	else
@@ -241,7 +247,7 @@ class AudioInfo
 	      "album"  => @album,
 	      "title"  => @title,
               "tracknumber" => @tracknum}.each do |k,v|
-	      ogg.tag[k] = v
+	      ogg.tag[k] = v.to_s
 	    end
 	  end
 
@@ -294,9 +300,9 @@ class AudioInfo
     end
   end
 
-  def fill_ape_tag(fn)
+  def fill_ape_tag(filename)
     begin
-      @info = ApeTag.new(fn)
+      @info = ApeTag.new(filename)
       tags = convert_tags_encoding(@info.tag, "UTF-8")
       default_tag_fill(tags)
       default_fill_musicbrainz_fields

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-audioinfo
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Guillaume Pierronnet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-04 00:00:00 +02:00
+date: 2009-03-28 23:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,13 +64,13 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.6.0
+        version: 1.9.0
     version: 
 description: "ruby-audioinfo glue together various audio ruby libraries and presents a unified API to the developper. Currently, supported formats are: mp3, ogg, mpc, ape, wma, flac, aac, mp4, m4a."
 email: moumar@rubyforge.org
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-audioinfo
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: "ruby-audioinfo glue together various audio ruby libraries and presents a single API to the developper. Currently, supported formats are: mp3, ogg, mpc, ape, wma, flac, aac, mp4, m4a."