mediafire 1.1.0 → 1.2.1

data/examples/upload_file_with_upload-progress.rb

@@ -0,0 +1,44 @@
+require 'mediafire'
+require 'progressbar'
+
+if ARGV.size < 1
+  exit
+end
+
+queue = Queue.new
+
+file = ARGV[0]
+filename = File.basename(file)
+puts "Filename: " + filename
+filesize = File.stat(file).size
+puts "Filesize: " + filesize.to_s
+
+m = Mediafire.new
+m.login('<account>', '<password>')
+
+Thread.new do
+  queue.push m.upload(file)
+end
+
+upload_t = nil
+while upload_t.nil?
+  Thread.list.each do |n|
+    if n.key?(:filename)
+      upload_t = n
+      break
+    end
+  end
+  sleep 0.1
+end
+
+pbar = ProgressBar.new('test(bytes)', filesize)
+pbar.file_transfer_mode
+while upload_t.alive?
+  uploadsize = m.upload_size filename
+  pbar.set(uploadsize) if uploadsize <= filesize
+  sleep 0.01
+end
+pbar.finish
+
+uploadfile = queue.pop
+puts "filename: #{uploadfile.name} size: #{uploadfile.size} key: #{uploadfile.quickkey}"

data/lib/mediafire.rb

@@ -1,11 +1,16 @@
 # coding: utf-8
 
+$:.unshift(File.dirname(__FILE__))
+
+require 'thread'
+require 'timeout'
 require 'nokogiri'
 require 'mediafire/connection'
 require 'mediafire/store_object'
 require 'mediafire/error'
 require 'mediafire/client'
 
+
 module Mediafire
   class << self
     def new()

data/lib/mediafire/client.rb

@@ -8,6 +8,8 @@ module Mediafire
     def initialize()
       @loggedin = false
       @cookie = {}
+      @s_queue = Queue.new
+      @r_queue = Queue.new
 
       @root_folder = nil
 

data/lib/mediafire/connection.rb

@@ -1,6 +1,7 @@
 require 'uri'
 require 'net/http'
 require 'net/http/post/multipart'
+require 'net/http/uploadprogress'
 
 Net::HTTP.version_1_1
 
@@ -32,16 +33,29 @@ module Mediafire
       end
       request['Cookie'] = cookie
 
+      if has_multipart? options
+        t = Thread.new do
+          loop do
+            @s_queue.pop.call request.upload_size
+          end
+        end
+        options.values.each do |v|
+          if v.is_a? UploadIO
+            t[:filename] = v.original_filename
+          end
+        end
+      end
       response = Net::HTTP.start(uri.host, uri.port) do |http|
         http.request(request)
       end
+      t.kill if has_multipart? options
       check_statuscode(response)
       build_cookie(response.get_fields('Set-Cookie'))
 
       return response
     end
 
-    def has_multipart?(options)
+    def has_multipart?(options={})
       options.values.each do |v|
         if v.is_a? UploadIO
           return true
@@ -49,6 +63,18 @@ module Mediafire
       end
       false
     end
+
+    def upload_size(filename)
+      Thread.list.each do |t|
+        if t[:filename] == filename
+          @s_queue.push Proc.new {|n| @r_queue.push n}
+          return @r_queue.pop
+        end
+      end
+      0
+    rescue Timeout::Error => e
+      return nil
+    end
     
     private
 

data/lib/mediafire/version.rb

@@ -1,3 +1,3 @@
 module Mediafire
-  VERSION = "1.1.0"
+  VERSION = "1.2.1"
 end

data/mediafire.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # s.add_development_dependency "rspec"
   s.add_runtime_dependency "nokogiri", ">= 1.5.0"
   s.add_runtime_dependency "multipart-post", ">= 1.1.3"
+  s.add_runtime_dependency "net-http-uploadprogress", ">= 1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediafire
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2011-09-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70122225470860 !ruby/object:Gem::Requirement
+  requirement: &70179447300800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70122225470860
+  version_requirements: *70179447300800
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70122225470360 !ruby/object:Gem::Requirement
+  requirement: &70179447300300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,18 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70122225470360
+  version_requirements: *70179447300300
+- !ruby/object:Gem::Dependency
+  name: net-http-uploadprogress
+  requirement: &70179447299840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70179447299840
 description: A Ruby wrapper for the unofficial Mediafire API
 email:
 - m@skahack.com
@@ -63,6 +74,7 @@ files:
 - examples/toggle_acl.rb
 - examples/update.rb
 - examples/upload_file.rb
+- examples/upload_file_with_upload-progress.rb
 - lib/mediafire.rb
 - lib/mediafire/api.rb
 - lib/mediafire/client.rb