cherrypicker 0.3.10 → 0.3.11

data/lib/cherrypicker/helpers.rb

@@ -1,30 +1,72 @@
 #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
+
+# it will try and auto detect the size and filename if not supplied
+# Cherrypicker::download_file("http://download.thinkbroadband.com/10MB.zip", :location => '/location/tosave/file/', :size => 10485760)
+
+require 'rubygems'
 require 'net/http'
 require 'net/https'
+require 'progressbar'
 require 'open-uri'
 
 module Cherrypicker
   def self.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)
-      request.initialize_http_header({"User-Agent" => random_agent})
-      response = http.request(request)
-      if response["X-APICPU"]
-        if (response["X-APICPU"][/(\d*)\/\d*/, 1]).to_i > 9500
-          sleep 60  # seconds
+    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)
+    request.initialize_http_header({"User-Agent" => random_agent})
+    response = http.request(request)
+    if response["X-APICPU"]
+      if (response["X-APICPU"][/(\d*)\/\d*/, 1]).to_i > 9500
+        sleep 60  # seconds
+      end
+    end
+    return http.request(request)
+  end
+  
+  def self.download_file(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 
+    
+    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" => Cherrypicker::random_agent})
+    unless (uri.host.include? 'youtube.com') && (uri.request_uri.include? 'videoplayback') #youtube throws EOFError
+      head = http.request_head(URI.escape(uri.path))
+    case head
+      when Net::HTTPForbidden
+        @size = nil  #no content-length no progress bar
+      else
+        @size = head['content-length'] if @size.nil? && head['content-length'].to_i > 1024
+      end
+    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
-      return response
-    rescue SocketError
-      $stderr.print "IO failed: " + $!
-      raise
     end
+    @finished = true
   end
 
   def self.hash_to_url(hash)

data/lib/cherrypicker/plugins/hotfile.rb

@@ -32,7 +32,7 @@ module Cherrypicker
     end
 
     def download
-      Download.new(download_url, :location => @location, :size => @size, :filename =>  @filename)
+      Cherrypicker::download_file(download_url, :location => @location, :size => @size, :filename =>  @filename)
     end
   
     def create_url

data/lib/cherrypicker/plugins/megavideo.rb

@@ -90,7 +90,7 @@ module Cherrypicker
     end
     
     def download
-      Download.new(@download_url, :location => @location, :size => @size)
+      Cherrypicker::download_file(@download_url, :location => @location, :size => @size)
     end
   end
 end

data/lib/cherrypicker/plugins/rapidshare.rb

@@ -29,7 +29,7 @@ module Cherrypicker
     end
   
     def download
-      Download.new(@hostname + remote_url, :location => @location, :size => @size, :filename =>  @filename)
+      Cherrypicker::download_file(@hostname + remote_url, :location => @location, :size => @size, :filename =>  @filename)
     end
   
     def fileid

data/lib/cherrypicker/plugins/rghost.rb

@@ -33,7 +33,7 @@ module Cherrypicker
     end
   
     def download
-      Download.new(@download_url, :location => @location)
+      Cherrypicker::download_file(@download_url, :location => @location)
     end
   end
 end

data/lib/cherrypicker/plugins/vimeo.rb

@@ -39,13 +39,13 @@ module Cherrypicker
   	    download_url = ":#{vimeo_id}/#{request_signature}/#{request_signature_expires}/?q=hd"
       end
     
-  		@filename = title.delete("\"'").gsub(/[^0-9A-Za-z]/, '_') + ".flv"
+      @filename = title.delete("\"'").gsub(/[^0-9A-Za-z]/, '_') + ".mp4"
       reply = Cherrypicker::remote_query("#{hostname}#{download_url}")
   		@download_url = reply.response['location']
     end
   
     def download
-      Download.new(@download_url, :location => @location)
+      Cherrypicker::download_file(@download_url, :location => @location, :filename => @filename)
     end
   end
 end

data/lib/cherrypicker/plugins/youtube.rb

@@ -60,6 +60,7 @@ module Cherrypicker
       download_url = video_info_hash["fmt_url_map"][formats.first]
   		@filename = video_info_hash["title"].delete("\"'").gsub(/[^0-9A-Za-z]/, '_') + "." + format_ext[formats.first].first
   		
+  		#there might be a redirect let check
   		reply = Cherrypicker::remote_query("#{download_url}")
   		if reply.response['location']
   		  @download_url = reply.response['location']
@@ -69,7 +70,7 @@ module Cherrypicker
     end
   
     def download
-      Download.new(@download_url, :location => @location, :filename  => @filename)
+      Cherrypicker::download_file(@download_url, :location => @location, :filename  => @filename)
     end
   end
 end

data/lib/cherrypicker/version.rb

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

data/lib/cherrypicker.rb

@@ -1,5 +1,4 @@
 require 'cherrypicker/cherrypick'
-require 'cherrypicker/download'
 require 'cherrypicker/linkchecker'
 require 'cherrypicker/helpers'
 require 'cherrypicker/plugins/vimeo'

metadata

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

data/lib/cherrypicker/download.rb

@@ -1,61 +0,0 @@
-# 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 'rubygems'
-require 'net/http'
-require 'net/https'
-require 'progressbar'
-require 'open-uri'
-
-module Cherrypicker
-  class Download
-    attr_accessor :link, :size, :location, :progress, :filename, :finished
-  
-    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)
-      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" => Cherrypicker::random_agent})
-      unless (uri.host.include? 'youtube.com') && (uri.request_uri.include? 'videoplayback') #youtube throws EOFError
-        head = http.request_head(URI.escape(uri.path))
-        case head
-        when Net::HTTPForbidden
-          @size = nil  #no content-length no progress bar
-        else
-          @size = head['content-length'] if @size.nil? && head['content-length'].to_i > 1024
-        end
-      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
-end