quick_file 1.0.4 → 1.2.0

data/lib/quick_file.rb

@@ -31,7 +31,7 @@ module QuickFile
     end
 
     def is_video_file?(filename)
-      filename.downcase.end_with?('.mov', '.3gp', '.wmv', '.m4v', '.mp4')
+      filename.downcase.end_with?('.mov', '.3gp', '.wmv', '.m4v', '.mp4', '.flv')
     end
 
     def fog_connection
@@ -73,6 +73,24 @@ module QuickFile
       outfile
     end
 
+		def convert_video_to_mp4(file)
+      new_file = QuickFile.new_cache_file(".mp4")
+      `ffmpeg -i #{file} -vcodec libx264 -b 500k -bt 50k -acodec libfaac -ab 56k -ac 2 -s 480x320 #{new_file}`
+			new_file
+		end
+
+		def convert_video_to_flv(file)
+      new_file = QuickFile.new_cache_file(".flv")
+      `ffmpeg -i #{file} -f flv -ar 11025 -r 24 -s 480x320 #{new_file}`
+			new_file
+		end
+
+		def create_video_thumb(file)
+      new_file = QuickFile.new_cache_file(".jpg")
+      `ffmpeg -i #{file} #{new_file}`
+			new_file
+		end
+
     def cache_path(cn)
       File.join(CACHE_DIR, cn)
     end

data/lib/quick_file/upload.rb

@@ -11,6 +11,7 @@ module QuickFile
     #     3. store
 
     STATES = {:loaded => 0, :cached => 1, :processing => 2, :processed => 3, :storing => 4, :stored => 5, :deleted => 6, :error => 7}
+		FILE_CATEGORIES = {:none => 0, :image => 1, :video => 2, :file => 3}
 
     included do
       cattr_accessor :processes
@@ -261,15 +262,28 @@ module QuickFile
         "#{proto}#{QuickFile.host_url[storage_type.to_sym]}#{styles[style_name]["path"]}"
       end
 
-      def delete
+      def delete_files
         # delete uploaded files
         styles.each do |k,v|
           QuickFile.fog_directory.files.new(:key => v["path"]).destroy if v["path"]
           File.delete(v["cache"]) if (v["cache"] && File.exists?(v["cache"]))
         end
         self.state = STATES[:deleted]
+				save
       end
 
+			def file_category
+				if self.state.nil?
+					return FILE_CATEGORIES[:none]
+				elsif self.is_image?
+					return FILE_CATEGORIES[:image]
+				elsif self.is_video?
+					return FILE_CATEGORIES[:video]
+				else
+					return FILE_CATEGORIES[:file]
+				end
+			end
+
       def url_hash
         ret = {}
         processes.keys.each do |style_name|

data/lib/quick_file/version.rb

@@ -1,3 +1,3 @@
 module QuickFile
-  VERSION = "1.0.4"
+  VERSION = "1.2.0"
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
+  - 2
   - 0
-  - 4
-  version: 1.0.4
+  version: 1.2.0
 platform: ruby
 authors: 
 - Alan Graham
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-05 00:00:00 Z
+date: 2012-07-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rmagick