cherrypicker 0.2.1 → 0.2.2

data/lib/cherrypicker/download.rb

@@ -1,8 +1,10 @@
 # Class that can download files from cyberlockers
 #
-# Download.new(hostname, url, username, password)
+# Download.new(hostname, url, size, password)
 require 'net/http'
+require 'net/https'
 require 'progressbar'
+require 'open-uri'
 
 class Download
   attr_accessor :hostname, :url, :filename, :size, :progress, :location
@@ -14,15 +16,17 @@ class Download
     @size     = size
     @location = location
     @progress = 0
-     
+ 
     download_file
   end
-  
-private
 
   def download_file
-    http = Net::HTTP.new("#{self.hostname}")
-    http.request_get("#{self.url}") do |response|
+    uri = URI.parse("#{self.hostname}" + "#{self.url}")
+    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})
+    http.request(request) do |response|
       bar = ProgressBar.new("#{self.filename}", self.size.to_i)
       File.open("#{self.location}" + "#{self.filename}", "wb") do |file|
         response.read_body do |segment|

data/lib/cherrypicker/functions.rb

@@ -1,12 +1,14 @@
 #The points are decremented by 1000 per minute. If you are able to parse the http header, 
 #you can parse "X-APICPU: x/y", where x stands for your current points
 require 'net/http'
+require 'net/https'
 require 'open-uri'
 
 def remote_query(url)  
   begin
     uri = URI.parse(url)
     http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true if uri.scheme == "https"
     http.open_timeout = 3 # seconds
     http.read_timeout = 3 # seconds
     request = Net::HTTP::Get.new(uri.request_uri)
@@ -31,24 +33,7 @@ def hash_to_url(hash)
   end
 end
 
-private 
-
-# Have a random Browser User Agent just incase
 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",
-      "Mozilla/5.0 (Windows; U; Windows NT 6.1; en; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3 (.NET CLR 3.5.30729)",
-      "Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3 (.NET CLR 3.5.30729)",
-      "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.1) Gecko/20090718 Firefox/3.5.1",
-      "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/532.1 (KHTML, like Gecko) Chrome/4.0.219.6 Safari/532.1",
-      "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; WOW64; Trident/4.0; SLCC2; .NET CLR 2.0.50727; InfoPath.2)",
-      "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0; SLCC1; .NET CLR 2.0.50727; .NET CLR 1.1.4322; .NET CLR 3.5.30729; .NET CLR 3.0.30729)",
-      "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.2; Win64; x64; Trident/4.0)",
-      "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; SV1; .NET CLR 2.0.50727; InfoPath.2)Mozilla/5.0 (Windows; U; MSIE 7.0; Windows NT 6.0; en-US)",
-      "Mozilla/4.0 (compatible; MSIE 6.1; Windows XP)",
-      "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.151 Safari/534.16",
-      "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27",
-      "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.151 Safari/534.16",
-      "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)",
-      "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.14) Gecko/20110218 Firefox/3.6.14"]
-    @useragent[rand(14)]
+  @useragent = ["Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.3) Gecko/20090913 Firefox/3.5.3"]
+  return @useragent[0]
 end

data/lib/cherrypicker/linkchecker.rb

@@ -12,7 +12,7 @@ class LinkChecker
 
   def initialize(links)
     @links = links
-    if links[0] =~ /^http:\/\/rapidshare.com/
+    if links[0] =~ /^http:\/\/(www.|)rapidshare.com/
       @status = rapidshare
     else
       @status = hotfile

data/lib/cherrypicker/rapidshare.rb

@@ -13,7 +13,7 @@ class Rapidshare
     @link     = link
     @fileid   = fileid
     @filename = filename
- #   @hostname = hostname
+    @hostname = hostname
     @username = username
     @password = password
     @size     = size
@@ -47,6 +47,6 @@ class Rapidshare
   
   def hostname
     query = remote_query("http://api.rapidshare.com/cgi-bin/rsapi.cgi?sub=download&" + create_url)
-    query.response.response["Location"][/https:\/\/(.*).rapidshare.com/, 1] + ".rapidshare.com"
+    query.response.response["Location"][/(.*).rapidshare.com/, 1] + ".rapidshare.com"
   end  
 end

data/lib/cherrypicker/version.rb

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

metadata

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