xunlei 0.0.7 → 0.0.8

data/README.md

@@ -43,6 +43,10 @@ Download files according to pattern in file names
 Add ed2k or magnet link as new task
 
     xunlei add ed2k_or_magment_link
+
+Add all ed2k or magnet links on given web page as new tasks
+
+    xunlei add_page http://page_with_a_chunk_load_of_links/
     
 Google for ed2k and magnet links
 

data/bin/xunlei

@@ -44,10 +44,10 @@ def execute_dump_action(args, options)
   engine.stop
 end
 
-def do_dump_cookies(c)
+def do_dump_cookies(c, &block)
   c.option "--driver DRIVER", String, "use a different webdriver (e.g. firefox). default is chrome"
   c.action do |args, options|
-    execute_dump_action(args, options)
+    execute_dump_action(args, options, &block)
   end
 end
 
@@ -336,6 +336,28 @@ command :lucky do |c|
   end
 end
 
+command :add_page do |c|
+  c.syntax = "add_page URL"
+  c.description = "add all ed2k and magnet links as new tasks on given web page :)"
+  c.option "--only PATTERN", String, "only add links which names include PATTERN"
+  c.option "--except PATTERN", String, "do not add links which names include PATTERN"
+  c.action do |args, options|
+    options.default :only => nil, :except => nil
+    puts "Adding page '#{args.first}'..."
+    puts
+    search = Xunlei::Search.new
+    links = search.add_page(args.first, options)
+    puts
+    puts "#{links.count} links found."
+    
+    execute_dump_action(args, options) do |engine, args|
+      links.each do |link|
+        engine.add_task(link)
+      end
+    end
+  end
+end
+
 alias_command :down, :download
 alias_command :dump, :dump_tasks
 alias_command :search, :google

data/lib/xunlei/search.rb

@@ -1,11 +1,10 @@
-require "watir-webdriver"
 require "Nokogiri"
 require "uri"
+require "open-uri"
 
 module Xunlei
   class Search
     def initialize(driver = :chrome)
-      @browser = Watir::Browser.new driver
     end
     
     def google(keywords, options)
@@ -16,40 +15,47 @@ module Xunlei
       do_google(keywords, options, "http://www.google.com/search?q=site:simplecd.org+", 1)
     end
     
+    def add_page(page_url, options)
+      doc = Nokogiri::HTML(open(page_url) { |page| page.read })
+      links = []
+      
+      doc.css("a").select do |a|
+        !a['href'].nil? && a['href'] =~ /ed2k:|magnet:/
+      end.map do |a|
+        a['href']
+      end.uniq.each do |link|
+        if !options.only.nil?
+          links << link if link =~ /#{options.only}/i
+        elsif !options.except.nil?
+          links << link unless link =~ /#{options.except}/i
+        else
+          links << link
+        end
+      end
+      links.each { |link| puts link }
+      links
+    end
+    
   private
   
     def do_google(keywords, options, prefix, limit)
       q = [keywords, options.with, "ed2k"].flatten.join("+")
       q += "+-" + options.without unless options.without.nil?
       
-      @browser.goto "#{prefix}#{q}"
-      
-      @browser.div(:id => "ires").wait_until_present
-      
-      page_links = []
-      @browser.lis(:class => "g").each { |li| page_links << li.as.first.href }
+      search_result = Nokogiri::HTML(open("#{prefix}#{q}") { |page| page.read })
+      page_links = search_result.css(".g h3 a").map { |a| a['href'] }[0, limit]
       
       ed2k_links = []
       
       page_links.each do |page_link|
-        @browser.goto page_link
-        doc = Nokogiri::HTML(@browser.html)
-        doc.css("a").each do |link|
-          next if link['href'].nil?
-          # href = URI.escape(link['href'])
-          href = link['href']
-          if href =~ /ed2k:|magnet:/ && !ed2k_links.include?(href)
-            puts href
-            ed2k_links << href
-          end
-        end
-        
-        limit -= 1
-        break unless limit > 1
+        doc = Nokogiri::HTML(open(page_link) { |page| page.read })
+        ed2k_links += doc.css("a").select do |a|
+          !a['href'].nil? && a['href'] =~ /ed2k:|magnet:/
+        end.map do |a|
+          a['href'].tap { |a| puts a }
+        end.uniq
       end
       
-      @browser.close
-      
       ed2k_links
     end
   end

data/lib/xunlei/version.rb

@@ -1,3 +1,3 @@
 module Xunlei
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xunlei
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-18 00:00:00.000000000Z
+date: 2011-12-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70299977384620 !ruby/object:Gem::Requirement
+  requirement: &70151191992140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299977384620
+  version_requirements: *70151191992140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70299977384200 !ruby/object:Gem::Requirement
+  requirement: &70151191991700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299977384200
+  version_requirements: *70151191991700
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70299977383780 !ruby/object:Gem::Requirement
+  requirement: &70151191991240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299977383780
+  version_requirements: *70151191991240
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70299977383280 !ruby/object:Gem::Requirement
+  requirement: &70151191990800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70299977383280
+  version_requirements: *70151191990800
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70299977382860 !ruby/object:Gem::Requirement
+  requirement: &70151191990360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70299977382860
+  version_requirements: *70151191990360
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70299977382440 !ruby/object:Gem::Requirement
+  requirement: &70151191989900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70299977382440
+  version_requirements: *70151191989900
 description: A browser script to access lixian.vip.xunlei.com tasks automatically
 email:
 - afu@forresty.com
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1170829789028878004
+      hash: -893131726371942937
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1170829789028878004
+      hash: -893131726371942937
 requirements: []
 rubyforge_project: xunlei
 rubygems_version: 1.8.11