Merge branch 'master' of github.com:r888888888/danbooru

app/models/upload.rb

@@ -48,8 +48,8 @@ class Upload < ActiveRecord::Base
   end
   
   module ConversionMethods
-    def process!
-      return if status =~ /processing|completed|error/
+    def process! force=false
+      return if !force && status =~ /processing|completed|error/
       
       CurrentUser.scoped(uploader, uploader_ip_addr) do
         update_attribute(:status, "processing")
@@ -304,4 +304,4 @@ class Upload < ActiveRecord::Base
   def presenter
     @presenter ||= UploadPresenter.new(self)
   end
-end
+end