ruby-audioinfo 0.1.7 → 0.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.2 / 2012-02-27
+
+* text encoding issues fixed
+* updated dependencies
+
 === 0.1.7 / 2010-06-18
 
 * included differents patches from Marcello Barnaba (see vtj-ruby-audioinfo fork)

data/Manifest.txt

@@ -0,0 +1,8 @@
+History.txt
+Manifest.txt
+README.rdoc
+Rakefile
+lib/audioinfo.rb
+lib/audioinfo/album.rb
+lib/audioinfo/mpcinfo.rb
+test/mpcinfo.rb

data/{README.txt → README.rdoc}

@@ -1,8 +1,10 @@
 = ruby-audioinfo
 
-by Guillaume Pierronnet
 * http://ruby-audioinfo.rubyforge.org
 * http://rubyforge.org/projects/ruby-audioinfo/
+* https://github.com/moumar/ruby-audioinfo
+
+by Guillaume Pierronnet
 
 == DESCRIPTION:
 

data/Rakefile

@@ -1,48 +1,40 @@
+# -*- ruby -*-
+
+require 'hoe'
+
+Hoe.plugin :yard
+Hoe.plugin :gemspec
+
+Hoe.spec('ruby-audioinfo') do 
+  developer "Guillaume Pierronnet", "guillaume.pierronnet@gmail.com"
+  developer 'Marcello Barnaba', "unknown"
+  remote_rdoc_dir = ''
+  rdoc_locations << "rubyforge.org:/var/www/gforge-projects/ruby-audioinfo/"
+
+  self.extra_rdoc_files = FileList["*.rdoc"]
+  #history_file = "History.txt"
+  self.readme_file = "README.rdoc"
+  self.test_globs = ["test/test_*.rb"]
+  self.rsync_args = "-rv --delete" 
+
+  extra_deps << ['ruby-mp3info', '>= 0.7.1']
+  extra_deps << ['ruby-ogginfo', '>= 0.6.8']
+  extra_deps << ['mp4info',      '>= 1.7.3']
+  extra_deps << ['moumar-wmainfo-rb',   '>= 0.7']
+  extra_deps << ['flacinfo-rb',  '>= 0.4']
+  extra_deps << ['apetag',       '>= 1.1.4']
+  #extra_dev_deps << ["rake", ">=0"]
+end
+
+=begin
+# vim: syntax=Ruby
 require 'rubygems'
 require "rake/rdoctask"
 
-require File.join(File.expand_path(File.dirname(__FILE__)), 'lib', 'audioinfo')
-
-begin
-  require 'jeweler'
-
-  #Jeweler::GemcutterTasks.new
-
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name        = 'ruby-audioinfo'
-    gemspec.version     = AudioInfo::VERSION
-    gemspec.authors     = ['Guillaume Pierronnet', 'Marcello Barnaba']
-    gemspec.email       = 'moumar@rubyforge.org'
-    gemspec.date        = '2010-03-20'
-
-    gemspec.homepage    = 'http://ruby-audioinfo.rubyforge.org'
-    gemspec.summary     = 'Unified audio info access library'
-    gemspec.description = 'ruby-audioinfo glues together various audio libraries and presents a single API to the developer.'
-                          'Currently, supported formats are: mp3, ogg, mpc, ape, wma, flac, aac, mp4, m4a.'
-
-    gemspec.files            = %w( README.txt Rakefile History.txt) + Dir['{lib,test}/**/*']
-    gemspec.extra_rdoc_files = %w( README.txt )
-    gemspec.has_rdoc         = true
-    gemspec.require_path     = 'lib'
-
-    gemspec.add_dependency 'ruby-mp3info', '>= 0.6.3'
-    gemspec.add_dependency 'ruby-ogginfo', '>= 0.3.1'
-    gemspec.add_dependency 'mp4info',      '>= 1.7.3'
-    gemspec.add_dependency 'wmainfo-rb',   '>= 0.5'
-    gemspec.add_dependency 'flacinfo-rb',  '>= 0.4'
-    gemspec.add_dependency 'apetag',  '= 1.1.2'
-  end
-  Jeweler::GemcutterTasks.new  
-
-  Jeweler::RubyforgeTasks.new
-
-rescue LoadError
-  puts 'Jeweler not available. Install it with: gem install jeweler'
-end
-
 Rake::RDocTask.new do |rd|
-  rd.main = "README.txt"
+  rd.main = "README.rdoc"
   rd.rdoc_dir = "rdoc"
-  rd.rdoc_files.include("README.txt", "History.txt", "lib/**/*.rb")
+  rd.rdoc_files.include("README.rdoc", "History.txt", "lib/**/*.rb")
   rd.title = "ruby-audioinfo #{AudioInfo::VERSION}"
 end
+=end

data/lib/audioinfo/album.rb

@@ -43,12 +43,15 @@ class AudioInfo::Album
     @path = path
     @multicd = false
     @basename = @path
-    exts = AudioInfo::SUPPORTED_EXTENSIONS.join(",")
+    exts = AudioInfo::SUPPORTED_EXTENSIONS.collect do |ext|
+      ext.gsub(/[a-z]/) { |c| "[#{c.downcase}#{c.upcase}]" }
+    end.join(",")
 
     # need to escape the glob path
     glob_escaped_path = @path.gsub(/([{}?*\[\]])/) { |s| '\\' << s }
 
-    file_names = Dir.glob( File.join(glob_escaped_path, "*.{#{exts}}") , File::FNM_CASEFOLD).sort
+    glob_val = File.join(glob_escaped_path, "*.{#{exts}}")
+    file_names = Dir.glob(glob_val).sort
 
     if fast_lookup
       file_names = [file_names.first, file_names.last]
@@ -104,12 +107,8 @@ class AudioInfo::Album
 
   # title of the album
   def title
-    albums = @files.collect { |f| f.album }.uniq
-    #if albums.size > 1
-    #  "#{albums.first} others candidates: '" + albums[1..-1].join("', '") + "'"
-    #else
-      albums.first
-    #end
+    hash_counted = self.files.collect { |f| f.album }.inject(Hash.new(0)) { |hash, album| hash[album] += 1; hash }
+    hash_counted.sort_by { |k, v| v }.last[0]
   end
 
   # mbid (MusicBrainz ID) of the album
@@ -146,6 +145,10 @@ class AudioInfo::Album
     out.string
   end
 
+  def inspect
+    @infos.inspect
+  end
+
 end
 
 

data/lib/audioinfo/mpcinfo.rb

@@ -52,7 +52,7 @@ class MpcInfo
       header = StringIO.new(@file.read(25))
       header_size = 28
       #stream_version_byte = header.read(4).unpack("V").first 
-      stream_version_byte = header.read(1)[0] #.unpack("c").first 
+      stream_version_byte = header.read(1)[0].ord #.unpack("c").first 
 
       @infos['stream_major_version'] = (stream_version_byte & 0x0F)
       @infos['stream_minor_version'] = (stream_version_byte & 0xF0) >> 4
@@ -168,7 +168,7 @@ class MpcInfo
   end
   
   def read8(io)
-    io.read(1)[0]
+    io.read(1)[0].ord
   end
 
   def read16(io)

data/lib/audioinfo.rb

@@ -1,4 +1,4 @@
-require "iconv"
+# encoding: utf-8
 require "stringio"
 
 require "mp3info"
@@ -15,6 +15,13 @@ require "audioinfo/mpcinfo"
 class AudioInfoError < Exception ; end
 
 class AudioInfo
+  if RUBY_VERSION[0..2] == "1.8"
+    RUBY_1_8 = true
+    require "iconv"
+  else
+    RUBY_1_8 = false
+  end
+
   MUSICBRAINZ_FIELDS = { 
     "trmid" 	=> "TRM Id",
     "artistid" 	=> "Artist Id",
@@ -28,7 +35,7 @@ class AudioInfo
 
   SUPPORTED_EXTENSIONS = %w{mp3 ogg mpc wma mp4 aac m4a flac}
 
-  VERSION = "0.1.7"
+  VERSION = "0.2"
 
   attr_reader :path, :extension, :musicbrainz_infos, :tracknum, :bitrate, :vbr
   attr_reader :artist, :album, :title, :length, :date
@@ -49,20 +56,29 @@ class AudioInfo
     ret
   end
 
-  # open the file with path +fn+ and convert all tags from/to specified +encoding+
-  def initialize(filename, encoding = 'utf-8')
+  # test whether +path+ is a valid and supported audiofile
+  def self.is_audio_file?(path)
+    begin
+      AudioInfo.new(path)
+      return true
+    rescue  AudioInfoError
+      return false
+    end
+  end
+
+  # open the file with path +fn+
+  def initialize(filename)
     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
     @musicbrainz_infos = {}
-    @encoding = encoding
 
     begin
       case @extension
 	when 'mp3'
-	  @info = Mp3Info.new(filename, :encoding => @encoding)
+	  @info = Mp3Info.new(filename)
 	  default_tag_fill
 	  #"TXXX"=>
 	  #["MusicBrainz TRM Id\000",
@@ -90,7 +106,7 @@ class AudioInfo
 	  @info.close
 
 	when 'ogg'
-	  @info = OggInfo.new(filename, @encoding)
+	  @info = OggInfo.new(filename)
 	  default_fill_musicbrainz_fields
 	  default_tag_fill
           @bitrate = @info.bitrate/1000
@@ -111,7 +127,7 @@ class AudioInfo
 	  fill_ape_tag(filename)
 
         when 'wma'
-	  @info = WmaInfo.new(filename, :encoding => @encoding)
+	  @info = WmaInfo.new(filename, :encoding => 'utf-8')
 	  @artist = @info.tags["Author"]
 	  @album = @info.tags["AlbumTitle"]
 	  @title = @info.tags["Title"]
@@ -125,7 +141,8 @@ class AudioInfo
               @info.info["MusicBrainz/" + original_key]
 	  end
           
-	when 'aac', 'mp4', 'm4a'
+	when 'mp4', 'aac', 'm4a'
+          @extension = 'mp4'
 	  @info = MP4Info.open(filename)
 	  @artist = @info.ART
 	  @album = @info.ALB
@@ -144,19 +161,18 @@ class AudioInfo
 	
 	when 'flac'
 	  @info = FlacInfo.new(filename)
-          tags = convert_tags_encoding(@info.tags, "UTF-8")
-	  @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"]
+	  @artist = @info.tags["ARTIST"] || @info.tags["artist"]
+	  @album = @info.tags["ALBUM"] || @info.tags["album"]
+	  @title = @info.tags["TITLE"] || @info.tags["title"]
+	  @tracknum = (@info.tags["TRACKNUMBER"]||@info.tags["tracknumber"]).to_i
+	  @date = @info.tags["DATE"]||@info.tags["date"]
 	  @length = @info.streaminfo["total_samples"] / @info.streaminfo["samplerate"].to_f
 	  @bitrate = File.size(filename).to_f*8/@length/1024
-          tags.each do |tagname, tagvalue|
+          @info.tags.each do |tagname, tagvalue|
             next unless tagname =~ /^musicbrainz_(.+)$/
-            @musicbrainz_infos[$1] = tags[tagname]
+            @musicbrainz_infos[$1] = @info.tags[tagname]
           end
-          @musicbrainz_infos["trmid"] = tags["musicip_puid"]
+          @musicbrainz_infos["trmid"] = @info.tags["musicip_puid"]
 	  #default_fill_musicbrainz_fields
 
 	else
@@ -233,14 +249,14 @@ class AudioInfo
     if @needs_commit
       case @info
         when Mp3Info
-	  Mp3Info.open(@path, :encoding => @encoding) do |info|
+	  Mp3Info.open(@path) do |info|
 	    info.tag.artist = @artist
 	    info.tag.title = @title
 	    info.tag.album = @album
 	    info.tag.tracknum = @tracknum
 	  end
 	when OggInfo
-	  OggInfo.open(@path, @encoding) do |ogg|
+	  OggInfo.open(@path) do |ogg|
             { "artist" => @artist,
 	      "album"  => @album,
 	      "title"  => @title,
@@ -302,14 +318,13 @@ class AudioInfo
 
   def default_tag_fill(tags = @info.tag)
     %w{artist album title}.each do |v|
-      instance_variable_set( "@#{v}".to_sym, sanitize(tags[v].to_s) )
+      instance_variable_set( "@#{v}".to_sym, sanitize(tags[v]||"") )
     end
   end
 
   def fill_ape_tag(filename)
     begin
       @info = ApeTag.new(filename)
-      #tags = convert_tags_encoding(@info.fields, "UTF-8")
       tags = @info.fields.inject({}) do |hash, (k, v)|
         hash[k.downcase] = v ? v.first : nil
         hash
@@ -323,19 +338,6 @@ class AudioInfo
     end
   end
 
-  def convert_tags_encoding(tags_orig, from_encoding)
-    tags = {}
-    Iconv.open(@encoding, from_encoding) do |ic|
-      tags_orig.inject(tags) do |hash, (k, v)| 
-        if v.is_a?(String)
-          hash[ic.iconv(k)] = ic.iconv(v)
-        end
-        hash
-      end
-    end
-    tags
-  end
-
   def faad_info(file)
     stdout, stdout_w = IO.pipe
     stderr, stderr_w = IO.pipe

metadata

@@ -1,168 +1,155 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-audioinfo
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 7
-  version: 0.1.7
+version: !ruby/object:Gem::Version
+  version: '0.2'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Guillaume Pierronnet
 - Marcello Barnaba
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-06-18 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby-mp3info
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &83894570 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 6
-        - 3
-        version: 0.6.3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby-ogginfo
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *83894570
+- !ruby/object:Gem::Dependency
+  name: ruby-ogginfo
+  requirement: &83894300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
-        version: 0.3.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.8
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mp4info
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *83894300
+- !ruby/object:Gem::Dependency
+  name: mp4info
+  requirement: &83893930 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 7
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.7.3
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: wmainfo-rb
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *83893930
+- !ruby/object:Gem::Dependency
+  name: moumar-wmainfo-rb
+  requirement: &83893420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: flacinfo-rb
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *83893420
+- !ruby/object:Gem::Dependency
+  name: flacinfo-rb
+  requirement: &83893200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: apetag
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *83893200
+- !ruby/object:Gem::Dependency
+  name: apetag
+  requirement: &83892940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
-        version: 1.1.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.4
   type: :runtime
-  version_requirements: *id006
-description: ruby-audioinfo glues together various audio libraries and presents a single API to the developer.
-email: moumar@rubyforge.org
-executables: []
+  prerelease: false
+  version_requirements: *83892940
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &83892710 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: *83892710
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &83892490 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: *83892490
+description: ! 'ruby-audioinfo glue together various audio ruby libraries and presents
+  a unified
 
-extensions: []
+  API to the developper. Currently, supported formats are: mp3, ogg, mpc, ape,
 
-extra_rdoc_files: 
-- README.txt
-files: 
+  wma, flac, aac, mp4, m4a.'
+email:
+- guillaume.pierronnet@gmail.com
+- unknown
+executables: []
+extensions: []
+extra_rdoc_files:
+- History.txt
+- Manifest.txt
+- README.rdoc
+files:
 - History.txt
-- README.txt
+- Manifest.txt
+- README.rdoc
 - Rakefile
 - lib/audioinfo.rb
 - lib/audioinfo/album.rb
-- lib/audioinfo/apetag.rb
 - lib/audioinfo/mpcinfo.rb
 - test/mpcinfo.rb
-has_rdoc: true
+- .gemtest
 homepage: http://ruby-audioinfo.rubyforge.org
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options:
+- --main
+- README.rdoc
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: ruby-audioinfo
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Unified audio info access library
+summary: ruby-audioinfo glue together various audio ruby libraries and presents a
+  unified API to the developper
 test_files: []
-

data/lib/audioinfo/apetag.rb

@@ -1,53 +0,0 @@
-# see http://www.personal.uni-jena.de/~pfk/mpp/sv8/apetag.html for specs
-
-class ApeTagError < StandardError ; end
-
-class ApeTag
-  attr_reader :tag, :version
-
-  def initialize(filename)
-    @tag = {}
-
-    begin
-      @file = File.new(filename, "rb")
-      @file.seek(-32, IO::SEEK_END)
-
-      preamble, version, tagsize, itemcount, flags = 
-        @file.read(24).unpack("A8VVVV")
-      @version = version/1000
-
-      raise(ApeTagError, "cannot find preamble") if preamble != 'APETAGEX'
-      @file.seek(-tagsize, IO::SEEK_END)
-      itemcount.times do |i|
-        len, flags = @file.read(8).unpack("VV")
-	key = ""
-	loop do
-	  c = @file.getc
-	  break if c == 0
-	  key << c
-	end
-	#ugly FIX
-	@tag[key.downcase] = @file.read(len) unless len > 100_000
-      end
-    ensure
-      @file.close
-    end
-  end
-end
-
-if $0 == __FILE__
-  while filename = ARGV.shift
-    puts "Getting info from #{filename}"
-    begin
-      ape = ApeTag.new(filename)
-    rescue ApeTagError
-     puts "error: doesn't appear to be an ape tagged file"
-    else
-      puts ape
-      ape.tag.each do |key, value|
-        puts "#{key} => #{value}"
-      end
-    end
-    puts
-  end
-end