vidibus-fileinfo 0.1.0 → 0.1.1

data/README.md

@@ -52,6 +52,8 @@ For images, a hash with following data will be returned:
 :size              # file size in bytes
 :bit               # depth in bit
 :content_type      # content type of image, e.g. "jpeg"
+:orientation       # visual position e.g. 6 (right top). See "Exif orientation" for more
+:quality           # quality of image
 ```
 
 This gem currently support these image formats:

data/lib/vidibus/fileinfo/base.rb

@@ -39,26 +39,27 @@ module Vidibus
 
         metadata = {}
         @processor::METADATA.each do |attribute|
-          begin
-            metadata[attribute.to_sym] = send(attribute)
-          rescue
-            raise DataError, "#{attribute}"
+          if data = send(attribute)
+            metadata[attribute.to_sym] = data
           end
         end
 
-        validate(metadata)
+        raise DataError unless valid?(metadata)
         metadata
       end
 
       def process_cmd
         pid, stdin, stdout, stderr = POSIX::Spawn::popen4(cmd)
-        raw_metadata = eval("#{output}.read")
+        raw_metadata = eval(output).read
         Process::waitpid(pid)
         raw_metadata
       end
 
-      def validate(metadata)
-        raise DataError unless valid?(metadata)
+      # Important attributes must be present and valid
+      def valid?(metadata)
+        validate.each do |attr|
+          return false if metadata[attr.to_sym].nil? || metadata[attr.to_sym].zero?
+        end
       end
 
       # The video/image file size in bytes.

data/lib/vidibus/fileinfo/processor/image.rb

@@ -5,47 +5,57 @@ module Vidibus
         FORMATS = %w[jpg jpeg png gif]
         METADATA = %w[bit content_type height orientation quality size width]
 
+        # ImageMagick command
         def cmd
           "identify -verbose #{@path}"
         end
 
         def output
-          :stdout
+          "stdout"
         end
 
-        def valid?(metadata)
-          !(metadata[:width].zero? || metadata[:height].zero?)
+        def validate
+          %w[height width]
         end
 
         protected
 
         def bit
-          /^\s*Depth:\s(\w+)-bit/.match(@raw_metadata)[1].presence.to_i
+          if match = @raw_metadata[/^\s*Depth:\s(\w+)-bit/, 1]
+            match.to_i
+          end
         end
 
         def content_type
-          /^\s*Format:\s(\w+)/.match(@raw_metadata)[1].presence.downcase
+          if match = @raw_metadata[/^\s*Format:\s(\w+)/, 1]
+            match.downcase
+          end
         end
 
         def height
-          dimension[1]
+          dimension[1] if dimension
         end
 
         def width
-          dimension[0]
+          dimension[0] if dimension
         end
 
         def dimension
-          str = /^\s*Geometry: (\w+)/.match(@raw_metadata)[1].presence
-          str.split("x").map(&:to_i)
+          if match = @raw_metadata[/^\s*Geometry:\s(\w+)/, 1]
+            match.split("x").map(&:to_i)
+          end
         end
 
         def orientation
-          /^\s*exif:Orientation:\s(\d+)/.match(@raw_metadata)[1].presence.to_i
+          if match = @raw_metadata[/^\s*exif:Orientation:\s(\d+)/, 1]
+            match.to_i
+          end
         end
 
         def quality
-          /^\s*Quality: (\d+)/.match(@raw_metadata)[1].presence.to_i
+          if match = @raw_metadata[/^\s*Quality:\s(\d+)/, 1]
+            match.to_i
+          end
         end
       end
     end

data/lib/vidibus/fileinfo/processor/video.rb

@@ -6,57 +6,66 @@ module Vidibus
         METADATA = %w[audio_codec audio_sample_rate bitrate duration fps height
           size video_codec width]
 
+        # FFmpeg command
         def cmd
           "ffmpeg -i #{@path}"
         end
 
         def output
-          :stderr
+          "stderr"
         end
 
-        def valid?(metadata)
-          !(metadata[:width].zero? || metadata[:height].zero? || metadata[:duration].zero?)
+        def validate
+          %w[duration height width]
         end
 
         protected
 
         def audio_codec
-          /Audio:\s+([a-z]+),/.match(@raw_metadata)[1].presence
+          @raw_metadata[/Audio:\s+([a-z]+),/, 1]
         end
 
         def audio_sample_rate
-          /(\d+)\sHz/.match(@raw_metadata)[1].presence.to_i
+          if match = @raw_metadata[/(\d+)\sHz/, 1]
+            match.to_i
+          end
         end
 
         def bitrate
-          /bitrate:\s(\d+)\skb\/s/.match(@raw_metadata)[1].presence.to_i
+          if match = @raw_metadata[/bitrate:\s(\d+)\skb\/s/, 1]
+            match.to_i
+          end
         end
 
         def duration
-          str = /Duration:\s+([0-9\:\.]+),/.match(@raw_metadata)[1].presence
-          units = str.split(":").map(&:to_f)
-          (units[0] * 60 * 60 * 1000) + (units[1] * 60 * 1000) + (units[2] * 1000) / 1000
+          if match = @raw_metadata[/Duration:\s+([0-9\:\.]+),/, 1]
+            units = match.split(":").map(&:to_f)
+            (units[0] * 60 * 60 * 1000) + (units[1] * 60 * 1000) + (units[2] * 1000) / 1000
+          end
         end
 
         def fps
-          /(\d+)\s+fps,/.match(@raw_metadata)[1].presence.to_f
+          if match = @raw_metadata[/([\d\.]+)\s+fps,/, 1]
+            match.to_f
+          end
         end
 
         def height
-          dimension[1]
+          dimension[1] if dimension
         end
 
         def width
-          dimension[0]
+          dimension[0] if dimension
         end
 
         def dimension
-          str = /^.*Video:.*( \d+x\d+ ).*$/.match(@raw_metadata)[1].strip.presence
-          str.split("x").map(&:to_i)
+          if match =  @raw_metadata[/^.*Video:.*(\s\d+x\d+\s).*$/, 1]
+            match.strip.split("x").map(&:to_i)
+          end
         end
 
         def video_codec
-          /Video:\s+([a-z0-9]+),/.match(@raw_metadata).presence[1]
+          @raw_metadata[/Video:\s*([a-zA-Z0-9\s\(\)]*),/, 1]
         end
       end
     end

data/lib/vidibus/fileinfo/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Fileinfo
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-fileinfo
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-07 00:00:00 +02:00
+date: 2011-09-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency