ruby-audioinfo 0.1.5 → 0.1.7

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1.7 / 2010-06-18
+
+* included differents patches from Marcello Barnaba (see vtj-ruby-audioinfo fork)
+* support for ape tag writing (for .mpc and .ape files) through apetag gem
+
 === 0.1.5 / 2009-03-29
 
 * flac parsing more robust 

data/Rakefile

@@ -1,25 +1,48 @@
 require 'rubygems'
-require 'hoe'
-require 'lib/audioinfo.rb'
-#require "pp"
-
-hoe = Hoe.new('ruby-audioinfo', AudioInfo::VERSION) do |p|
-  p.rubyforge_name = 'ruby-audioinfo'
-  p.author = 'Guillaume Pierronnet'
-  p.email = 'moumar@rubyforge.org'
-  p.extra_deps << [ "ruby-mp3info", ">= 0.6.3"]
-  p.extra_deps << [ "ruby-ogginfo", ">= 0.3.1" ]
-  p.extra_deps << [ "MP4Info", ">= 0.3.2" ]
-  p.extra_deps << [ "wmainfo-rb", ">= 0.5" ]
-  p.extra_deps << "flacinfo-rb"
-  p.description = p.paragraphs_of('README.txt', 3).first
-  p.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."
-  p.url = "http://ruby-audioinfo.rubyforge.org"
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-  p.remote_rdoc_dir = ''
+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
 
-task :tag_svn do
-  svn_repo = "svn+ssh://rubyforge.org/var/svn/ruby-audioinfo"
-  sh "svn copy -m 'tagged version #{hoe.version}' #{svn_repo}/trunk #{svn_repo}/tags/REL-#{hoe.version}"
+Rake::RDocTask.new do |rd|
+  rd.main = "README.txt"
+  rd.rdoc_dir = "rdoc"
+  rd.rdoc_files.include("README.txt", "History.txt", "lib/**/*.rb")
+  rd.title = "ruby-audioinfo #{AudioInfo::VERSION}"
 end

data/lib/audioinfo.rb

@@ -1,18 +1,16 @@
-#!/usr/bin/env ruby
-
 require "iconv"
 require "stringio"
 
-$: << File.dirname(__FILE__)+"/audioinfo"
-
 require "mp3info"
 require "ogginfo"
-require "mpcinfo"
-require "apetag"
 require "wmainfo"
 require "mp4info"
 require "flacinfo"
-require "shell_escape"
+require "apetag"
+
+$: << File.expand_path(File.dirname(__FILE__))
+
+require "audioinfo/mpcinfo"
 
 class AudioInfoError < Exception ; end
 
@@ -30,7 +28,7 @@ class AudioInfo
 
   SUPPORTED_EXTENSIONS = %w{mp3 ogg mpc wma mp4 aac m4a flac}
 
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 
   attr_reader :path, :extension, :musicbrainz_infos, :tracknum, :bitrate, :vbr
   attr_reader :artist, :album, :title, :length, :date
@@ -138,7 +136,7 @@ class AudioInfo
 	  @length = @info.SECS
 	  mapping = MUSICBRAINZ_FIELDS.invert
 
-	  `faad -i #{filename.shell_escape} 2>&1 `.grep(/^MusicBrainz (.+)$/) do
+	  faad_info(filename).match(/^MusicBrainz (.+)$/) do
 	    name, value = $1.split(/: /, 2)
 	    key = mapping[name]
 	    @musicbrainz_infos[key] = value
@@ -251,6 +249,14 @@ class AudioInfo
 	    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
 	  raise(AudioInfoError, "implement me")
       end
@@ -287,31 +293,32 @@ class AudioInfo
     s.gsub("\000", "")
   end
 
-  def default_fill_musicbrainz_fields
+  def default_fill_musicbrainz_fields(tags = @info.tag)
     MUSICBRAINZ_FIELDS.keys.each do |field|
-      val = @info.tag["musicbrainz_#{field}"]
+      val = tags["musicbrainz_#{field}"]
       @musicbrainz_infos[field] = val if val
     end
   end
 
-  def default_tag_fill(tag = @info.tag)
+  def default_tag_fill(tags = @info.tag)
     %w{artist album title}.each do |v|
-      instance_variable_set( "@#{v}".to_sym, sanitize(tag[v].to_s) )
+      instance_variable_set( "@#{v}".to_sym, sanitize(tags[v].to_s) )
     end
   end
 
   def fill_ape_tag(filename)
     begin
       @info = ApeTag.new(filename)
-      tags = convert_tags_encoding(@info.tag, "UTF-8")
+      #tags = convert_tags_encoding(@info.fields, "UTF-8")
+      tags = @info.fields.inject({}) do |hash, (k, v)|
+        hash[k.downcase] = v ? v.first : nil
+        hash
+      end
+      default_fill_musicbrainz_fields(tags)
       default_tag_fill(tags)
-      default_fill_musicbrainz_fields
-      @date = @info.tag["year"]
-      @tracknum = 0
 
-      if track = @info.tag['track']
-        @tracknum = @info.tag['track'].split("/").first.to_i
-      end
+      @date = tags["year"]
+      @tracknum = tags['track'].to_i
     rescue ApeTagError
     end
   end
@@ -328,4 +335,29 @@ class AudioInfo
     end
     tags
   end
+
+  def faad_info(file)
+    stdout, stdout_w = IO.pipe
+    stderr, stderr_w = IO.pipe
+
+    fork do
+      stdout.close
+      stderr.close
+      STDOUT.reopen(stdout_w)
+      STDERR.reopen(stderr_w)
+      exec 'faad', '-i', file
+    end
+
+    stdout_w.close
+    stderr_w.close
+    pid, status = Process.wait2
+
+    out = stdout.read.chomp
+    stdout.close
+    err = stderr.read.chomp
+    stderr.close
+
+    # Return the stderr because faad prints info on that fd...
+    status.exitstatus.zero? ? err : ''
+  end
 end

data/lib/audioinfo/mpcinfo.rb

@@ -28,6 +28,8 @@ class MpcInfo
 
   FREQUENCIES = [ 44100, 48000, 37800, 32000 ]
 
+  SV4_6_HEADER = Regexp.new('^[\x00\x01\x10\x11\x40\x41\x50\x51\x80\x81\x90\x91\xC0\xC1\xD0\xD1][\x20-37][\x00\x20\x40\x60\x80\xA0\xC0\xE0]/', nil, 'n')
+
   attr_reader :infos
   attr_reader :id3v2_tag
 
@@ -144,7 +146,7 @@ class MpcInfo
       #$ThisFileInfo['audio']['encoder'] = @infos['encoder_version'];
       #$ThisFileInfo['audio']['encoder_options'] = @infos['profile'];
 =end
-    elsif mpc_header =~ /^[\x00\x01\x10\x11\x40\x41\x50\x51\x80\x81\x90\x91\xC0\xC1\xD0\xD1][\x20-37][\x00\x20\x40\x60\x80\xA0\xC0\xE0]/s
+    elsif mpc_header =~ SV4_6_HEADER
       # this is SV4 - SV6, handle seperately
       header_size = 8
     elsif mpc_header == "ID3"

metadata

@@ -1,124 +1,168 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-audioinfo
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  hash: 21
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Guillaume Pierronnet
+- Marcello Barnaba
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-03-28 23:00:00 +01:00
+date: 2010-06-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-mp3info
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 6
+        - 3
         version: 0.6.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ruby-ogginfo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 3
+        - 1
         version: 0.3.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: MP4Info
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mp4info
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.2
-    version: 
+        hash: 13
+        segments: 
+        - 1
+        - 7
+        - 3
+        version: 1.7.3
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: wmainfo-rb
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 5
         version: "0.5"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: flacinfo-rb
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        hash: 3
+        segments: 
+        - 0
+        - 4
+        version: "0.4"
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: apetag
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        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."
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
+  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: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
 - README.txt
 files: 
 - History.txt
-- Manifest.txt
 - README.txt
 - Rakefile
 - lib/audioinfo.rb
 - lib/audioinfo/album.rb
 - lib/audioinfo/apetag.rb
 - lib/audioinfo/mpcinfo.rb
-- lib/shell_escape.rb
 - test/mpcinfo.rb
 has_rdoc: true
 homepage: http://ruby-audioinfo.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: ruby-audioinfo
-rubygems_version: 1.3.1
+rubyforge_project: 
+rubygems_version: 1.3.7
 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."
+specification_version: 3
+summary: Unified audio info access library
 test_files: []
 

data/Manifest.txt

@@ -1,10 +0,0 @@
-History.txt
-Manifest.txt
-README.txt
-Rakefile
-lib/audioinfo.rb
-lib/audioinfo/album.rb
-lib/audioinfo/apetag.rb
-lib/audioinfo/mpcinfo.rb
-lib/shell_escape.rb
-test/mpcinfo.rb

data/lib/shell_escape.rb

@@ -1,6 +0,0 @@
-class String
-  # escape special characters used in most unix shells to use it, for example, with system()
-  def shell_escape
-    "'" + gsub(/'/) { "'\\''" } + "'"
-  end
-end