ruby-audioinfo 0.2.3 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: be66808c6cbe04237d1052537ff0ad4fc2f3f614
+  data.tar.gz: b2843c08fe747e1c77cc94490ca266559539bc45
+SHA512:
+  metadata.gz: 8838cdedf9de87e385559086a0dbafd9bb315b3d8254673c0441ef234d9769435c4c3ee34bc88c2325e15d7a1f7108e8efd684e051e054ccbc75441550a45003
+  data.tar.gz: bf2999b9756f2ec4e986e28fdce3d2d169917802b99c1b565db5ed9d60bf1ceb70e2fe21a473b04af097e400c41eb64c7c9779514ba22f2bcc8d95238b6e2f9f

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.3 / 2013-03-26
+
+* correctly computes bitrate on .flac files
+* string encoding fixes on .flac files 
+* write support on .flac with "metaflac" binary
+* case insensitive wrapper to flacinfo's tags hash
+* uses "ffmpeg" binary for writing tags on not natively supported format
+
 === 0.2.3 / 2012-05-24
 
 * fixed title method on AudioInfo::Album, now returns nil if title is not found

data/Manifest.txt

@@ -5,4 +5,5 @@ Rakefile
 lib/audioinfo.rb
 lib/audioinfo/album.rb
 lib/audioinfo/mpcinfo.rb
+lib/audioinfo/case_insensitive_hash.rb
 test/mpcinfo.rb

data/Rakefile

@@ -17,8 +17,8 @@ Hoe.spec('ruby-audioinfo') do
   self.test_globs = ["test/test_*.rb"]
   self.rsync_args = "-rv --delete" 
 
-  extra_deps << ['ruby-mp3info', '>= 0.7.1']
-  extra_deps << ['ruby-ogginfo', '>= 0.6.9']
+  extra_deps << ['ruby-mp3info', '>= 0.8']
+  extra_deps << ['ruby-ogginfo', '>= 0.6.11']
   extra_deps << ['mp4info',      '>= 1.7.3']
   extra_deps << ['moumar-wmainfo-rb',   '>= 0.7']
   extra_deps << ['flacinfo-rb',  '>= 0.4']

data/lib/audioinfo.rb

@@ -11,6 +11,7 @@ require "apetag"
 $: << File.expand_path(File.dirname(__FILE__))
 
 require "audioinfo/mpcinfo"
+require "audioinfo/case_insensitive_hash"
 
 class AudioInfoError < StandardError ; end
 
@@ -35,10 +36,13 @@ class AudioInfo
 
   SUPPORTED_EXTENSIONS = %w{mp3 ogg mpc wma mp4 aac m4a flac}
 
-  VERSION = "0.2.3"
+  VERSION = "0.3.1"
 
   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)
@@ -161,20 +165,36 @@ class AudioInfo
 	
 	when 'flac'
 	  @info = FlacInfo.new(filename)
-	  @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"]
+	  # 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
+          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
-	  @bitrate = File.size(filename).to_f*8/@length/1024
+          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] = @info.tags[tagname]
+            @musicbrainz_infos[$1] = get_tag.call(tagname)
           end
           @musicbrainz_infos["trmid"] = @info.tags["musicip_puid"]
 	  #default_fill_musicbrainz_fields
-
 	else
 	  raise(AudioInfoError, "unsupported extension '.#{@extension}'")
       end
@@ -274,7 +294,27 @@ class AudioInfo
             fields["Track"] = @tracknum.to_s
           end
 	else
-	  raise(AudioInfoError, "implement me")
+          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
@@ -362,4 +402,32 @@ class AudioInfo
     # Return the stderr because faad prints info on that fd...
     status.exitstatus.zero? ? err : ''
   end
+
+  def shell_escape(s)
+    "'" + s.gsub(/'/) { "'\\''" } + "'"
+  end
+
+  def tag_with_shell_command(*command_arr)
+    expand_command = proc do |hash|
+      command_arr.collect do |token|
+        token.is_a?(Symbol) ? hash[token] : token
+      end.flatten
+    end
+
+    hash = {:src => @path}
+    if command_arr.include?(:dst)
+      Tempfile.open(["ruby-audioinfo", "."+@extension]) do |tf|
+        cmd = expand_command.call(hash.merge(:dst => tf.path))
+        tf.close
+        if system(*cmd)
+          FileUtils.mv(tf.path, @path)
+        else
+          raise(AudioInfoError, "error while running #{command_arr[0]}")
+        end
+      end
+    else
+      cmd = expand_command.call(hash)
+      system(*cmd) || raise(AudioInfoError, "error while running #{command_arr[0]}")
+    end
+  end
 end

data/lib/audioinfo/case_insensitive_hash.rb

@@ -0,0 +1,16 @@
+class CaseInsensitiveHash < Hash
+  def initialize(hash = {})
+    super
+    hash.each do |key, value|
+      self[key.downcase] = value
+    end
+  end
+  
+  def [](key)
+    super(key.downcase)
+  end
+
+  def []=(key, value)
+    super(key.downcase, value)
+  end
+end

data/test/test_audioinfo.rb

@@ -0,0 +1,35 @@
+require_relative "../lib/audioinfo"
+require "minitest/autorun"
+
+require "fileutils"
+require "tmpdir"
+
+require_relative "test_helper"
+
+class TestAudioinfo < MiniTest::Unit::TestCase
+
+  FLAC_FILE = "#{Dir.tmpdir}/ruby-audioinfo-test.flac" 
+
+  def setup
+    FileUtils.cp(File.join(SUPPORT_DIR, "440Hz-5sec.flac"), FLAC_FILE)
+  end
+
+  def test_flac_whitelist
+    i = AudioInfo.new(FLAC_FILE)
+    assert_kind_of FlacInfo, i.info
+  end
+
+  def test_flac_tags_wrapper
+    i = AudioInfo.new(FLAC_FILE)
+    assert_kind_of CaseInsensitiveHash, i.info.tags
+  end
+
+  def test_flac_writing
+    title = "test with utf8éblèàqsf"
+    ai = AudioInfo.new(FLAC_FILE)
+    ai.title = title
+    ai.close
+    ai = AudioInfo.new(FLAC_FILE)
+    assert_equal title, ai.title
+  end
+end

data/test/test_case_insensitive_hash.rb

@@ -0,0 +1,28 @@
+require "audioinfo"
+require "minitest/autorun"
+
+class TestCaseInsensitiveHash < MiniTest::Unit::TestCase
+
+  def test_string_access
+    h = CaseInsensitiveHash.new
+    h["foo"] = "bar"
+    assert_equal "bar", h["foo"]
+  end
+
+  def test_symbol_access
+    h = CaseInsensitiveHash.new
+    h[:foo] = "bar"
+    assert_equal "bar", h[:foo]
+  end
+
+  def test_case_insensitive_access
+    h = CaseInsensitiveHash.new
+    h["FOO"] = "bar"
+    assert_equal "bar", h["foo"]
+  end
+
+  def test_copy_constructor
+    h = CaseInsensitiveHash.new({"FOO" => "bar"})
+    assert_equal "bar", h["foo"]
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1 @@
+SUPPORT_DIR = File.expand_path("support", File.dirname(__FILE__))

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-audioinfo
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Guillaume Pierronnet
@@ -10,102 +9,124 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-mp3info
-  requirement: &70504490 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70504490
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: ruby-ogginfo
-  requirement: &70504040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: 0.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *70504040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.11
 - !ruby/object:Gem::Dependency
   name: mp4info
-  requirement: &70503440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.3
   type: :runtime
   prerelease: false
-  version_requirements: *70503440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: moumar-wmainfo-rb
-  requirement: &70502870 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70502870
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: flacinfo-rb
-  requirement: &70501980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70501980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: apetag
-  requirement: &70501120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70501120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70500210 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70500210
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70499640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :development
   prerelease: false
-  version_requirements: *70499640
-description: ! 'ruby-audioinfo glue together various audio ruby libraries and presents
-  a unified
-
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.5'
+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.'
+  wma, flac, aac, mp4, m4a.
 email:
 - guillaume.pierronnet@gmail.com
 - unknown
@@ -123,10 +144,15 @@ files:
 - lib/audioinfo.rb
 - lib/audioinfo/album.rb
 - lib/audioinfo/mpcinfo.rb
+- lib/audioinfo/case_insensitive_hash.rb
 - test/mpcinfo.rb
+- test/test_helper.rb
+- test/test_case_insensitive_hash.rb
+- test/test_audioinfo.rb
 - .gemtest
 homepage: http://ruby-audioinfo.rubyforge.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -134,22 +160,23 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ruby-audioinfo
-rubygems_version: 1.8.17
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ruby-audioinfo glue together various audio ruby libraries and presents a
   unified API to the developper
-test_files: []
+test_files:
+- test/test_helper.rb
+- test/test_case_insensitive_hash.rb
+- test/test_audioinfo.rb