ruby-audioinfo 0.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31fa2ef2c169ce9c1395b5666d2b852d8ca67a79
-  data.tar.gz: 3171ddb823ec69078ef2eba543038d28adf718b1
+  metadata.gz: b3d88409c0fcd1fc60750cc12d93527e10f078c1
+  data.tar.gz: 0eeb6112e45fe6e71f03cba86bd6984e601c1700
 SHA512:
-  metadata.gz: 94576986f1b060232ac5922be0133765bf52283d0f82ca773ce56d8216026c195962a20cc0c81cc5aa6b5f8f5efd0fa44c59b8f50e04ca6e15c5493641fc4e2f
-  data.tar.gz: f42f00f7cdd07008081d24c72935066f2545851027cc4a67b704d868ee41e990a629871daf53aa6e43a9a9d7bec05256ae51ae541989204d954e0edbaad4c067
+  metadata.gz: 856b773a0ea07be9223fe56d7100261b0653040c9c70ff66c121cc9126055fee2b717dd1e1c1dfd375753f5db503de0653ec39641f6ad06d3d6d2a9125c836f5
+  data.tar.gz: 16ecada3747678a6990459269b8bfa1054f423c72d673292b30154582d29c1378fa57a788e087b8f8dd661367c2a2dae68485485d29b79102820a6bcf39d0054

data/Rakefile

@@ -15,7 +15,8 @@ Hoe.spec('ruby-audioinfo') do
   #history_file = "History.txt"
   self.readme_file = "README.rdoc"
   self.test_globs = ["test/test_*.rb"]
-  self.rsync_args = "-rv --delete" 
+  self.rsync_args = "-rv --delete"
+  self.license 'GPL-3.0'
 
   extra_deps << ['ruby-mp3info', '>= 0.8']
   extra_deps << ['ruby-ogginfo', '>= 0.7']

data/lib/audioinfo.rb

@@ -7,6 +7,7 @@ require "wmainfo"
 require "mp4info"
 require "flacinfo"
 require "apetag"
+require "wavefile"
 
 $: << File.expand_path(File.dirname(__FILE__))
 
@@ -34,16 +35,16 @@ class AudioInfo
     "trackid" => "Track Id"
   }
 
-  SUPPORTED_EXTENSIONS = %w{mp3 ogg opus spx mpc wma mp4 aac m4a flac}
+  SUPPORTED_EXTENSIONS = %w{mp3 ogg opus spx mpc wma mp4 aac m4a flac wav}
 
-  VERSION = "0.4"
+  VERSION = "0.5.0"
 
   attr_reader :path, :extension, :musicbrainz_infos, :tracknum, :bitrate, :vbr
   attr_reader :artist, :album, :title, :length, :date
 
   # Part of testing API - you should not use this directly
   attr_reader :info
-  
+
   # "block version" of #new()
   def self.open(*args)
     audio_info = self.new(*args)
@@ -81,122 +82,127 @@ class AudioInfo
 
     begin
       case @extension
-	when 'mp3'
-	  @info = Mp3Info.new(filename)
-	  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"]
-          
-	  if (arr = @info.tag2["TXXX"]).is_a?(Array)
-	    fields = MUSICBRAINZ_FIELDS.invert
-	    arr.each do |val|
-	      if val =~ /^MusicBrainz (.+)\000(.*)$/
-		short_name = fields[$1]
-	        @musicbrainz_infos[short_name] = $2.gsub("\xEF\xBB\xBF".force_encoding("UTF-8"), '')
-	      end
-	    end
-	  end
-          @bitrate = @info.bitrate
-	  i = @info.tag.tracknum
-	  @tracknum = (i.is_a?(Array) ? i.last : i).to_i
-	  @length = @info.length.to_i
-	  @date = @info.tag["date"]
-	  @vbr = @info.vbr
-	  @info.close
-
-	when 'ogg', 'opus', 'spx'
-	  @info = OggInfo.new(filename)
-	  default_fill_musicbrainz_fields
-	  default_tag_fill
-          @bitrate = @info.bitrate/1000
-          @tracknum = @info.tag.tracknumber.to_i
-	  @length = @info.length.to_i
-	  @date = @info.tag["date"]
-	  @vbr = true
-	  @info.close
-	  
-	when 'mpc'
-          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(filename)
-
-        when 'wma'
-	  @info = WmaInfo.new(filename, :encoding => 'utf-8')
-	  @artist = @info.tags["Author"]
-	  @album = @info.tags["AlbumTitle"]
-	  @title = @info.tags["Title"]
-	  @tracknum = @info.tags["TrackNumber"].to_i
-	  @date = @info.tags["Year"]
-	  @bitrate = @info.info["bitrate"]
-	  @length = @info.info["playtime_seconds"]
-	  MUSICBRAINZ_FIELDS.each do |key, original_key|
-	    @musicbrainz_infos[key] = 
-              @info.info["MusicBrainz/" + original_key.tr(" ", "")] ||
-              @info.info["MusicBrainz/" + original_key]
-	  end
-          
-	when 'mp4', 'aac', 'm4a'
-          @extension = 'mp4'
-	  @info = MP4Info.open(filename)
-	  @artist = @info.ART
-	  @album = @info.ALB
-	  @title = @info.NAM
-	  @tracknum = ( t = @info.TRKN ) ? t.first : 0
-	  @date = @info.DAY
-	  @bitrate = @info.BITRATE
-	  @length = @info.SECS
-	  mapping = MUSICBRAINZ_FIELDS.invert
-
-	  faad_info(filename).match(/^MusicBrainz (.+)$/) do
-	    name, value = $1.split(/: /, 2)
-	    key = mapping[name]
-	    @musicbrainz_infos[key] = value
-	  end
-	
-	when 'flac'
-	  @info = FlacInfo.new(filename)
-	  # Unfortunately, FlacInfo doesn't allow us to fiddle inside
-	  # their class, so we have to brute force it. Any other
-	  # solution (e.g. creating another abstraction or getting
-	  # methods) lands up being more messy and brittle.
-	  @info.instance_variable_set('@tags', CaseInsensitiveHash.new(@info.tags))
-
-          get_tag = proc do |name|
-            if t = @info.tags[name]
-              t.dup.force_encoding("utf-8")
-            else
-              nil
-            end
+	    when 'mp3'
+        @info = Mp3Info.new(filename)
+        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"]
+
+        if (arr = @info.tag2["TXXX"]).is_a?(Array)
+          fields = MUSICBRAINZ_FIELDS.invert
+          arr.each do |val|
+            if val =~ /^MusicBrainz (.+)\000(.*)$/
+		          short_name = fields[$1]
+    	        @musicbrainz_infos[short_name] = $2.gsub("\xEF\xBB\xBF".force_encoding("UTF-8"), '')
+	          end
           end
-          
-	  @artist = get_tag.call("artist")
-	  @album = get_tag.call("album")
-	  @title = get_tag.call("title")
-	  @tracknum = @info.tags["tracknumber"].to_i
-	  @date = get_tag.call("date")
-	  @bitrate = 0
-	  @length = @info.streaminfo["total_samples"] / @info.streaminfo["samplerate"].to_f
-          if @length > 0
-	    @bitrate = File.size(filename).to_f*8/@length/1024
-          end
-          @info.tags.each do |tagname, tagvalue|
-            next unless tagname =~ /^musicbrainz_(.+)$/
-            @musicbrainz_infos[$1] = get_tag.call(tagname)
+        end
+        @bitrate = @info.bitrate
+        i = @info.tag.tracknum
+        @tracknum = (i.is_a?(Array) ? i.last : i).to_i
+        @length = @info.length.to_i
+        @date = @info.tag["date"]
+        @vbr = @info.vbr
+        @info.close
+
+      when 'ogg', 'opus', 'spx'
+        @info = OggInfo.new(filename)
+        default_fill_musicbrainz_fields
+        default_tag_fill
+        @bitrate = @info.bitrate/1000
+        @tracknum = @info.tag.tracknumber.to_i
+        @length = @info.length.to_i
+        @date = @info.tag["date"]
+        @vbr = true
+        @info.close
+
+	    when 'mpc'
+        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(filename)
+
+      when 'wma'
+        @info = WmaInfo.new(filename, :encoding => 'utf-8')
+        @artist = @info.tags["Author"]
+        @album = @info.tags["AlbumTitle"]
+        @title = @info.tags["Title"]
+        @tracknum = @info.tags["TrackNumber"].to_i
+        @date = @info.tags["Year"]
+        @bitrate = @info.info["bitrate"]
+        @length = @info.info["playtime_seconds"]
+        MUSICBRAINZ_FIELDS.each do |key, original_key|
+          @musicbrainz_infos[key] =
+                  @info.info["MusicBrainz/" + original_key.tr(" ", "")] ||
+                  @info.info["MusicBrainz/" + original_key]
+	      end
+
+	    when 'mp4', 'aac', 'm4a'
+        @extension = 'mp4'
+        @info = MP4Info.open(filename)
+        @artist = @info.ART
+        @album = @info.ALB
+        @title = @info.NAM
+        @tracknum = ( t = @info.TRKN ) ? t.first : 0
+        @date = @info.DAY
+        @bitrate = @info.BITRATE
+        @length = @info.SECS
+        mapping = MUSICBRAINZ_FIELDS.invert
+
+        faad_info(filename).match(/^MusicBrainz (.+)$/) do
+          name, value = $1.split(/: /, 2)
+          key = mapping[name]
+          @musicbrainz_infos[key] = value
+        end
+
+	    when 'flac'
+        @info = FlacInfo.new(filename)
+        # Unfortunately, FlacInfo doesn't allow us to fiddle inside
+        # their class, so we have to brute force it. Any other
+        # solution (e.g. creating another abstraction or getting
+        # methods) lands up being more messy and brittle.
+        @info.instance_variable_set('@tags', CaseInsensitiveHash.new(@info.tags))
+
+        get_tag = proc do |name|
+          if t = @info.tags[name]
+            t.dup.force_encoding("utf-8")
+          else
+            nil
           end
-          @musicbrainz_infos["trmid"] = @info.tags["musicip_puid"]
-	  #default_fill_musicbrainz_fields
-	else
-	  raise(AudioInfoError, "unsupported extension '.#{@extension}'")
+        end
+
+        @artist = get_tag.call("artist")
+        @album = get_tag.call("album")
+        @title = get_tag.call("title")
+        @tracknum = @info.tags["tracknumber"].to_i
+        @date = get_tag.call("date")
+        @bitrate = 0
+        @length = @info.streaminfo["total_samples"] / @info.streaminfo["samplerate"].to_f
+        if @length > 0
+	        @bitrate = File.size(filename).to_f*8/@length/1024
+        end
+        @info.tags.each do |tagname, tagvalue|
+          next unless tagname =~ /^musicbrainz_(.+)$/
+          @musicbrainz_infos[$1] = get_tag.call(tagname)
+        end
+        @musicbrainz_infos["trmid"] = @info.tags["musicip_puid"]
+	      #default_fill_musicbrainz_fields
+
+      when 'wav'
+        @info = WaveFile::Reader.info(filename)
+        @length = @info.duration.seconds
+        @bitrate = File.size(filename) * 8 / @length / 1024
+
+      else
+        raise(AudioInfoError, "unsupported extension '.#{@extension}'")
       end
 
       if @tracknum == 0
@@ -205,12 +211,12 @@ class AudioInfo
 
       @musicbrainz_infos.delete_if { |k, v| v.nil? }
       @hash = { "artist" => @artist,
-	"album"  => @album,
-	"title"  => @title,
-	"tracknum" => @tracknum,
-	"date" => @date,
-	"length" => @length,
-	"bitrate" => @bitrate,
+                "album"  => @album,
+                "title"  => @title,
+                "tracknum" => @tracknum,
+                "date" => @date,
+                "length" => @length,
+                "bitrate" => @bitrate,
       }
 
     rescue Exception, Mp3InfoError, OggInfoError, ApeTagError => e
@@ -218,7 +224,6 @@ class AudioInfo
     end
 
     @needs_commit = false
-
   end
 
   # set the title of the file
@@ -275,62 +280,61 @@ class AudioInfo
   def close
     if @needs_commit
       case @info
-        when Mp3Info
-	  Mp3Info.open(@path) do |info|
-	    info.tag.artist = @artist
-	    info.tag.title = @title
-	    info.tag.album = @album
-	    info.tag.tracknum = @tracknum
-            if @picture
-              info.tag2.remove_pictures
-              info.tag2.add_picture(File.binread(@picture))
-            end
-	  end
-	when OggInfo
-	  OggInfo.open(@path) do |ogg|
-            { "artist" => @artist,
-	      "album"  => @album,
-	      "title"  => @title,
-              "tracknumber" => @tracknum}.each do |k,v|
-	      ogg.tag[k] = v.to_s
-	    end
-            if @picture
-              ogg.picture = @picture
-            end
-	  end
-
-        when ApeTag
-          ape = ApeTag.new(@path)
-          ape.update do |fields|
-            fields["Artist"] = @artist
-            fields["Album"] = @album
-            fields["Title"] = @title
-            fields["Track"] = @tracknum.to_s
+      when Mp3Info
+        Mp3Info.open(@path) do |info|
+          info.tag.artist = @artist
+          info.tag.title = @title
+          info.tag.album = @album
+          info.tag.tracknum = @tracknum
+          if @picture
+           info.tag2.remove_pictures
+           info.tag2.add_picture(File.binread(@picture))
           end
-	else
-          have_metaflac = system("which metaflac > /dev/null")
-          have_ffmpeg = system("which ffmpeg > /dev/null")
-          if have_metaflac and @info.is_a?(FlacInfo)
-            tags = {"ARTIST" => @artist, 
-                    "ALBUM" => @album, 
-                    "TITLE" => @title, 
-                    "TRACKNUMBER" => @tracknum}.inject([]) do |tags, (key, value)|
-              tags + ["--set-tag", "#{key}=#{value.to_s}"]
-            end
-            tag_with_shell_command("metaflac", "--remove-all", :src)
-            tag_with_shell_command("metaflac", tags, :src)
-          elsif have_ffmpeg
-            tags = {"artist" => @artist, 
-                    "album" => @album, 
-                    "title" => @title}.inject([]) do |tags, (key, value)|
-              tags + ["-metadata", "#{key}=#{value.to_s}"]
-            end
-            tag_with_shell_command("ffmpeg", "-y", "-i", :src, "-loglevel", "quiet", tags, :dst)
-          else
-	    raise(AudioInfoError, "implement me")
+        end
+	    when OggInfo
+	      OggInfo.open(@path) do |ogg|
+          { "artist" => @artist,
+	          "album"  => @album,
+	          "title"  => @title,
+            "tracknumber" => @tracknum}.each do |k,v|
+	          ogg.tag[k] = v.to_s
+	        end
+          if @picture
+            ogg.picture = @picture
+          end
+        end
+
+      when ApeTag
+        ape = ApeTag.new(@path)
+        ape.update do |fields|
+          fields["Artist"] = @artist
+          fields["Album"] = @album
+          fields["Title"] = @title
+          fields["Track"] = @tracknum.to_s
+        end
+	    else
+        have_metaflac = system("which metaflac > /dev/null")
+        have_ffmpeg = system("which ffmpeg > /dev/null")
+        if have_metaflac and @info.is_a?(FlacInfo)
+          tags = {"ARTIST" => @artist,
+                  "ALBUM" => @album,
+                  "TITLE" => @title,
+                  "TRACKNUMBER" => @tracknum}.inject([]) do |tags, (key, value)|
+            tags + ["--set-tag", "#{key}=#{value.to_s}"]
           end
+          tag_with_shell_command("metaflac", "--remove-all", :src)
+          tag_with_shell_command("metaflac", tags, :src)
+        elsif have_ffmpeg
+          tags = {"artist" => @artist, 
+                  "album" => @album, 
+                  "title" => @title}.inject([]) do |tags, (key, value)|
+            tags + ["-metadata", "#{key}=#{value.to_s}"]
+          end
+          tag_with_shell_command("ffmpeg", "-y", "-i", :src, "-loglevel", "quiet", tags, :dst)
+        else
+          raise(AudioInfoError, "implement me")
+        end
       end
-      
     end
     @needs_commit
   end
@@ -356,7 +360,7 @@ class AudioInfo
     ! @musicbrainz_infos.empty?
   end
 
-  private 
+  private
 
   def sanitize(input)
     s = input.is_a?(Array) ? input.first : input

data/lib/audioinfo/album.rb

@@ -89,7 +89,7 @@ class AudioInfo::Album
     end
     mb
   end
-  
+
   # return an array of images with "folder.*" in first
   def images
     self.class.images(@path)
@@ -122,17 +122,17 @@ class AudioInfo::Album
     out = StringIO.new
     out.puts(@path)
     out.print "'#{title}'"
-    
+
     unless va?
       out.print " by '#{@files.first.artist}' "
     end
 
     out.puts
-    
+
     @files.sort_by { |f| f.tracknum }.each do |f|
       out.printf("%02d %s %3d %s", f.tracknum, f.extension, f.bitrate, f.title)
       if va?
-	out.print(" "+f.artist)
+	      out.print(" "+f.artist)
       end
       out.puts
     end
@@ -143,7 +143,4 @@ class AudioInfo::Album
   def inspect
     @infos.inspect
   end
-
 end
-
-

data/test/test_wav.rb

@@ -0,0 +1,27 @@
+require_relative "../lib/audioinfo"
+require "minitest/autorun"
+
+require "fileutils"
+require "tmpdir"
+
+require_relative "test_helper"
+
+class TestWav < MiniTest::Unit::TestCase
+
+  WAV_FILE = "#{Dir.tmpdir}/ruby-audioinfo-test.wav" 
+
+  def setup
+    FileUtils.cp(File.join(SUPPORT_DIR, "piano2.wav"), WAV_FILE)
+  end
+
+  def test_wav_whitelist
+    i = AudioInfo.new(WAV_FILE)
+    assert_kind_of WaveFile::Info, i.info
+  end
+
+  def test_wav_length
+    i = AudioInfo.new(WAV_FILE)
+    assert_equal i.length, 6
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-audioinfo
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.5.0
 platform: ruby
 authors:
 - Guillaume Pierronnet
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-mp3info
@@ -101,28 +101,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 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,
@@ -149,9 +149,11 @@ files:
 - test/test_audioinfo.rb
 - test/test_case_insensitive_hash.rb
 - test/test_helper.rb
+- test/test_wav.rb
 - .gemtest
 homepage: http://ruby-audioinfo.rubyforge.org
-licenses: []
+licenses:
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -180,3 +182,4 @@ test_files:
 - test/test_audioinfo.rb
 - test/test_case_insensitive_hash.rb
 - test/test_helper.rb
+- test/test_wav.rb