cherrypicker 0.2.2 → 0.2.4

data/README.md

@@ -31,9 +31,12 @@ 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")
+	test3 = Rapidshare.new("http://rapidshare.com/files/329036215/myfile.rar", "username", "password", "size", "/location/tosave/file/")
 	test3.download	
 	
+	Download.new("http://download.thinkbroadband.com/10MB.zip", "/location/tosave/file/")
+	Download.new("http://download.thinkbroadband.com/10MB.zip", "/location/tosave/file/", "10485760")
+	
 Contributing
 ------------
 

data/lib/cherrypicker/download.rb

@@ -1,18 +1,18 @@
-# Class that can download files from cyberlockers
+# Class that can download files from cyberlockers or generic URLs
 #
-# Download.new(hostname, url, size, password)
+# Download.new("http://download.thinkbroadband.com/10MB.zip", "/location/tosave/file/")
+# Download.new("http://download.thinkbroadband.com/10MB.zip", "/location/tosave/file/", "10485760")
+
 require 'net/http'
 require 'net/https'
 require 'progressbar'
 require 'open-uri'
 
 class Download
-  attr_accessor :hostname, :url, :filename, :size, :progress, :location
+  attr_accessor :link, :size, :location, :progress
   
-  def initialize(hostname, url, filename, size = nil, location = nil)
-    @hostname = hostname
-    @url      = url
-    @filename = filename
+  def initialize(link, location = nil, size = nil)
+    @link     = link
     @size     = size
     @location = location
     @progress = 0
@@ -21,17 +21,18 @@ class Download
   end
 
   def download_file
-    uri = URI.parse("#{self.hostname}" + "#{self.url}")
+    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'].to_i if @size.nil?
     http.request(request) do |response|
-      bar = ProgressBar.new("#{self.filename}", self.size.to_i)
-      File.open("#{self.location}" + "#{self.filename}", "wb") do |file|
+      bar = ProgressBar.new(File.basename(uri.path), @size.to_i)
+      File.open(@location + File.basename(uri.path), "wb") do |file|
         response.read_body do |segment|
-          self.progress += segment.length
-          bar.set(self.progress)
+          @progress += segment.length
+          bar.set(@progress)
           file.write(segment)
         end
       end

data/lib/cherrypicker/hotfile.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 # 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")
@@ -8,6 +10,7 @@ class Hotfile
   attr_accessor :link, :hostname, :filename, :username, :password, :size, :location
 
   def initialize(link, username, password, size = nil, location = "")
+    uri = URI.parse(link)
     if link =~ /hotfile.com\/dl\/\d*\/[0-9a-f]*\/.*.*\.html/
       @link = link[/(.*)\.html/, 1]
     else
@@ -16,24 +19,24 @@ class Hotfile
     @username = username
     @password = password
     @hostname = hostname
-    @filename = filename
+    @filename = File.basename(uri.path)
     @size     = size
     @location = location
   end
 
   def download
-    Download.new(self.hostname, remote_url, self.filename, self.size, self.location)
+    Download.new(@hostname + remote_url, @location, @size)
   end
   
   def filename
-    self.link[/dl\/\d*\/[0-9a-f]*\/(.*)/, 1]
+    @link[/dl\/\d*\/[0-9a-f]*\/(.*)/, 1]
   end
   
   def create_url
     hash_to_url({
-      :link  =>  self.link,
-      :username  =>  self.username.to_s,
-      :password  =>  self.password.to_s
+      :link  =>  @link,
+      :username  =>  @username.to_s,
+      :password  =>  @password.to_s
     })
   end
   

data/lib/cherrypicker/rapidshare.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 # 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")
@@ -10,9 +12,10 @@ class Rapidshare
   attr_accessor :link, :fileid, :filename, :hostname, :username, :password, :size, :location
 
   def initialize(link, username, password, size = nil, location = "")
+    uri = URI.parse(link)   
     @link     = link
     @fileid   = fileid
-    @filename = filename
+    @filename = File.basename(uri.path)
     @hostname = hostname
     @username = username
     @password = password
@@ -21,27 +24,23 @@ class Rapidshare
   end
   
   def download
-    Download.new(self.hostname, remote_url, self.filename, self.size, self.location)
+    Download.new(@hostname + remote_url, @location, @size,)
   end
   
   def fileid
-    self.link[/files\/(\d*)\//, 1]
-  end
-  
-  def filename
-    self.link[/files\/\d*\/(.*)/, 1]
+    @link[/files\/(\d*)\//, 1]
   end
-  
+    
   def remote_url
     "/cgi-bin/rsapi.cgi?sub=download&" + create_url
   end
     
   def create_url
    hash_to_url({
-      :fileid  =>   self.fileid,
-      :filename  => self.filename,
-      :login  =>    self.username.to_s,
-      :password  => self.password.to_s
+      :fileid  =>   @fileid,
+      :filename  => @filename,
+      :login  =>    @username.to_s,
+      :password  => @password.to_s
     })
   end
   

data/lib/cherrypicker/version.rb

@@ -1,3 +1,3 @@
 module Cherrypicker
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -2,7 +2,7 @@
 name: cherrypicker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors: 
 - Karl Entwistle