cherrypicker 0.2.7 → 0.3.0

data/README.md

@@ -31,13 +31,13 @@ Examples
 	  "http://rapidshare.com/files/329036215/myfile.rar", 
 	  "http://rapidshare.com/files/329036764/deadfile.rar"]).status
 	
-	test3 = Rapidshare.new("http://rapidshare.com/files/329036215/myfile.rar", "username", "password", "size", "/location/tosave/file/")
+	test3 = Rapidshare.new("http://rapidshare.com/files/329036215/myfile.rar", "username", "password", :size => 10000, :location => "/location/tosave/file/")
 	test3.download	
 	
-	Vimeo.new("http://www.vimeo.com/2119458", "/Volumes/Storage/Desktop/cherrytest/").download
+	Vimeo.new("http://www.vimeo.com/2119458", :location => "/Volumes/Storage/Desktop/cherrytest/").download
 	
-	Download.new("http://download.thinkbroadband.com/10MB.zip", "/location/tosave/file/")
-	Download.new("http://download.thinkbroadband.com/10MB.zip", "/location/tosave/file/", "10485760")
+	Download.new("http://download.thinkbroadband.com/10MB.zip", :location => "/location/tosave/file/")
+	Download.new("http://download.thinkbroadband.com/10MB.zip", :location => "/location/tosave/file/", :size => 10485760)
 	
 Contributing
 ------------
@@ -51,15 +51,15 @@ guidelines:
 Limitations
 -----------
 
-1. 	The download function is only useful if you're using premium accounts, 
+1. 	The download function for cyberlockers is only useful if you're using premium accounts, 
 	this will not work without a valid username and password when downloading a file
 	
 2. 	The linkchecker is subject to throttling from both Hotfile and Rapidshare 
-	so don't abuse it
+	so don't abuse it or your IP address could get banned
 	
 3. 	I frequently have problems accessing file hosting sites because one of their 
 	files has been included on the IWF list and the ISP IWF filtering screws things up. 
-	(Im on Virgin Media)
+	(Im on Virgin Media UK)
 	
 License
 -------

data/lib/cherrypicker/download.rb

@@ -1,7 +1,7 @@
-# Class that can download files from cyberlockers or generic URLs
-#
-# Download.new("http://download.thinkbroadband.com/10MB.zip", "/location/tosave/file/")
-# Download.new("http://download.thinkbroadband.com/10MB.zip", "/location/tosave/file/", "10485760")
+# Class that can download files from cyberlockers or generic URLs 
+# it will try and auto detect the size and filename if not supplied
+# Download.new("http://download.thinkbroadband.com/10MB.zip", :location => '/location/tosave/file/') 
+# Download.new("http://download.thinkbroadband.com/10MB.zip", :location => '/location/tosave/file/', :size => 10485760)
 
 require 'net/http'
 require 'net/https'
@@ -9,46 +9,48 @@ require 'progressbar'
 require 'open-uri'
 
 class Download
-  attr_accessor :link, :size, :location, :progress, :filename
+  attr_accessor :link, :size, :location, :progress, :filename, :finished
   
-  def initialize(link, location = nil, size = nil, filename = nil)
-    @link     = link
-    @size     = size
-    @location = location
-    @filename = filename
+  def initialize(link, opts={})
+    o = {
+      :location => nil,
+      :size => nil,
+      :filename => nil
+    }.merge(opts)
+    
+    @link = link
+    @size = o[:size]
+    @location = o[:location]
+    @filename = o[:filename]
     @progress = 0
- 
+    @finished = false 
+    
     download_file
   end
 
   def download_file
-    uri = URI.parse(@link.to_s)
+  p  uri = URI.parse(@link.to_s)
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true if uri.scheme == "https"
     request = Net::HTTP::Get.new(uri.request_uri)
     request.initialize_http_header({"User-Agent" => random_agent})
-    @size = http.request_head(URI.escape(uri.path))['content-length'] if @size.nil?
-    #no content-length no progress bar
-    if @size.nil? || uri.host == "av.vimeo.com" #catch vimeo
-      http.request(request) do |response|
-        File.open(@location + (@filename ||= File.basename(uri.path)), "wb") do |file|
-          response.read_body do |segment|
-            @progress += segment.length
-            file.write(segment)
-          end
-        end
-      end
+    head = http.request_head(URI.escape(uri.path))
+    case head
+    when Net::HTTPForbidden
+      @size = nil  #no content-length no progress bar
     else
-      http.request(request) do |response|
-        bar = ProgressBar.new((@filename ||= File.basename(uri.path)), @size.to_i)
-        File.open(@location + (@filename ||= File.basename(uri.path)), "wb") do |file|
-          response.read_body do |segment|
-            @progress += segment.length
-            bar.set(@progress)
-            file.write(segment)
-          end
+      @size = head['content-length'] if @size.nil? && head['content-length'].to_i > 1024
+    end 
+    http.request(request) do |response|
+      bar = ProgressBar.new((@filename ||= File.basename(uri.path)), @size.to_i) unless @size.nil?
+      File.open(@location + (@filename ||= File.basename(uri.path)), "wb") do |file|
+        response.read_body do |segment|
+          @progress += segment.length
+          bar.set(@progress) unless @size.nil?
+          file.write(segment)
         end
       end
     end
+    @finished = true
   end
 end

data/lib/cherrypicker/{functions.rb → helpers.rb}

@@ -34,6 +34,6 @@ def hash_to_url(hash)
 end
 
 def random_agent
-  @useragent = ["Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.3) Gecko/20090913 Firefox/3.5.3"]
+  @useragent = ["Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.50 Safari/534.24"]
   return @useragent[0]
 end

data/lib/cherrypicker/plugins/hotfile.rb

@@ -1,55 +1,47 @@
 # Class that can sort Hotfile link into sections as specified by Hotfile API 
 #
 # hotfile = Hotfile.new("http://hotfile.com/dl/110589431/6ad2666/ROT007-WEB-2011.rar.html", "username", "password")
-# puts hotfile.link
-# puts hotfile.hostname
 # hotfile.download
+
 require 'open-uri'
 
 class Hotfile
-  attr_accessor :link, :hostname, :filename, :username, :password, :size, :location
-
-  def initialize(link, username, password, size = nil, location = "")
-    uri = URI.parse(link)
+  attr_accessor :link, :hostname, :filename, :username, :password, :size, :location, :query
+  
+  def initialize(link, username, password, opts={})
     if link =~ /hotfile.com\/dl\/\d*\/[0-9a-f]*\/.*.*\.html/
-      @link = link[/(.*)\.html/, 1]
+      @link = link[/(.*)\.html/, 1] #remove .html from link
     else
       @link = link
     end
+    
+    uri = URI.parse(@link)
+    
+    o = {
+      :location => nil,
+      :size => nil,
+    }.merge(opts)
+    
     @username = username
     @password = password
-    @hostname = hostname
+    @size     = o[:size]
+    @location = o[:location]
     @filename = File.basename(uri.path)
-    @size     = size
-    @location = location
   end
 
   def download
-    Download.new(@hostname + remote_url, @location, @size, @filename)
-  end
-  
-  def filename
-    @link[/dl\/\d*\/[0-9a-f]*\/(.*)/, 1]
+    Download.new(download_url, :location => @location, :size => @size, :filename =>  @filename)
   end
   
   def create_url
     hash_to_url({
       :link  =>  @link,
       :username  =>  @username.to_s,
-      :password  =>  @password.to_s
+      :password  =>  @password.to_s,
     })
   end
   
-  def request
-    query = remote_query("http://api.hotfile.com/?action=getdirectdownloadlink&" + create_url)
-    query.response.body
-  end
-  
-  def hostname   
-    "#{request[/http:\/\/(.*).hotfile.com/, 1]}" + ".hotfile.com"
-  end
-  
-  def remote_url   
-    "#{request[/http:\/\/.*.hotfile.com(.*)/, 1]}"
+  def download_url
+    remote_query("http://api.hotfile.com/?action=getdirectdownloadlink&" + create_url).response.body.gsub(/\n/,'')
   end
 end

data/lib/cherrypicker/plugins/rapidshare.rb

@@ -1,30 +1,32 @@
 # Class that can sort Rapidshare link into sections as specified by RapidShare API 
 #
 # rapid = Rapidshare.new("http://rapidshare.com/files/329036215/The.Matrix.bandaa25.part06.rar", "username", "password")
-# puts rapid.link
-# puts rapid.fileid
-# puts rapid.filename
-# puts rapid.host
 # rapid.download
 require 'open-uri'
 
 class Rapidshare
   attr_accessor :link, :fileid, :filename, :hostname, :username, :password, :size, :location
-
-  def initialize(link, username, password, size = nil, location = "")
-    uri = URI.parse(link)   
+  
+  def initialize(link, username, password, opts={})
+    uri = URI.parse(link)
+    
+    o = {
+      :location => nil,
+      :size => nil,
+    }.merge(opts)
+    
     @link     = link
+    @username = username
+    @password = password
     @fileid   = fileid
+    @size     = o[:size]
+    @location = o[:location]
     @filename = File.basename(uri.path)
     @hostname = hostname
-    @username = username
-    @password = password
-    @size     = size
-    @location = location
   end
   
   def download
-    Download.new(@hostname + remote_url, @location, @size, @filename)
+    Download.new(@hostname + remote_url, :location => @location, :size => @size, :filename =>  @filename)
   end
   
   def fileid
@@ -40,7 +42,7 @@ class Rapidshare
       :fileid  =>   @fileid,
       :filename  => @filename,
       :login  =>    @username.to_s,
-      :password  => @password.to_s
+      :password  => @password.to_s,
     })
   end
   

data/lib/cherrypicker/plugins/vimeo.rb

@@ -1,5 +1,5 @@
 # Class that can download from Vimeo
-# Vimeo.new("http://www.vimeo.com/2119458", "/Volumes/Storage/Desktop/cherrytest/").download
+# Vimeo.new("http://www.vimeo.com/2119458", :location => "/Volumes/Storage/Desktop/cherrytest/").download
 
 #<!--     _
 #  __   _|_|_ __ ___   ___  ___
@@ -12,10 +12,15 @@
 class Vimeo
   attr_accessor :link, :filename, :location, :download_url
 
-  def initialize(link, location = "")
+  def initialize(link, opts={})
+    
+    o = {
+      :location => nil,
+    }.merge(opts)
+    
     @link         = link
     @filename     = ""
-    @location     = location
+    @location     = o[:location]
     @download_url = ""
     
     hostname = "http://www.vimeo.com/moogaloop/play/clip"
@@ -40,6 +45,6 @@ class Vimeo
   end
   
   def download
-    Download.new(@download_url, @location)
+    Download.new(@download_url, :location => @location)
   end
 end

data/lib/cherrypicker/version.rb

@@ -1,3 +1,3 @@
 module Cherrypicker
-  VERSION = "0.2.7"
+  VERSION = "0.3.0"
 end

data/lib/cherrypicker.rb

@@ -1,6 +1,6 @@
 require 'cherrypicker/download'
 require 'cherrypicker/linkchecker'
-require 'cherrypicker/functions'
+require 'cherrypicker/helpers'
 require "cherrypicker/plugins/vimeo"
 require "cherrypicker/plugins/rapidshare"
 require "cherrypicker/plugins/hotfile"

metadata

@@ -2,7 +2,7 @@
 name: cherrypicker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors: 
 - Karl Entwistle
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +01:00
+date: 2011-04-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,7 @@ files:
 - cherrypicker.gemspec
 - lib/cherrypicker.rb
 - lib/cherrypicker/download.rb
-- lib/cherrypicker/functions.rb
+- lib/cherrypicker/helpers.rb
 - lib/cherrypicker/linkchecker.rb
 - lib/cherrypicker/plugins/hotfile.rb
 - lib/cherrypicker/plugins/rapidshare.rb