mongrel_upload_progress 0.1 → 0.2

data/Rakefile

@@ -15,14 +15,14 @@ setup_rdoc ['README', 'LICENSE', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
 desc "Does a full compile, test run"
 task :default => [:test, :package]
 
-version="0.1"
+version="0.2"
 name="mongrel_upload_progress"
 
 setup_gem(name, version) do |spec|
   spec.summary = "The mongrel_upload_progress GemPlugin"
   spec.description = spec.summary
   spec.author="Nobody"
-  spec.add_dependency('mongrel', '>= 0.3.13')
+  spec.add_dependency('mongrel', '>= 0.3.13.3')
   spec.add_dependency('gem_plugin', '>= 0.2.1')
   spec.files += Dir.glob("resources/**/*")
 end

data/lib/mongrel_upload_progress/init.rb

@@ -1,67 +1,98 @@
 require 'mongrel'
 require 'gem_plugin'
 
-class Mongrel::Uploads
-  include Singleton
+class Upload < GemPlugin::Plugin "/handlers"
+  include Mongrel::HttpHandlerPlugin
+
+  def initialize(options = {})
+    @path_info      = options[:path_info]
+    @frequency      = options[:frequency] || 3
+    @request_notify = true
+    if options[:drb]
+      require 'drb'
+      DRb.start_service
+      Mongrel.const_set :Uploads, DRbObject.new(nil, options[:drb])
+    else
+      Mongrel.const_set :Uploads, Mongrel::UploadProgress.new
+    end
+    Mongrel::Uploads.debug = true if options[:debug]
+  end
+
+  def request_begins(params)
+    upload_notify(:add, params, params[Mongrel::Const::CONTENT_LENGTH].to_i)
+  end
+
+  def request_progress(params, clen, total)
+    upload_notify(:mark, params, clen)
+  end
+
+  def process(request, response)
+    upload_notify(:finish, request.params)
+  end
+
+  private
+    def upload_notify(action, params, *args)
+      return unless params['PATH_INFO'] == @path_info &&
+        params[Mongrel::Const::REQUEST_METHOD] == 'POST' &&
+        upload_id = Mongrel::HttpRequest.query_parse(params['QUERY_STRING'])['upload_id']
+      if action == :mark
+        last_checked_time = instance_variable_get(checked_var(upload_id)) rescue nil
+        return unless last_checked_time && Time.now - last_checked_time > @frequency
+      end
+      return unless Mongrel::Uploads.send(action, upload_id, *args)
+      instance_variable_set(checked_var(upload_id), (action == :finish ? nil : Time.now))
+    end
+
+    def checked_var(key)
+      key && "@checked_#{key}"
+    end
+end
 
+# Keeps track of the status of all currently processing uploads
+class Mongrel::UploadProgress
+  attr_accessor :debug
   def initialize
-    @guard = Mutex.new
+    @guard    = Mutex.new
     @counters = {}
   end
 
   def check(upid)
-    @counters[upid]
+    puts "#{upid}: Checking" if @debug
+    instance_variable_get(upload_var(upid)) rescue nil
   end
 
   def add(upid, size)
-    stats = {'size' => size, 'received' => 0}
     @guard.synchronize do
-      @counters[upid] = stats
+      @counters[upid] = Time.now
+      instance_variable_set(upload_var(upid), {:size => size, :received => 0})
+      puts "#{upid}: Added" if @debug
     end
+    true
+  rescue NameError # bad upid instance var
+    puts $!.message
+    @guard.synchronize { @counters[upid] = nil }
   end
 
   def mark(upid, len)
-    upload = @counters[upid]
-    recvd = upload['size'] - len
-    @guard.synchronize do
-      upload['received'] = recvd
-    end
+    puts "#{upid}: Marking" if @debug
+    status = check(upid)
+    status[:received] = status[:size] - len if status
   end
 
   def finish(upid)
-    upload = @counters[upid]
-    recvd = upload['size']
     @guard.synchronize do
-      upload['received'] = recvd
+      puts "#{upid}: Finished" if @debug
+      instance_variable_set(upload_var(upid),  nil) if @counters.delete(upid)
     end
+    true
   end
-end
-
-class Upload < GemPlugin::Plugin "/handlers"
-  include Mongrel::HttpHandlerPlugin
-
-  def initialize(options = {})
-    @path_info      = options[:path_info]
-    @request_notify = true
-  end
-
-  def request_begins(params)
-    upload_notify(:add, params, params[Mongrel::Const::CONTENT_LENGTH].to_i) if params['PATH_INFO'] == @path_info
-  end
-
-  def request_progress(params, clen, total)
-    upload_notify(:mark, params, clen) if params['PATH_INFO'] == @path_info
+  
+  def list
+    @counters.keys.sort
   end
-
-  def process(request, response)
-    upload_notify(:finish, request.params) if request.params['PATH_INFO'] == @path_info
-  end
-
+  
   private
-  def upload_notify(action, params, *args)
-    upload_id = Mongrel::HttpRequest.query_parse(params['QUERY_STRING'])['upload_id']
-    if params[Mongrel::Const::REQUEST_METHOD] == 'POST' && upload_id
-      Mongrel::Uploads.instance.send(action, upload_id, *args) if upload_id
+    def upload_var(key)
+      key && "@upload_#{key}"
     end
-  end
-end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mongrel_upload_progress
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2006-06-25 00:00:00 -04:00
+  version: "0.2"
+date: 2006-09-11 00:00:00 -07:00
 summary: The mongrel_upload_progress GemPlugin
 require_paths: 
 - lib
@@ -56,7 +56,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.13
+        version: 0.3.13.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: gem_plugin