xunlei 0.0.6 → 0.0.7

data/README.md

@@ -39,11 +39,23 @@ Download files according to pattern in file names
 
     xunlei download --only matrix
     xunlei download --except bourne
+
+Add ed2k or magnet link as new task
+
+    xunlei add ed2k_or_magment_link
     
 Google for ed2k and magnet links
 
     xunlei google Repulsion --with 720p
 
+Search simplecd.org for ed2k links
+
+    xunlei simplecd Vendetta 720p
+
+I am feeling lucky :)
+
+    xunlei lucky KEYWORDS
+
 Pass --help to see more tasks and options
 
     xunlei --help

data/bin/xunlei

@@ -3,6 +3,7 @@
 require "xunlei"
 # require File.expand_path("lib/xunlei/version.rb")
 # require File.expand_path("lib/xunlei/engine.rb")
+# require File.expand_path("lib/xunlei/search.rb")
 require "yaml"
 require "commander/import"
 
@@ -24,25 +25,29 @@ def filter_files(options = nil)
   files
 end
 
-def do_dump_cookies(c)
-  c.option "--driver DRIVER", String, "use a different webdriver (e.g. firefox). default is chrome"
-  c.action do |args, options|
-    options.default :driver => "chrome"
-    
-    check_for_config_files
-    check_for_chromedriver
-    credentials = YAML.load_file(xunlei_credential_file_path)
-    engine = Xunlei::Engine.new(credentials[:username], credentials[:password], options.driver.downcase.to_sym)
-
-    File.open(xunlei_cookies_path, "w") do |file|
-      engine.dump_cookies.each do |line|
-        file.write(line)
-      end
+def execute_dump_action(args, options)
+  options.default :driver => "chrome"
+  
+  check_for_config_files
+  check_for_chromedriver
+  credentials = YAML.load_file(xunlei_credential_file_path)
+  engine = Xunlei::Engine.new(credentials[:username], credentials[:password], options.driver.downcase.to_sym)
+
+  File.open(xunlei_cookies_path, "w") do |file|
+    engine.dump_cookies.each do |line|
+      file.write(line)
     end
+  end
 
-    yield(engine) if block_given?
+  yield(engine, args) if block_given?
+
+  engine.stop
+end
 
-    engine.stop
+def do_dump_cookies(c)
+  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)
   end
 end
 
@@ -180,7 +185,7 @@ command :dump_tasks do |c|
   c.syntax= "dump_tasks"
   c.description = "dump all files to #{xunlei_tasks_path}"
   
-  do_dump_cookies(c) do |engine|
+  do_dump_cookies(c) do |engine, args|
     tasks = engine.dump_tasks
     
     current_downloaded_tasks = all_downloaded_tasks & tasks.map { |task| task[:name] }
@@ -206,6 +211,15 @@ command :dump_tasks do |c|
   end
 end
 
+command :add do |c|
+  c.syntax= "add KEYWORD"
+  c.description = "add new task(s)."
+  
+  do_dump_cookies(c) do |engine, args|
+    engine.add_task(args.first)
+  end
+end
+
 command :dump_cookies do |c|
   c.syntax = "dump_cookies"
   c.description = "dump cookies to #{xunlei_cookies_path}"
@@ -278,7 +292,7 @@ command :google do |c|
   c.option "--without WORDS", String, "exclude additional info when Googling"
   c.action do |args, options|
     options.default :with => nil, :without => nil
-    puts "Searching the web for #{args.join(" ")}..."
+    puts "Searching the web for '#{args.join(" ")}'..."
     puts
     search = Xunlei::Search.new
     links = search.google(args, options)
@@ -287,6 +301,42 @@ command :google do |c|
   end
 end
 
+command :simplecd do |c|
+  c.syntax = "simplecd KEYWORD"
+  c.description = "search simplecd for ed2k links using given KEYWORD"
+  c.option "--with WORDS", String, "include additional info when searching"
+  c.option "--without WORDS", String, "exclude additional info when searching"
+  c.action do |args, options|
+    options.default :with => nil, :without => nil
+    puts "Searching simplecd.org for '#{args.join(" ")}'..."
+    puts
+    search = Xunlei::Search.new
+    links = search.google_simplecd(args, options)
+    puts
+    puts "#{links.count} links found."
+  end
+end
+
+command :lucky do |c|
+  c.syntax = "lucky KEYWORD"
+  c.description = "search simplecd for ed2k links using given KEYWORD and create new tasks :)"
+  c.action do |args, options|
+    puts "Searching simplecd.org for '#{args.join(" ")}'..."
+    puts
+    search = Xunlei::Search.new
+    links = search.google_simplecd(args, 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
+alias_command :scd, :simplecd

data/lib/xunlei/engine.rb

@@ -41,6 +41,32 @@ module Xunlei
       all_files
     end
     
+    def add_task(target_address)
+      puts "Adding new task..."
+      # open('|pbcopy', 'w') { |io| io << target_address }
+      
+      @browser.execute_script("add_task_new(0)")
+      
+      @browser.text_field(:id => 'task_url').wait_until_present
+
+      # @browser.send_keys [:command, 'v']
+      @browser.execute_script("document.getElementById('task_url').value = '#{target_address}'")
+      
+      puts "Task URL = \"#{target_address}\""
+      expire_count = 0
+      sleep(2.0)
+      while !(@browser.button(:id => 'down_but').enabled? && expire_count <= 5000)
+        expire_count += 1
+      end
+      if expire_count <= 5000
+        print "Submitting... "
+        @browser.button(:id => 'down_but').when_present.click
+        puts "Done."
+      else
+        puts "Timed out, the button is unavailable."
+      end
+    end
+    
     def stop
       @browser.close
     end

data/lib/xunlei/search.rb

@@ -9,10 +9,20 @@ module Xunlei
     end
     
     def google(keywords, options)
+      do_google(keywords, options, "http://www.google.com/search?q=", 10)
+    end
+    
+    def google_simplecd(keywords, options)
+      do_google(keywords, options, "http://www.google.com/search?q=site:simplecd.org+", 1)
+    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 "http://www.google.com/search?q=#{q}"
+      @browser.goto "#{prefix}#{q}"
       
       @browser.div(:id => "ires").wait_until_present
       
@@ -20,17 +30,22 @@ module Xunlei
       @browser.lis(:class => "g").each { |li| page_links << li.as.first.href }
       
       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 = 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
       end
       
       @browser.close

data/lib/xunlei/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xunlei
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-17 00:00:00.000000000Z
+date: 2011-12-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70148914821960 !ruby/object:Gem::Requirement
+  requirement: &70299977384620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148914821960
+  version_requirements: *70299977384620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70148914821440 !ruby/object:Gem::Requirement
+  requirement: &70299977384200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148914821440
+  version_requirements: *70299977384200
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70148914820920 !ruby/object:Gem::Requirement
+  requirement: &70299977383780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148914820920
+  version_requirements: *70299977383780
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70148914820380 !ruby/object:Gem::Requirement
+  requirement: &70299977383280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70148914820380
+  version_requirements: *70299977383280
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70148914819960 !ruby/object:Gem::Requirement
+  requirement: &70299977382860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70148914819960
+  version_requirements: *70299977382860
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70148914819420 !ruby/object:Gem::Requirement
+  requirement: &70299977382440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70148914819420
+  version_requirements: *70299977382440
 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: -3735410626781629397
+      hash: 1170829789028878004
 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: -3735410626781629397
+      hash: 1170829789028878004
 requirements: []
 rubyforge_project: xunlei
 rubygems_version: 1.8.11