vidibus-fileinfo 0.1.3 → 0.2.0

data/lib/vidibus/fileinfo/base.rb

@@ -10,23 +10,38 @@ module Vidibus
       end
 
       def format
-        @format ||= Fileinfo.format(@path)
+        @format ||= Fileinfo.format(path)
       end
 
-      def mime_type
-        @mime_type ||= Mime::Type.lookup_by_extension(format)
+      # Return the mime type of the current instance.
+      # If a media_type is given, only a matching mime
+      # type will be returned.
+      def mime_type(media_type = nil)
+        types = MIME::Types.type_for(path)
+        return if types.empty?
+        if media_type
+          media_type = media_type.to_s
+          media_types = types.select { |m| m.media_type == media_type }
+          if media_types.length > 1
+            sub_types = media_types.select { |m| m.sub_type == format }
+            media_types = sub_types if sub_types.any?
+          end
+          types = media_types if media_types.any?
+        end
+        types.first.content_type if types.any?
       end
+      alias :content_type :mime_type
 
       def data
-        raise PathError unless @path
+        raise PathError unless path
         @data ||= parse_metadata
       end
 
       protected
 
       def check_file
-        raise FileAccessError unless File.exist?(@path)
-        raise NoFileError unless File.file?(@path)
+        raise FileAccessError unless File.exist?(path)
+        raise NoFileError unless File.file?(path)
       end
 
       def load_processor
@@ -62,7 +77,7 @@ module Vidibus
 
       # The video/image file size in bytes.
       def size
-        File.size(@path)
+        File.size(path)
       end
     end
   end

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

@@ -27,9 +27,7 @@ module Vidibus
         end
 
         def content_type
-          if match = @raw_metadata[/^\s*Format:\s(\w+)/, 1]
-            match.downcase
-          end
+          super('image')
         end
 
         def height

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

@@ -2,9 +2,8 @@ module Vidibus
   module Fileinfo
     module Processor
       module Video
-        FORMATS = %w[avi flv h261 h263 h264 ipod m4v mov mp4 mpeg mxf ogg]
-        METADATA = %w[audio_codec audio_sample_rate bitrate duration fps height
-          size video_codec width]
+        FORMATS = %w[3g2 3gp asf avi dv f4p f4v flv ivf m21 mj2 mjpg mkv mov mp4 mpeg mpg mxf ogg ogv rm ts webm wmv]
+        METADATA = %w[audio_codec audio_sample_rate content_type bitrate duration fps height size video_codec width]
 
         # FFmpeg command
         def cmd
@@ -22,7 +21,7 @@ module Vidibus
         protected
 
         def audio_codec
-          @raw_metadata[/Audio:\s+([a-z]+),/, 1]
+          @raw_metadata[/Audio:\s+([a-z0-9_]+),.*\d+\sHz/, 1]
         end
 
         def audio_sample_rate
@@ -37,15 +36,22 @@ module Vidibus
           end
         end
 
+        def content_type
+          super('video')
+        end
+
         def duration
           if match = @raw_metadata[/Duration:\s+([0-9\:\.]+),/, 1]
             units = match.split(":").map(&:to_f)
-            units[0]*3600 + units[1]*60 + units[2]
+            f = units[0]*3600 + units[1]*60 + units[2]
+            (f * 100).round.to_f / 100
           end
         end
 
         def fps
-          if match = @raw_metadata[/([\d\.]+)\s+fps,/, 1]
+          match = @raw_metadata[/([\d\.]+)\s+fps,/, 1]
+          match ||= @raw_metadata[/([\d\.]+)\s+tbr,/, 1]
+          if match
             match.to_f
           end
         end
@@ -59,13 +65,15 @@ module Vidibus
         end
 
         def dimension
-          if match = @raw_metadata[/^.*Video:.*?(\d+x\d+)/, 1]
+          if match = @raw_metadata[/^.*Video:.*?,.*?(\d+x\d+)/, 1]
             match.strip.split("x").map(&:to_i)
           end
         end
 
         def video_codec
-          @raw_metadata[/Video:\s*([a-zA-Z0-9\s\(\)]*),/, 1]
+          if codec = @raw_metadata[/Video:\s*([a-zA-Z0-9\s\(\)]*)[\s\/,]+/, 1]
+            codec.strip
+          end
         end
       end
     end

data/lib/vidibus/fileinfo/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Fileinfo
-    VERSION = "0.1.3"
+    VERSION = '0.2.0'
   end
 end

data/lib/vidibus-fileinfo.rb

@@ -1,4 +1,4 @@
-require "action_dispatch/http/mime_type"
+require "mime/types"
 require "posix/spawn"
 require "vidibus-core_extensions"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-fileinfo
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  hash: 23
+  prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -15,23 +15,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-10 00:00:00 +02:00
+date: 2012-03-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  name: mime-types
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 3
         - 0
-        - 4
-        version: 3.0.4
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -198,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Returns information about an image or video file.