mediainfo 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f79256366c735ce9879c75236dfbf2d1c1e8a97ba4fb2e2b0f2b06b260c5392
-  data.tar.gz: 1df3a885f1a7ae5165fb57615c950327fa4847d9b06bdaff072ab97f986632e9
+  metadata.gz: d1a7b21d5d2384c473c77455711cd555bd112093d87e8d122c262d3e7edc5a6c
+  data.tar.gz: 3802797902e9bfd0b4854a35066aa92b0bcc6d0b9f36f25687f1da9f82dc4e81
 SHA512:
-  metadata.gz: 677175108b077cc7f1d421e062cf56498e26d8d48fd1201c5313d76dd2c48ca77b626af1d3a6c7f06ac8a5e37a464d09ee34032409d925b80faff1d0fbd220da
-  data.tar.gz: a582fb423b5585d8611af76742e676d2bfbd214e82559e79bad899b7752cbfec81207137864aca7b8695671e61b6e683090ce6edee912ca7934506ba7ad24954
+  metadata.gz: b1d7dbaf1df40cb720c269740b1274badf728bf54cfc20b6818e7ae38b282c66af5065abd0d84456cd9c984b05b36571dac27227f7fa9586f5bd446114fc6f68
+  data.tar.gz: f12b2fd55f5de540d48d400b91ec0038a17f256c0c6b7d473367be983fe6769d8969bc3e519a80af4348b9b2728d69b0c5c70e9704e68474e12c765b1670d2e3

data/lib/mediainfo.rb

@@ -39,7 +39,6 @@ module MediaInfo
     return xml_parser
   end
 
-
   def self.run(input = nil)
     raise ArgumentError, 'Your input cannot be blank.' if input.nil?
     command = "#{location} #{input} --Output=XML 2>&1"
@@ -51,44 +50,46 @@ module MediaInfo
   end
 
   def self.from(input)
-    input_guideline_message = 'Bad Input' + "\n" + "Input must be: \n" +
-        "A video or xml file location. Example: '~/videos/test_video.mov' or '~/videos/test_video.xml' \n" +
-        "A valid URL. Example: 'http://www.site.com/videofile.mov' \n" +
-        "Or MediaInfo XML \n"
-    if input # User must specify file
-      if input.include?('<?xml') # Must be first, else we could parse input (raw xml) with a URL in it and think it's a URL
-        return MediaInfo::Tracks.new(input)
-      elsif input.downcase.include?('http') || input.downcase.include?('www') # Handle Url Parsing
-        @uri = URI(input)
-        # Check if URL is valid
-        http = ::Net::HTTP.new(@uri.host,@uri.port)
-        request = Net::HTTP::Head.new(@uri.request_uri) # Only grab the Headers to be sure we don't try and download the whole file
-        response = http.request(request)
-        case response
-        when Net::HTTPOK
-          @escaped_input = URI.escape(@uri.to_s)
-        else
-          raise RemoteUrlError, "HTTP call to #{input} is not working!"
-        end
-      elsif input.include?('.xml')
-        return MediaInfo::Tracks.new(::File.open(input).read)
-      elsif !input.match(/[^\\]*\.\w+$/).nil? # A local file
-        @file = ::File.expand_path input # turns ~/path/to/file into /home/user/path/to/file
-        raise ArgumentError, 'You must include a file location.' if @file.nil?
-        raise ArgumentError, "need a path to a video file, #{@file} does not exist" unless ::File.exist? @file
-        @file_path = ::File.dirname  @file
-        @filename = ::File.basename @file
-        @escaped_input = @file.shell_escape_double_quotes
-        # Set variable for returned XML
-      else
-        raise ArgumentError, input_guideline_message
-      end
-      return MediaInfo::Tracks.new(MediaInfo.run(@escaped_input))
-    else
-      raise ArgumentError, input_guideline_message
-    end
+    return from_uri(input) if input.is_a?(URI)
+    return from_string(input) if input.is_a?(String)
+    raise BadInputError
+  end
+
+  def self.from_string(input)
+    return from_xml(input) if input.include?('<?xml')
+    return from_link(input) if input =~ URI::regexp
+    return from_local_file(input) if input.match(/[^\\]*\.\w+$/)
+    raise BadInputError
   end
 
+  def self.from_xml(input)
+    MediaInfo::Tracks.new(input)
+  end
+
+  def self.from_local_file(input)
+    absolute_path = File.expand_path(input) # turns relative to absolute path
+
+    raise ArgumentError, 'You must include a file location.' if absolute_path.nil?
+    raise ArgumentError, "need a path to a video file, #{absolute_path} does not exist" unless File.exist?(absolute_path)
+
+    return from_xml(File.open(absolute_path).read) if absolute_path.match(/[^\\]*\.(xml)$/)
+    MediaInfo::Tracks.new(MediaInfo.run(absolute_path.shell_escape_double_quotes))
+  end
+
+  def self.from_link(input)
+    from_uri(URI(input))
+  end
+
+  def self.from_uri(input)
+    http = Net::HTTP.new(input.host, input.port) # Check if input is valid
+    request = Net::HTTP::Head.new(input.request_uri) # Only grab the Headers to be sure we don't try and download the whole file
+
+    http.use_ssl = true if input.is_a? URI::HTTPS # For https support
+
+    raise RemoteUrlError, "HTTP call to #{input} is not working!" unless http.request(request).is_a?(Net::HTTPOK)
+
+    MediaInfo::Tracks.new(MediaInfo.run(URI.escape(input.to_s)))
+  end
 
   def self.set_singleton_method(object,name,parameters)
     # Handle parameters with invalid characters (instance_variable_set throws error)

data/lib/mediainfo/errors.rb

@@ -1,14 +1,27 @@
 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
+  class EnvironmentError < StandardError; end
+  class ExecutionError < StandardError; end
+  class IncompatibleVersionError < StandardError; end
+  class UnknownVersionError < StandardError; end
+  class RemoteUrlError < StandardError; end
+
+  class BadInputError < ArgumentError
+    def initialize(msg=nil)
+      msg ||= "Input must be: \n"
+        + "A video or xml file location."
+        + "Example: '~/videos/test_video.mov' or '~/videos/test_video.xml' \n"
+        + "A valid URL. Example: 'http://www.site.com/videofile.mov' \n"
+        + "Or MediaInfo XML \n"
+      super(msg)
+    end
+  end
+
   # Stream
+  class InvalidTrackType < StandardError; end
+  class InvalidTrackAttributeValue < StandardError; end
+
   class SingleStreamAPIError < RuntimeError; end
   class NoStreamsForProxyError < NoMethodError; end
-  class InvalidTrackType < Error; end
-  class InvalidTrackAttributeValue < Error; end
-end
+end

data/lib/mediainfo/tracks.rb

@@ -97,25 +97,22 @@ module MediaInfo
       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
+
+        if ['Duration'].include?(name)
+          # Duration
+          return standardize_to_milliseconds(value)
+        elsif value.to_s == value.to_i.to_s then value.to_i
+          # Convert String with integer in it to Integer.
+          return value.to_i
+        elsif value.to_s == value.to_f.to_s then value.to_f
+          # Convert String with integer in it to Integer.
+          return value.to_f
+        elsif name.downcase.include?('date') && !value.match(/\d-/).nil?
+          # Dates
+          return Time.parse(value)
         end
+
+        value
       end
 
       def self.standardize_to_milliseconds(value)
@@ -133,8 +130,8 @@ module MediaInfo
           when /\d+\s?h(our)?/    then chunk.to_i * 60 * 60 * 1000
           end.to_i
         end
-        # We don't raise anymore. It's much better for the gem to work,
-        # returning the original MediaInfo attribute, than raise.
+        # We don't raise anymore. It's much better for the gem to
+        # return the original MediaInfo attribute, than raise.
         base_msec == 0 ? v : base_msec
       end
 

data/lib/mediainfo/version.rb

@@ -1,3 +1,3 @@
 module MediaInfo
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mediainfo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Seth Thomas Rasmussen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler