mediainfo 0.7.2 → 1.0.1

data/lib/mediainfo/errors.rb

@@ -0,0 +1,14 @@
+module MediaInfo
+  # General
+  class Error < StandardError; end
+  class EnvironmentError < Error; end
+  class ExecutionError < Error; end
+  class IncompatibleVersionError < Error; end
+  class UnknownVersionError < Error; end
+  class RemoteUrlError < Error; end
+  # Stream
+  class SingleStreamAPIError < RuntimeError; end
+  class NoStreamsForProxyError < NoMethodError; end
+  class InvalidTrackType < Error; end
+  class InvalidTrackAttributeValue < Error; end
+end

data/lib/mediainfo/string.rb

@@ -12,14 +12,4 @@ class String
   def shell_escape_double_quotes
     '"'+gsub(/\\|"|\$|`/, '\\\\\0')+'"'
   end unless method_defined?(:shell_escape_double_quotes)
-  
-  # stolen from active_support/inflector
-  # TODO require "active_support/core_ext/string/inflections" when 3.0 is released
-  def underscore
-    gsub(/::/, '/').
-    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-    gsub(/([a-z\d])([A-Z])/,'\1_\2').
-    tr("-", "_").
-    downcase
-  end unless method_defined?(:underscore)
 end

data/lib/mediainfo/tracks.rb

@@ -0,0 +1,172 @@
+require 'time'
+require 'yaml' # Used for standardization methods
+module MediaInfo
+  class Tracks
+
+    # Needed so that .image?, when there is no Image track, doesn't throw NoMethodError
+    def method_missing( name, *args )
+      nil # We use nil here instead of false as nil should be understood by the client/requester as false. We might not want to specifically return false for other missing methods
+    end
+
+    attr_reader :xml, :track_types, :attribute_standardization_rules
+
+    def initialize(input = nil)
+      if input && input.include?('<?xml')
+        @xml = input
+        @track_types = []
+        @attribute_standardization_rules = YAML.load_file("#{Gem::Specification.find_by_name('mediainfo').gem_dir}/lib/attribute_standardization_rules.yml")
+        # Populate Streams
+        case MediaInfo.xml_parser
+        when 'nokogiri'
+          converted_xml = ::Nokogiri::XML(self.xml)
+          converted_xml.css('//track').each { |track| # Have to use .css here due to iphone6 MediaInfo structure
+            track_elements = Attributes.new(track.children.select{ |n| n.is_a? ::Nokogiri::XML::Element }.map{ |parameter|
+              parameter.name = standardize_element_name(parameter.name) # Turn various element names into standardized versions (Bit_rate to Bitrate)
+              if parameter.text.include?("\n") # if it has children (extra in iphone6+_video.mov.xml)
+                [parameter.name, parameter.children.select { |n| n.is_a? ::Nokogiri::XML::Element }.map{ |parameter| [parameter.name, parameter.text]}]
+              else
+                [parameter.name, parameter.text]
+              end
+            })
+            track_type = sanitize_track_type(@track_types,track.attributes.map{ |k,v| { :name => v.name, :value => v.value } },track.children.css('ID').map{ |el| el.text })
+            @track_types << track_type
+            MediaInfo.set_singleton_method(self,track_type,track_elements)
+          }
+        else # DEFAULT REXML
+          converted_xml = ::REXML::Document.new(self.xml)
+          converted_xml.elements.each('//track') { |track|
+            track_elements = Attributes.new(track.children.select { |n| n.is_a? ::REXML::Element }.map{ |parameter|
+              parameter.name = standardize_element_name(parameter.name)
+              if parameter.text.include?("\n") # if it has children (extra in iphone6+_video.mov.xml)
+                [parameter.name, parameter.children.select { |n| n.is_a? ::REXML::Element }.map{ |parameter| [parameter.name, parameter.text]}]
+              else
+                [parameter.name, parameter.text]
+              end
+            })
+            track_type = sanitize_track_type(@track_types,track.attributes.map{ |attr| { :name => attr[0], :value => attr[1] } },track.elements.detect{|el| el.name == 'id' }.to_a)
+            @track_types << track_type
+            MediaInfo.set_singleton_method(self,track_type,track_elements)
+          }
+        end
+
+        # Add {type}?
+        @track_types.each{ |track_type|
+          define_singleton_method("#{track_type}?"){ # Can't use set_singleton_method due to ?
+            self.track_types.any?(__method__.to_s.gsub('?',''))
+          }
+        }
+        # Add {type}.count singleton_method
+        @track_types.each{ |track_type|
+          MediaInfo.set_singleton_method(self.instance_variable_get("@#{track_type}"),'count',@track_types.grep(/#{track_type}/).count)
+        }
+
+      else
+        raise ArgumentError, 'Input must be raw XML.'
+      end
+    end # end Initialize
+
+    # Standardize our Element Names
+    ## Relies on valid YAML in lib/attribute_standardization_rules.yml
+    def standardize_element_name(name)
+      self.attribute_standardization_rules[name].nil? ? name : self.attribute_standardization_rules[name]
+    end
+
+    class Attributes
+
+      # Needed so that sanitize_elements doesn't throw NoMethodError
+      def method_missing( name, *args )
+        nil # We use nil here instead of false as nil should be understood by the client/requester as false. We might not want to specifically return false for other missing methods
+      end
+
+      def initialize(params)
+        params.each{ |param|
+          if param[1].is_a?(Array)
+            MediaInfo.set_singleton_method(self,param[0],Extra.new(param[1]))
+          else
+            MediaInfo.set_singleton_method(self,param[0],MediaInfo::Tracks::Attributes.sanitize_element_value(param))
+          end
+        }
+      end
+
+      class Extra
+        def initialize(params)
+          params.each{ |param| MediaInfo.set_singleton_method(self,param[0],MediaInfo::Tracks::Attributes.sanitize_element_value(param)) }
+        end
+      end
+
+      def self.sanitize_element_value(param)
+        name = param[0]
+        value = param[1]
+        case
+        # Convert String with integer in it to Integer.
+        ## Don't to_f anything with 2 or more dots (versions,etc)
+        when value.match(/(?!\.)\D+/).nil? then
+          if value.scan(/\./).any? && value.scan(/\./).count > 1
+            value
+          elsif value.scan(/\./).any?
+            value.to_f
+          else # Prevent float if it's just a normal integer
+            value.to_i
+          end
+        # Duration
+        when ['Duration'].include?(name) then standardize_to_milliseconds(value)
+        # Dates
+        ## Be sure the name has "date" and it has an integer and a dash, like a normal date would
+        when name.downcase.include?('date') && !value.match(/\d-/).nil? then Time.parse(value)
+        else
+          return value
+        end
+      end
+
+      def self.standardize_to_milliseconds(value)
+        # TODO iphone video has a float as the duration
+        # UPDATE THE README IF YOU'RE CHANGING THIS
+        milliseconds = 0
+        value.scan(/\d+\s?\w+/).each do |chunk|
+          case chunk
+          when /\d+\s?h/    then milliseconds += chunk.to_i * 60 * 60 * 1000
+          when /\d+\s?hour/ then milliseconds += chunk.to_i * 60 * 60 * 1000
+          when /\d+\s?m/    then milliseconds += chunk.to_i * 60 * 1000
+          when /\d+\s?mn/   then milliseconds += chunk.to_i * 60 * 1000
+          when /\d+\s?min/  then milliseconds += chunk.to_i * 60 * 1000
+          when /\d+\s?s/    then milliseconds += chunk.to_i * 1000
+          when /\d+\s?sec/  then milliseconds += chunk.to_i * 1000
+          when /\d+\s?ms/   then milliseconds += chunk.to_i
+          end
+        end
+        milliseconds = value if milliseconds == 0 # We don't raise anymore. It's much better for the gem to work, returning the original MediaInfo attribute, than raise.
+        return milliseconds
+      end
+
+    end
+
+
+    # Used for handling duplicate track types with differing streamid, etc
+    # Takes an array of attributes and returns the track_name
+    ## Parameters must meet the following structure:
+    # TRACK_TYPES: ['video','video2','text'] or [] if nothing created yet
+    # TRACK_ATTRIBUTES: [{:name=>"type", :value=>"Text" }] or [] if not found
+    # TRACK_ID: ["1"] or [] if not found
+    def sanitize_track_type(track_types,track_attributes,track_id)
+      raise("Unable to sanitize a track type due to missing 'type' attribute in on of the elements: \n #{track_attributes}") if (type_attr_value = track_attributes.detect{ |attr| attr[:name] == 'type' }[:value]).nil?
+      if (streamid = track_attributes.detect{ |attr| attr[:name] == 'streamid' || attr[:name] == 'typeorder' }).nil? # No StreamId, however, ensuring that if the streamid is there we use it ## We must still manually specify the id attr until https://sourceforge.net/p/mediainfo/discussion/297610/thread/f17a0cf5/ is answered
+        ## Even if no streamid we need to check for duplicate track names and append an integer. ONLY WORKS IF DUPLICATE TRACKS ARE CONSECUTIVE
+        if track_types.include?(type_attr_value.downcase)
+          if !track_id.nil? && !track_id.empty? && track_id.first.to_s.to_i > 1 ## If the track has an ID child, and it's an integer above 1 (if it's a string, to_i returns 0) (if to_i returns > 1 so we can match id convention of video vs video1; see code below this section), use that
+            type = "#{type_attr_value}#{track_id.first}"
+          else
+            type = "#{type_attr_value}#{track_types.grep(/#{type_attr_value.downcase}/).count + 1}"
+          end
+        else
+          type = type_attr_value
+        end
+      else
+        # For anything with a streamid of 1, ignore it. This is due to the logic of non-streamid duplicates not appending an integer for the first occurrence. We want to be consistent.
+        ## We use _ to separate the streamid so we can do easier matching for non-streamid duplicates
+        type = streamid[:value] == '1' ? type_attr_value : "#{type_attr_value}#{streamid[:value]}"
+      end
+      return type.downcase
+    end
+
+  end
+end

data/lib/mediainfo/version.rb

@@ -0,0 +1,3 @@
+module MediaInfo
+  VERSION = '1.0.1'
+end

data/mediainfo.gemspec

@@ -1,30 +1,33 @@
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'mediainfo/version'
 
 Gem::Specification.new do |s|
   s.name = %q{mediainfo}
-  s.version = "0.7.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  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.version = MediaInfo::VERSION
+  s.licenses    = ['MIT']
+  s.required_rubygems_version = Gem::Requirement.new('>= 1.2') if s.respond_to? :required_rubygems_version=
+  s.authors = ['Seth Thomas Rasmussen']
+  s.description = %q{MediaInfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net) that standardizes attributes/methods and also converts most values into something Ruby can understand.}
   s.email = %q{sethrasmussen@gmail.com}
-  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 = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Mediainfo}, %q{--main}, %q{README.markdown}]
-  s.require_paths = [%q{lib}]
+  s.homepage = %q{https://github.com/greatseth/mediainfo}
+  s.rdoc_options = ['--line-numbers', '--inline-source', '--title', 'Mediainfo', '--main']
+  s.require_paths = ['lib']
   s.rubyforge_project = %q{mediainfo}
-  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 = [%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.summary = %q{MediaInfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)}
+  s.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+
+  # Since Ruby 1.8, REXML is included in the standard Ruby distribution.
+  s.add_development_dependency 'bundler', '~> 1.16'
+  s.add_development_dependency 'rake', '~> 12.3'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'nokogiri', '~> 1.8' # Ability to parse XML response # Optional and should be included by user in their own gemfile
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
   end
 end

metadata

@@ -1,93 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mediainfo
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.7.2
+version: !ruby/object:Gem::Version
+  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Seth Thomas Rasmussen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-13 00:00:00 Z
-dependencies: []
-
-description: Mediainfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)
+date: 2018-05-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+description: MediaInfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)
+  that standardizes attributes/methods and also converts most values into something
+  Ruby can understand.
 email: sethrasmussen@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
-- lib/mediainfo.rb
-- lib/mediainfo/attr_readers.rb
-- lib/mediainfo/string.rb
-files: 
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".rspec"
 - Changelog
+- GemFile
 - LICENSE
-- Manifest
-- README.markdown
+- README.md
 - Rakefile
-- index.html.template
+- lib/attribute_standardization_rules.yml
 - lib/mediainfo.rb
-- lib/mediainfo/attr_readers.rb
+- lib/mediainfo/errors.rb
 - lib/mediainfo/string.rb
+- lib/mediainfo/tracks.rb
+- lib/mediainfo/version.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_subtilte_test.rb
-- test/mediainfo_test.rb
-- test/mediainfo_vimeo_test.rb
-- test/test_helper.rb
-homepage: http://greatseth.github.com/mediainfo
-licenses: []
-
+homepage: https://github.com/greatseth/mediainfo
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
+rdoc_options:
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - Mediainfo
-- --main
-- README.markdown
-require_paths: 
+- "--main"
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_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
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: mediainfo
-rubygems_version: 1.8.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 3
-summary: Mediainfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)
-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_subtilte_test.rb
-- test/mediainfo_test.rb
-- test/mediainfo_vimeo_test.rb
-- test/test_helper.rb
+summary: MediaInfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)
+test_files: []