cherrypicker 0.3.11 → 0.3.12

data/lib/cherrypicker/cherrypick.rb

@@ -15,10 +15,19 @@ module Cherrypicker
       @username     = o[:username]
       @password     = o[:password]
       @directory    = o[:location]
-
+      
+      plugins = ["Hotfile", "Megavideo", "Rapidshare", "Rghost", "Vimeo", "Youtube"]
       classname = URI.parse(@link.to_s).host[/[^www\.]+/].capitalize
-      instance = Object.const_get('Cherrypicker').const_get("#{classname}")
-      instance.new(@link, :location => @location, :username => @username, :password => @password).download
+      
+      supported_host = plugins.include?(classname)
+      
+      if supported_host == true
+        instance = Object.const_get('Cherrypicker').const_get("#{classname}")
+        instance.new(@link, :location => @location, :username => @username, :password => @password).download
+      else
+        Cherrypicker::download_file(@link, :location => @location)
+      end
+      
     end
   end
 end

data/lib/cherrypicker/helpers.rb

@@ -9,6 +9,7 @@ require 'net/http'
 require 'net/https'
 require 'progressbar'
 require 'open-uri'
+require 'progress'
 
 module Cherrypicker
   def self.remote_query(url)  
@@ -56,8 +57,11 @@ module Cherrypicker
         @size = head['content-length'] if @size.nil? && head['content-length'].to_i > 1024
       end
     end
+    puts "unknown file size for #{@filename}" if @size.nil?
     http.request(request) do |response|
       bar = ProgressBar.new((@filename ||= File.basename(uri.path)), @size.to_i) unless @size.nil?
+      bar.format_arguments=[:title, :percentage, :bar, :stat_for_file_transfer] unless @size.nil?
+            
       File.open(@location + (@filename ||= File.basename(uri.path)), "wb") do |file|
         response.read_body do |segment|
           @progress += segment.length
@@ -67,6 +71,9 @@ module Cherrypicker
       end
     end
     @finished = true
+    puts
+    puts "download completed"
+    puts
   end
 
   def self.hash_to_url(hash)

data/lib/cherrypicker/plugins/fileserve.rb

@@ -0,0 +1,48 @@
+# Class that can download from Vimeo
+# Fileserve.new("http://www.vimeo.com/2119458", :location => "/Volumes/Storage/Desktop/cherrytest/").download
+
+require 'rubygems'
+require 'mechanize'
+
+module Cherrypicker
+  class Fileserve
+    attr_accessor :link, :filename, :location, :download_url
+
+    def initialize(link, opts={})
+    
+      o = {
+        :location => nil,
+        :username => nil,
+        :password => nil,
+      }.merge(opts)
+    
+      @link         = link
+      @filename     = ""
+      @location     = o[:location]
+      @download_url = ""
+      
+      hostname = "http://www.fileserve.com/file/JmcsvYZ/Thor.2011.TS.READNFO.XViD-IMAGiNE.avi"
+    
+      a = Mechanize.new { |agent|
+         agent.user_agent_alias = Cherrypicker::self.random_agent
+         agent.follow_meta_refresh = true
+      }
+      
+      
+      a.get(hostname) do |page|
+        download_page = page.form_with(:name => 'loginForm') do |login|
+        login.loginUserName = o[:username]
+        login.loginUserPassword = o[:password
+        end.submit
+
+        puts a
+      end
+      
+  		#@download_url = reply.response['location']
+    end
+  
+    def download
+     # Cherrypicker::download_file(@download_url, :location => @location, :filename => @filename)
+    end
+  end
+end

data/lib/cherrypicker/plugins/vimeo.rb

@@ -40,6 +40,8 @@ module Cherrypicker
       end
     
       @filename = title.delete("\"'").gsub(/[^0-9A-Za-z]/, '_') + ".mp4"
+      #strip out _quote_ marks
+      @filename.gsub!('_quot_', '')
       reply = Cherrypicker::remote_query("#{hostname}#{download_url}")
   		@download_url = reply.response['location']
     end

data/lib/cherrypicker/version.rb

@@ -1,3 +1,3 @@
 module Cherrypicker
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end

metadata

@@ -2,7 +2,7 @@
 name: cherrypicker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors: 
 - Karl Entwistle
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 +01:00
+date: 2011-05-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ files:
 - lib/cherrypicker/cherrypick.rb
 - lib/cherrypicker/helpers.rb
 - lib/cherrypicker/linkchecker.rb
+- lib/cherrypicker/plugins/fileserve.rb
 - lib/cherrypicker/plugins/hotfile.rb
 - lib/cherrypicker/plugins/megavideo.rb
 - lib/cherrypicker/plugins/rapidshare.rb