cherrypicker 0.3.14 → 0.4.0

data/README.md

@@ -75,6 +75,17 @@ Limitations
 License
 -------
 
-	Cherypicker is free software, and may be redistributed and be used for 
-	anything apart from the operation of nuclear facilities, aircraft navigation 
-	or communication systems, air traffic control, life support or weapons systems.
+	Ruby Gem that lets you download from; Rapidshare, Hotfile, Youtube, Vimeo & Megavideo
+	Copyright (C) 2011  Karl Entwistle
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.

data/bin/cherrypick

@@ -44,11 +44,10 @@ end
 
 unless directory == "" || nil?
   p path = Pathname.new(directory) 
-
-  if not path.directory?
-        puts "Directory not found " + path.to_s
-        usage 
-        exit
+  if not path.directory?    
+    puts "Directory not found " + path.to_s
+    usage 
+    exit
   end
 end
 
@@ -56,7 +55,9 @@ username = nil unless username != ""
 password = nil unless password != ""
 directory = nil unless directory != ""
 
-if ARGV[0].include?("rapidshare.com/files/") or ARGV[0].include?("hotfile.com/dl/")
+url = ARGV[0]
+
+if url.include?("rapidshare.com/files/") or url.include?("hotfile.com/dl/")
   unless username and password != nil?
     puts "Host required username / password" 
     puts 
@@ -65,4 +66,13 @@ if ARGV[0].include?("rapidshare.com/files/") or ARGV[0].include?("hotfile.com/dl
   end
 end
 
-Cherrypicker::Cherrypick.new(ARGV[0], :location => directory, :username => username, :password => password)
+#Cherrypicker::Cherrypick.new(ARGV[0], :location => directory, :username => username, :password => password)
+
+Cherrypicker::PluginBase.registered_plugins.each do |plugin|
+	if plugin.matches_provider?(url)
+		plugin.new(url, :location => directory, :username => username, :password => password).download
+		exit
+	end
+end
+
+Cherrypicker::download_file(url, :location => directory, :username => username, :password => password)

data/lib/cherrypicker.rb

@@ -7,3 +7,5 @@ require 'cherrypicker/plugins/hotfile'
 require 'cherrypicker/plugins/youtube'
 require 'cherrypicker/plugins/megavideo'
 require "cherrypicker/plugins/rghost"
+require "cherrypicker/plugins/fileserve"
+require "cherrypicker/plugins/googlevideo"

data/lib/cherrypicker/cherrypick.rb

@@ -16,7 +16,11 @@ module Cherrypicker
       @password     = o[:password]
       @directory    = o[:location]
       
-      plugins = ["Hotfile", "Megavideo", "Rapidshare", "Rghost", "Vimeo", "Youtube"]
+      Dir[File.join(File.dirname(__FILE__),"../plugins/*.rb")].each do |plugin|
+      	load plugin
+      end
+      
+      plugins = ["Hotfile", "Megavideo", "Rapidshare", "Rghost", "Vimeo", "Youtube", "Googlevideo"]
       classname = URI.parse(@link.to_s).host[/[^www\.]+/].capitalize
       
       supported_host = plugins.include?(classname)

data/lib/cherrypicker/helpers.rb

@@ -9,8 +9,18 @@ require 'net/http'
 require 'net/https'
 require 'progressbar'
 require 'open-uri'
+require 'cgi'
 
 module Cherrypicker
+  class PluginBase
+    class << self; attr_reader :registered_plugins end
+      @registered_plugins = []
+
+    def self.inherited(child)
+      PluginBase.registered_plugins << child
+    end
+  end
+  
   def self.remote_query(url)  
     uri = URI.parse(url)
     http = Net::HTTP.new(uri.host, uri.port)
@@ -49,15 +59,13 @@ module Cherrypicker
     http.read_timeout = 3 # seconds
     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))
+
+    head = http.request_head(URI.escape(uri.request_uri))
     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
+    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
     
     puts "unknown file size for #{@filename} but downloading..." if @size.nil?

data/lib/cherrypicker/plugins/fileserve.rb

@@ -3,10 +3,15 @@
 
 require 'rubygems'
 require 'mechanize'
+require 'open-uri'
 
 module Cherrypicker
   class Fileserve
     attr_accessor :link, :filename, :location, :download_url
+    
+    def self.matches_provider?(url)
+      url.include?("fileserve.com")
+    end
 
     def initialize(link, opts={})
     
@@ -24,19 +29,18 @@ module Cherrypicker
       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.user_agent_alias = 'Mac Safari'
          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
+         page = agent.get('http://www.fileserve.com/login.php')
+             
+         form = signin_page.form_with(:name => 'login_form') do |form|
+           form.loginUserName = o[:username]
+           form.loginUserPassword = o[:password]
+         end.submit  
+         
+         page = agent.get('http://www.fileserve.com/login.php')
+        }
+        
       
   		#@download_url = reply.response['location']
     end
@@ -44,5 +48,6 @@ module Cherrypicker
     def download
      # Cherrypicker::download_file(@download_url, :location => @location, :filename => @filename)
     end
-  end
-end
+  end  
+end
+

data/lib/cherrypicker/plugins/googlevideo.rb

@@ -0,0 +1,33 @@
+# Class that can download from Vimeo
+# Googlevideo.new("http://video.google.com/videoplay?docid=7065205277695921912", :location => "/Volumes/Storage/Desktop/cherrytest/").download
+require 'cgi'
+
+module Cherrypicker
+  class Googlevideo < PluginBase
+    attr_accessor :link, :filename, :location, :download_url
+    
+    def self.matches_provider?(url)
+      url.include?("video.google.com")
+    end
+
+    def initialize(link, opts={})
+    
+      o = {
+        :location => nil,
+      }.merge(opts)
+    
+      @link         = link
+      @filename     = ""
+      @location     = o[:location]
+      @download_url = ""
+      
+      response = Cherrypicker::remote_query(@link)      
+      @filename = response.body[/<title>(.*)<\/title>/, 1] + ".flv"
+      @download_url = CGI.unescape(response.body[/videoUrl\\x3d(.*)\\x26thumbnailUrl/, 1])
+    end
+      
+    def download
+      Cherrypicker::download_file(@download_url, :location => @location, :filename => @filename)
+    end
+  end  
+end

data/lib/cherrypicker/plugins/hotfile.rb

@@ -5,9 +5,13 @@
 
 require 'open-uri'
 module Cherrypicker
-  class Hotfile
+  class Hotfile < PluginBase
     attr_accessor :link, :hostname, :filename, :username, :password, :size, :location, :query
   
+    def self.matches_provider?(url)
+      url.include?("hotfile.com")
+    end
+  
     def initialize(link, opts={})
       if link =~ /hotfile.com\/dl\/\d*\/[0-9a-f]*\/.*.*\.html/
         @link = link[/(.*)\.html/, 1] #remove .html from link

data/lib/cherrypicker/plugins/megavideo.rb

@@ -3,8 +3,12 @@
 
 require 'open-uri'
 module Cherrypicker
-  class Megavideo
+  class Megavideo < PluginBase
     attr_accessor :link, :filename, :location, :download_url
+    
+    def self.matches_provider?(url)
+      url.include?("megavideo.com")
+    end
 
     def initialize(link, opts={})
       o = {

data/lib/cherrypicker/plugins/rapidshare.rb

@@ -4,9 +4,13 @@
 # rapid.download
 require 'open-uri'
 module Cherrypicker
-  class Rapidshare
+  class Rapidshare < PluginBase
     attr_accessor :link, :fileid, :filename, :hostname, :username, :password, :size, :location, :download_url
   
+    def self.matches_provider?(url)
+      url.include?("rapidshare.com")
+    end
+  
     def initialize(link, opts={})
       uri = URI.parse(link)
     

data/lib/cherrypicker/plugins/rghost.rb

@@ -3,8 +3,12 @@
 require 'open-uri'
 
 module Cherrypicker
-  class Rghost
+  class Rghost < PluginBase
     attr_accessor :link, :filename, :location, :download_url
+    
+    def self.matches_provider?(url)
+      url.include?("rghost.com")
+    end
 
     def initialize(link, opts={})
     

data/lib/cherrypicker/plugins/vimeo.rb

@@ -9,8 +9,12 @@
 #               you know, for videos
 #-->
 module Cherrypicker
-  class Vimeo
+  class Vimeo < PluginBase
     attr_accessor :link, :filename, :location, :download_url
+    
+    def self.matches_provider?(url)
+      url.include?("vimeo.com")
+    end
 
     def initialize(link, opts={})
     

data/lib/cherrypicker/plugins/youtube.rb

@@ -3,8 +3,12 @@
 require 'cgi'
 
 module Cherrypicker
-  class Youtube
+  class Youtube < PluginBase
     attr_accessor :link, :filename, :location, :download_url
+    
+    def self.matches_provider?(url)
+      url.include?("youtube.com")
+    end
 
     def initialize(link, opts={})
     

data/lib/cherrypicker/version.rb

@@ -1,3 +1,3 @@
 module Cherrypicker
-  VERSION = "0.3.14"
+  VERSION = "0.4.0"
 end

data/test/unit/googlevideo_test.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+module Cherrypicker
+  class YoutubeTest < Test::Unit::TestCase
+  
+    context "Information request" do
+         
+      should "Standard video test" do
+        response = Googlevideo.new("http://video.google.com/videoplay?docid=7065205277695921912")
+        assert response.link.length > 0
+        assert response.filename.length > 0
+        assert response.filename == "Zeitgeist: Addendum"
+        assert UrlAvailable?(response.download_url)
+      end
+      
+      should "Standard video test" do
+        response = Googlevideo.new("http://video.google.com/videoplay?docid=-7060901208354599575")
+        assert response.link.length > 0
+        assert response.filename.length > 0
+        assert response.filename == "Charlie Chaplin A DogsLife"
+        assert UrlAvailable?(response.download_url)
+      end
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: cherrypicker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.14
+  version: 0.4.0
 platform: ruby
 authors: 
 - Karl Entwistle
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 +01:00
+date: 2011-05-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ files:
 - lib/cherrypicker/helpers.rb
 - lib/cherrypicker/linkchecker.rb
 - lib/cherrypicker/plugins/fileserve.rb
+- lib/cherrypicker/plugins/googlevideo.rb
 - lib/cherrypicker/plugins/hotfile.rb
 - lib/cherrypicker/plugins/megavideo.rb
 - lib/cherrypicker/plugins/rapidshare.rb
@@ -52,7 +53,9 @@ files:
 - lib/cherrypicker/plugins/vimeo.rb
 - lib/cherrypicker/plugins/youtube.rb
 - lib/cherrypicker/version.rb
+- lib/cookies.yml
 - test/test_helper.rb
+- test/unit/googlevideo_test.rb
 - test/unit/hotfile_test.rb
 - test/unit/megavideo_test.rb
 - test/unit/rapidshare_test.rb
@@ -90,6 +93,7 @@ specification_version: 3
 summary: Cherrypicker is Ruby Gem it lets you download from; Rapidshare and Hotfile
 test_files: 
 - test/test_helper.rb
+- test/unit/googlevideo_test.rb
 - test/unit/hotfile_test.rb
 - test/unit/megavideo_test.rb
 - test/unit/rapidshare_test.rb