mediainfo 0.7.1 → 0.7.2

data/Changelog

@@ -1,3 +1,7 @@
+v0.7.2 More Stream Support
+- Added support for Text streams [Robert Mrasek]
+- Added support for Menu streams [Ned Campion]
+
 v0.7.1 Tweakage
 - Removed Mediainfo#parsed_response accessor which always returned nil after
   multi-stream API updates

data/README.markdown

@@ -3,23 +3,47 @@
 Mediainfo is a class wrapping [the mediainfo CLI](http://mediainfo.sourceforge.net).
 
 ## Installation
-  
+    
     $ gem install mediainfo
-  
+    
 ## Usage
-  
+    
     info = Mediainfo.new "/path/to/file"
-  
+    
 That will issue the system call to `mediainfo` and parse the output. 
 You can specify an alternate path if necessary:
-  
+    
     Mediainfo.path = "/opt/local/bin/mediainfo"
-  
-
-Now, from this point, I bet some *actual* usage examples would be great. Unfortunately, 
-I haven't really gotten around to proper documentation, yet. HOWEVER, please see the 
-very reasonable test suite accompanying the source code for this library. It contains 
-a bunch of relevant usage examples.
+    
+Once you have an info object, you can start inspecting streams and general metadata.
+    
+    info.streams.count # 2
+    info.audio?        # true
+    info.video?        # true
+    info.image?        # false
+    
+When inspecting specific types of streams, you have a couple general API options. The 
+first approach assumes one stream of a given type, a common scenario in many video files, 
+for example.
+    
+    info.video.count    # 1
+    info.audio.count    # 1
+    info.video.duration # 120 (seconds)
+    
+Sometimes you'll have more than one stream of a given type. Quicktime files can often 
+contain artifacts like this from somebody editing a more 'normal' file.
+    
+    info = Mediainfo.new "funky.mov"
+    
+    info.video?            # true
+    info.video.count       # 2
+    info.video.duration    # raises SingleStreamAPIError !
+    info.video[0].duration # 120
+    info.video[1].duration # 10
+    
+For some more usage examples, please see the very reasonable test suite accompanying the source code 
+for this library. It contains a bunch of relevant usage examples. More docs in the future.. contributions 
+*very* welcome!
 
 Moving on, REXML is used as the XML parser by default. If you'd like, you can 
 configure Mediainfo to use Hpricot or Nokogiri instead using one of 
@@ -41,10 +65,6 @@ a variety of information about a file. Some attributes may be present
 for some files where others are not, but any supported attribute 
 should at least return `nil`.
 
-For a list of all possible attributes supported:
-  
-    Mediainfo.supported_attributes
-  
 ## Requirements
 
 This requires at least the following version of the Mediainfo CLI:
@@ -61,3 +81,4 @@ generate XML output, and is no longer supported.
 * Peter Vandenberk      - [http://github.com/pvdb](http://github.com/pvdb)
 * Ned Campion           - [http://github.com/nedcampion](http://github.com/nedcampion)
 * Daniel Jagszent       - [http://github.com/d--j](http://github.com/d--j)
+* Robert Mrasek         - [http://github.com/derobo](http://github.com/derobo)

data/lib/mediainfo.rb

@@ -8,20 +8,49 @@ require "mediainfo/attr_readers"
 Mediainfo is a class wrapping [the mediainfo CLI](http://mediainfo.sourceforge.net).
 
 ## Installation
-  
-    $ gem install mediainfo -s http://gemcutter.org
-  
+    
+    $ gem install mediainfo
+    
 ## Usage
-  
+    
     info = Mediainfo.new "/path/to/file"
-  
+    
 That will issue the system call to `mediainfo` and parse the output. 
 You can specify an alternate path if necessary:
-  
+    
     Mediainfo.path = "/opt/local/bin/mediainfo"
-  
+    
+Once you have an info object, you can start inspecting streams and general metadata.
+    
+    info.streams.count # 2
+    info.audio?        # true
+    info.video?        # true
+    info.image?        # false
+    
+When inspecting specific types of streams, you have a couple general API options. The 
+first approach assumes one stream of a given type, a common scenario in many video files, 
+for example.
+    
+    info.video.count    # 1
+    info.audio.count    # 1
+    info.video.duration # 120 (seconds)
+    
+Sometimes you'll have more than one stream of a given type. Quicktime files can often 
+contain artifacts like this from somebody editing a more 'normal' file.
+    
+    info = Mediainfo.new "funky.mov"
+    
+    info.video?            # true
+    info.video.count       # 2
+    info.video.duration    # raises SingleStreamAPIError !
+    info.video[0].duration # 120
+    info.video[1].duration # 10
+    
+For some more usage examples, please see the very reasonable test suite accompanying the source code 
+for this library. It contains a bunch of relevant usage examples. More docs in the future.. contributions 
+*very* welcome!
 
-By default, REXML is used as the XML parser. If you'd like, you can 
+Moving on, REXML is used as the XML parser by default. If you'd like, you can 
 configure Mediainfo to use Hpricot or Nokogiri instead using one of 
 the following approaches:
 
@@ -62,6 +91,7 @@ class Mediainfo
   class Error < StandardError; end
   class ExecutionError < Error; end
   class IncompatibleVersionError < Error; end
+  class UnknownVersionError < Error; end
   
   def self.delegate(method_name, stream_type = nil)
     if stream_type == :general
@@ -72,13 +102,17 @@ class Mediainfo
   end
   
   def self.version
-    @version ||= `#{path} --Version`[/v([\d.]+)/, 1]
+    @version ||= `#{version_command}`[/v([\d.]+)/, 1]
+  end
+  
+  def self.version_command
+    "#{path} --Version"
   end
   
   # AttrReaders depends on this.
   def self.supported_attributes; @supported_attributes ||= []; end
   
-  SECTIONS             = [:general, :video, :audio, :image]
+  SECTIONS             = [:general, :video, :audio, :image, :menu, :text]
   NON_GENERAL_SECTIONS = SECTIONS - [:general]
   
   attr_reader :streams
@@ -313,6 +347,20 @@ class Mediainfo
    
     def frame_size; "#{width}x#{height}" if width or height; end
   end
+
+  class TextStream < Stream
+    mediainfo_attr_reader :stream_id, "ID"
+    mediainfo_attr_reader :format
+    mediainfo_attr_reader :codec_id, "Codec ID"
+    mediainfo_attr_reader :codec_info, "Codec ID/Info"
+  end
+  
+  class MenuStream < Stream
+    mediainfo_attr_reader :stream_id, "ID"
+    mediainfo_date_reader :encoded_date
+    mediainfo_date_reader :tagged_date
+    mediainfo_int_reader :delay
+  end
   
   Mediainfo::SECTIONS.each do |stream_type|
     class_eval %{
@@ -328,6 +376,14 @@ class Mediainfo
   ###
   
   def initialize(full_filename = nil)
+    unless mediainfo_version
+      raise UnknownVersionError,
+        "Unable to determine mediainfo version. " +
+        "We tried: #{self.class.version_command} " +
+        "Are you sure mediainfo is installed at #{self.class.path.inspect}? " + 
+        "Set Mediainfo.path = /where/is/mediainfo if it is not in your PATH."
+    end
+    
     if mediainfo_version < "0.7.25"
       raise IncompatibleVersionError,
         "Your version of mediainfo, #{mediainfo_version}, " +
@@ -395,7 +451,7 @@ class Mediainfo
     super.sub(/@raw_response=".+?", @/, %{@raw_response="...", @})
   end
   
-private
+  private
   def mediainfo!
     @last_command = "#{path} #{@escaped_full_filename} --Output=XML"
     run_command!

data/mediainfo.gemspec

@@ -2,28 +2,27 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mediainfo}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Seth Thomas Rasmussen"]
-  s.date = %q{2010-04-06}
+  s.authors = [%q{Seth Thomas Rasmussen}]
+  s.date = %q{2011-05-13}
   s.description = %q{Mediainfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)}
   s.email = %q{sethrasmussen@gmail.com}
-  s.extra_rdoc_files = ["LICENSE", "README.markdown", "lib/mediainfo.rb", "lib/mediainfo/attr_readers.rb", "lib/mediainfo/string.rb"]
-  s.files = ["Changelog", "LICENSE", "Manifest", "README.markdown", "Rakefile", "index.html.template", "lib/mediainfo.rb", "lib/mediainfo/attr_readers.rb", "lib/mediainfo/string.rb", "mediainfo.gemspec", "test/mediainfo_awaywego_test.rb", "test/mediainfo_broken_embraces_test.rb", "test/mediainfo_dinner_test.rb", "test/mediainfo_hats_test.rb", "test/mediainfo_multiple_streams_test.rb", "test/mediainfo_omen_image_test.rb", "test/mediainfo_string_test.rb", "test/mediainfo_test.rb", "test/mediainfo_vimeo_test.rb", "test/test_helper.rb"]
+  s.extra_rdoc_files = [%q{LICENSE}, %q{README.markdown}, %q{lib/mediainfo.rb}, %q{lib/mediainfo/attr_readers.rb}, %q{lib/mediainfo/string.rb}]
+  s.files = [%q{Changelog}, %q{LICENSE}, %q{Manifest}, %q{README.markdown}, %q{Rakefile}, %q{index.html.template}, %q{lib/mediainfo.rb}, %q{lib/mediainfo/attr_readers.rb}, %q{lib/mediainfo/string.rb}, %q{mediainfo.gemspec}, %q{test/mediainfo_awaywego_test.rb}, %q{test/mediainfo_broken_embraces_test.rb}, %q{test/mediainfo_dinner_test.rb}, %q{test/mediainfo_hats_test.rb}, %q{test/mediainfo_multiple_streams_test.rb}, %q{test/mediainfo_omen_image_test.rb}, %q{test/mediainfo_string_test.rb}, %q{test/mediainfo_subtilte_test.rb}, %q{test/mediainfo_test.rb}, %q{test/mediainfo_vimeo_test.rb}, %q{test/test_helper.rb}]
   s.homepage = %q{http://greatseth.github.com/mediainfo}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Mediainfo", "--main", "README.markdown"]
-  s.require_paths = ["lib"]
+  s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Mediainfo}, %q{--main}, %q{README.markdown}]
+  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{mediainfo}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.8.2}
   s.summary = %q{Mediainfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)}
-  s.test_files = ["test/mediainfo_awaywego_test.rb", "test/mediainfo_broken_embraces_test.rb", "test/mediainfo_dinner_test.rb", "test/mediainfo_hats_test.rb", "test/mediainfo_multiple_streams_test.rb", "test/mediainfo_omen_image_test.rb", "test/mediainfo_string_test.rb", "test/mediainfo_test.rb", "test/mediainfo_vimeo_test.rb", "test/test_helper.rb"]
+  s.test_files = [%q{test/mediainfo_awaywego_test.rb}, %q{test/mediainfo_broken_embraces_test.rb}, %q{test/mediainfo_dinner_test.rb}, %q{test/mediainfo_hats_test.rb}, %q{test/mediainfo_multiple_streams_test.rb}, %q{test/mediainfo_omen_image_test.rb}, %q{test/mediainfo_string_test.rb}, %q{test/mediainfo_subtilte_test.rb}, %q{test/mediainfo_test.rb}, %q{test/mediainfo_vimeo_test.rb}, %q{test/test_helper.rb}]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/test/mediainfo_multiple_streams_test.rb

@@ -8,7 +8,7 @@ class MediainfoMultipleStreamsTest < ActiveSupport::TestCase
 
   ### GENERAL
   
-  test_stream_type_queries :expect => [:audio, :video]
+  test_stream_type_queries :expect => [:audio, :video, :menu]
   
   test "format" do
     assert_equal "MPEG-4", @info.format
@@ -513,4 +513,14 @@ class MediainfoMultipleStreamsTest < ActiveSupport::TestCase
   ### IMAGE
   
   mediainfo_test_not_an_image
+  
+  ### MENU
+  
+  test "menu" do
+    assert @info.menu?
+    assert @info.menu.stream_id
+    assert @info.menu.encoded_date
+    assert @info.menu.tagged_date
+    assert @info.menu.delay
+  end
 end

data/test/mediainfo_subtilte_test.rb

@@ -0,0 +1,44 @@
+require "test_helper"
+require "mediainfo_test_helper"
+
+class MediainfoSubtitleTest < ActiveSupport::TestCase
+  def setup
+    @info = mediainfo_mock "subtitle"
+  end
+
+  test 'text streams count' do
+    assert_equal 4, @info.text.count
+  end
+
+  test "text 1 stream id" do
+    assert_equal "1", @info.text[0].stream_id
+  end
+
+  test "text 1 Format" do
+    assert_equal "ASS", @info.text[0].format
+  end
+
+  test "text 1   Codec ID" do
+    assert_equal "S_TEXT/ASS", @info.text[0].codec_id
+  end
+
+  test "text 1   Codec ID info" do
+    #assert_equal "Advanced Sub Station Alpha", @info.text[0].codec_id_info
+  end
+
+  test "text 2 stream id" do
+    assert_equal "2", @info.text[1].stream_id
+  end
+
+  test "text 1 Format" do
+    assert_equal "SSA", @info.text[1].format
+  end
+
+  test "text 1   Codec ID" do
+    assert_equal "S_TEXT/SSA", @info.text[1].codec_id
+  end
+
+  test "text 1   Codec ID info" do
+    #assert_equal "Sub Station Alpha", @info.text[1].codec_id_info
+  end
+end

data/test/mediainfo_test.rb

@@ -83,7 +83,20 @@ class MediainfoTest < ActiveSupport::TestCase
     :image_format,
 
     :image_width,
-    :image_height
+    :image_height,
+    
+    ### MENU
+    
+    :menu_stream_id,
+    :menu_tagged_date,
+    :menu_encoded_date,
+    :menu_delay,
+    
+    ### TEXT
+    :text_codec_id,
+    :text_codec_info,
+    :text_format,
+    :text_stream_id
   ]
   
   Mediainfo.supported_attributes.each do |attribute|
@@ -131,4 +144,9 @@ class MediainfoTest < ActiveSupport::TestCase
     Mediainfo.any_instance.stubs(:mediainfo_version).returns("0.7.10")
     assert_raises(Mediainfo::IncompatibleVersionError) { Mediainfo.new }
   end
+  
+  test "fails obviously when CLI is not installed" do
+    Mediainfo.any_instance.stubs(:mediainfo_version).returns(nil)
+    assert_raises(Mediainfo::UnknownVersionError) { Mediainfo.new }
+  end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mediainfo
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 1
-  version: 0.7.1
+  prerelease: 
+  version: 0.7.2
 platform: ruby
 authors: 
 - Seth Thomas Rasmussen
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 -04:00
-default_executable: 
+date: 2011-05-13 00:00:00 Z
 dependencies: []
 
 description: Mediainfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)
@@ -41,7 +36,17 @@ files:
 - lib/mediainfo/attr_readers.rb
 - lib/mediainfo/string.rb
 - mediainfo.gemspec
-has_rdoc: true
+- test/mediainfo_awaywego_test.rb
+- test/mediainfo_broken_embraces_test.rb
+- test/mediainfo_dinner_test.rb
+- test/mediainfo_hats_test.rb
+- test/mediainfo_multiple_streams_test.rb
+- test/mediainfo_omen_image_test.rb
+- test/mediainfo_string_test.rb
+- test/mediainfo_subtilte_test.rb
+- test/mediainfo_test.rb
+- test/mediainfo_vimeo_test.rb
+- test/test_helper.rb
 homepage: http://greatseth.github.com/mediainfo
 licenses: []
 
@@ -56,24 +61,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 2
       version: "1.2"
 requirements: []
 
 rubyforge_project: mediainfo
-rubygems_version: 1.3.6
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Mediainfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)
@@ -85,6 +87,7 @@ test_files:
 - test/mediainfo_multiple_streams_test.rb
 - test/mediainfo_omen_image_test.rb
 - test/mediainfo_string_test.rb
+- test/mediainfo_subtilte_test.rb
 - test/mediainfo_test.rb
 - test/mediainfo_vimeo_test.rb
 - test/test_helper.rb