xunlei 0.0.12 → 0.0.13

data/.rspec

@@ -0,0 +1 @@
+--color

data/README.md

@@ -6,6 +6,8 @@ lixian.vip.xunlei.com utility script for Mac OS X users
 Summary:
 -----------
 
+[![Build Status](https://secure.travis-ci.org/forresty/xunlei.png?branch=master)](http://travis-ci.org/forresty/xunlei)
+
 This is a browser script for lixian.vip.xunlei.com.
 It drives Google Chrome with [chromedriver](http://code.google.com/p/selenium/wiki/ChromeDriver) to do automation tasks for you,
 so please make sure you have Google Chrome installed first.
@@ -50,18 +52,6 @@ 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
-
-    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

@@ -2,6 +2,8 @@
 
 require "xunlei"
 require "commander/import"
+require "nokogiri"
+require "open-uri"
 
 require "xunlei/helpers/cli_helper"
 include Xunlei::Helper::CLIHelper
@@ -88,13 +90,15 @@ command :download do |c|
   c.option "--only PATTERN", String, "only download files which names include PATTERN"
   c.option "--except PATTERN", String, "do not download files which names include PATTERN"
   c.option "--reverse", "download files in reverse order"
+  c.option '--limit NUM', Integer, 'limit the number of files to download'
 
   c.action do |args, options|
-    options.default :only => nil, :except => nil
+    options.default :only => nil, :except => nil, :limit => 65535
 
     files = filter_files(YAML.load_file(xunlei_tasks_path), options)
 
     files.reverse! if options.reverse
+    files = files[0, options.limit]
 
     if files.empty?
       puts "Nothing to do."
@@ -138,55 +142,10 @@ command :config do |c|
   end
 end
 
-command :google do |c|
-  c.syntax = "google KEYWORD"
-  c.description = "google for ed2k links using given KEYWORD"
-  c.option "--with WORDS", String, "include additional info when Googling"
-  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
-    search = Xunlei::Search.new
-    links = search.google(args, options)
-    puts
-    puts "#{links.count} links found."
-  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
+def find_links_in_page(page_url, options)
+  doc = Nokogiri::HTML(open(page_url) { |p| p.read })
+  links = doc.css("a").select { |a| !a['href'].nil? && a['href'] =~ /ed2k:|magnet:/ }.map { |a| a['href'] }
+  filter_names(links, options).tap { |links| links.map { |l| puts l } }
 end
 
 command :add_page do |c|
@@ -198,14 +157,15 @@ command :add_page do |c|
     options.default :only => nil, :except => nil
     puts "Adding page '#{args.first}'..."
     puts
-    search = Xunlei::Search.new
-    links = search.add_page(args.first, options)
+    links = find_links_in_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)
+    if links.count > 0
+      execute_dump_action(args, options) do |engine, args|
+        links.each do |link|
+          engine.add_task(link)
+        end
       end
     end
   end
@@ -213,5 +173,3 @@ end
 
 alias_command :down, :download
 alias_command :dump, :dump_tasks
-alias_command :search, :google
-alias_command :scd, :simplecd

data/lib/xunlei.rb

@@ -1,3 +1,2 @@
 require "xunlei/version"
 require "xunlei/engine"
-require "xunlei/search"

data/lib/xunlei/engine.rb

@@ -6,66 +6,35 @@ module Xunlei
     def initialize(username, password, driver = :chrome)
       @browser = Watir::Browser.new driver
       @browser.goto "http://lixian.vip.xunlei.com"
-
-      @browser.text_field(:id => "u").when_present.set(username)
-      @browser.text_field(:id => "p_show").when_present.set(password)
-      @browser.button(:id => "button_submit4reg").when_present.click
-
-      # temp fix for stupid cloud VOD popup
-      wait_until_all_loaded
-      #@browser.div(:class => "p_rw_pop p_sc_pop p_yuntips").p(:class => 'p_btm_aline').as.first.when_present.click
+      signin(username, password)
+      wait_till_all_loaded
     end
 
+    require "xunlei/helpers/cookie_helper"
+    include ::Xunlei::Helper::CookieHelper
     def dump_cookies
-      wait_until_all_loaded
-
-      cookies = []
-      @browser.driver.manage.all_cookies.each do |cookie|
-        domain = cookie[:domain]
-        path = cookie[:path]
-        expires = cookie[:expires] ? cookie[:expires].strftime("%s") : "0"
-        name = cookie[:name]
-        value = cookie[:value]
-        cookies << "#{domain}\tTRUE\t#{path}\tFALSE\t#{expires}\t#{name}\t#{value}\n"
-      end
-
-      cookies
+      wait_till_all_loaded
+      @browser.driver.manage.all_cookies.inject([]) { |all_cookies, c| all_cookies << format_cookie(c) }
     end
 
     def dump_tasks
-      all_files = []
-
-      sleep 2
-      begin
-        all_files += process_current_page
-      end while next_page
-
+      all_files = dump_current_page
+      while next_page?
+        next_page!
+        all_files += dump_current_page
+      end
       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... "
+      if added_successfully?
         @browser.button(:id => 'down_but').when_present.click
-        puts "Done."
       else
-        puts "Timed out, the button is unavailable."
+        puts "Operation timed out."
       end
     end
 
@@ -73,111 +42,149 @@ module Xunlei
       @browser.close
     end
 
-  private
+    private
 
-    def wait_until_all_loaded
-      get_task_list
+    def added_successfully?
+      10.times do
+        sleep 1
+        return true if @browser.button(:id => 'down_but').enabled?
+      end
+      false
     end
 
-    def get_task_list
-      task_list = @browser.div(:id => "rowbox_list")
-      task_list.wait_until_present
-      task_list
+    def signin(username, password)
+      @browser.text_field(:id => "u").when_present.set(username)
+      @browser.text_field(:id => "p_show_err").click
+      @browser.text_field(:id => "p_show").when_present.set(password)
+      @browser.a(:id => "button_submit4reg").click
     end
 
-    def next_page
-      next_li = @browser.li(:class => "next")
+    def wait_till_all_loaded
+      get_task_list
+    end
 
-      return false unless next_li.present?
+    def get_task_list
+      @browser.div(:id => "rowbox_list").tap { |list| list.wait_until_present }
+    end
 
-      next_li.as.first.click
+    def next_page?
+      @browser.li(:class => "next").present?
+    end
 
-      wait_until_all_loaded
+    def next_page!
+      @browser.li(:class => "next").a.click
+      wait_till_all_loaded
     end
 
-    def process_current_page
-      get_task_list.divs(:class => "rw_inter").inject([]) do |all_files, task_div|
-        all_files += process_task(task_div)
+    def dump_current_page
+      get_task_list.divs(:class => "rw_inter").inject([]) do |result, div|
+        @current_task_id = div.parent.id.gsub(/\D+/, "")
+        result += dump_task
       end
     end
 
-    def process_task(task_div)
-      task_files = []
+    def bt_task?
+      task_div.div(:class => "w03img").img.src == "http://cloud.vip.xunlei.com/160/img/icon_type/tpimg_bt.png"
+    end
 
-      task_div.wait_until_present
+    def expand_task_div!
+      task_div.click
+      task_div.a(:class => "rwbtn ic_redownloca").wait_until_present
+    end
 
+    def wait_till_task_loaded
+      task_div.wait_until_present
       @browser.execute_script("document.getElementById('#{task_div.parent.id}').scrollIntoView()")
+    end
 
-      if task_is_ready?(task_div)
-        # puts "task is ready"
-        task_div.click
-        task_div.a(:class => "rwbtn ic_redownloca").wait_until_present
+    def task_div
+      @browser.div(:id => "tr_c#{@current_task_id}").div(:class => "rw_inter")
+    end
+
+    def dump_task
+      return [] unless task_finished?
 
-        if task_div.div(:class => "w03img").imgs.first.src == "http://cloud.vip.xunlei.com/160/img/icon_type/tpimg_bt.png"
-          task_files += process_bt_task(task_div)
-        else
-          task_files << process_normal_task(task_div)
-        end
+      expand_task_div!
+
+      if bt_task?
+        dump_bt_task
       else
-        # still downloading
+        dump_normal_task
       end
+    end
 
-      task_files
+    def task_finished?
+      wait_till_task_loaded
+      task_div.em(:class => "loadnum").text == "100%" rescue false
     end
 
-    def task_is_ready?(task_div)
-      task_div.em(:class => "loadnum").text == "100%"
+    def dump_normal_task
+      [{
+        :name => task_div.span(:class => "namelink").as.first.text.gsub(/'|\\/,""),
+        :url => task_div.input(:id => "dl_url" + @current_task_id).value,
+        :size => task_div.span(:id => "size#{@current_task_id}").text
+      }]
     end
 
-    def process_normal_task(task_div)
-      normal_task_a = task_div.span(:class => "namelink").as.first
-      task_id = task_div.parent.id.gsub(/\D+/, "")
-      normal_task_input = task_div.input(:id => "dl_url" + task_id)
-      { :name => normal_task_a.text.gsub(/'|\\/,""), :url => normal_task_input.value, :size => task_div.span(:id => "size#{task_id}").text }
+    def dump_bt_task
+      enter_bt_task!
+
+      task_files = bt_dump_current_page
+
+      (1...bt_num_pages).each do |current_page|
+        bt_next_page!(current_page)
+        task_files += bt_dump_current_page
+      end
+
+      go_back_from_bt_task!
+
+      task_files
     end
 
-    def process_bt_task(task_div)
+    def bt_folder_list
+      @browser.div(:id => "rwbox_bt_list").tap { |folder_list| folder_list.wait_until_present }
+    end
+
+    def bt_dump_current_page
       task_files = []
-      task_div.a(:class => "rwbtn ic_open").when_present.click
 
-      next_page_exists = false
-      begin
-        folder_list = @browser.div(:id => "rwbox_bt_list")
-        folder_list.wait_until_present
-
-        index = 0
-        folder_list.spans(:class => "namelink").each do |span|
-          s = span.spans.first
-          size = folder_list.input(:id => "bt_size#{index}").attribute_value('value')
-          task_files << { :name => s.title, :url => s.attribute_value('href'), :size => size }
-          index += 1
-        end
-        # to check if there is a next page
-        next_bt_link = @browser.a(:title => "下一页")
-        break unless next_bt_link.exists?
-
-        next_page_exists = next_bt_link.attribute_value("class") != "a_up"
-        @browser.execute_script next_bt_link.attribute_value("onclick")
-        time0 = Time.new
-        begin
-          if folder_list.spans(:class => "namelink").first.spans.first.title != @browser.div(:id => "rwbox_bt_list").spans(:class => "namelink").first.spans.first.title
-            break
-          end
-        rescue
-          break
-        end while next_page_exists && Time.now - time0 < 5
-        sleep 1
-      end while next_page_exists
+      bt_folder_list.spans(:class => "namelink").each_with_index do |s, index|
+        size = bt_folder_list.input(:id => "bt_size#{index}").attribute_value('value')
+        task_files << { :name => s.span.title, :url => s.span.attribute_value('href'), :size => size }
+      end
+      task_files
+    end
 
-      go_back_from_bt_task
+    def bt_next_page_link
+      @browser.a(:title => "下一页")
+    end
 
-      task_files
+    def bt_num_pages
+      bt_next_page_link.exists? ? @browser.as(:class => 'palink').map(&:text).last.to_i : 1
+    end
+
+    def bt_next_page!(current_page)
+      bt_next_page_link.click
+      wait_till_bt_next_page_loaded(current_page)
     end
 
-    def go_back_from_bt_task
-      back_div = @browser.div(:id => "view_bt_list_nav")
-      back_div.wait_until_present
-      back_div.lis(:class => "main_link main_linksub").first.a(:class => "btn_m").click
+    def wait_till_bt_next_page_loaded(current_page)
+      20.times do
+        sleep 0.5
+        return if @browser.as(:class => 'palink').map(&:text).map(&:to_i).include?(current_page)
+      end
+      raise "BT task timed out when trying to fetch next page"
+    end
+
+    def enter_bt_task!
+      task_div.a(:class => "rwbtn ic_open").when_present.click
+    end
+
+    def go_back_from_bt_task!
+      @browser.div(:id => "view_bt_list_nav").tap do |back_div|
+        back_div.wait_until_present
+        back_div.li(:class => "main_link main_linksub").a(:class => "btn_m").click
+      end
     end
   end
 end

data/lib/xunlei/helpers/cli_helper.rb

@@ -6,15 +6,19 @@ module Xunlei
       require "xunlei/configurator"
       include ::Xunlei::Config
 
-      def filtered?(file, options)
+      def filtered?(name, options)
         return false unless options
-        return true if !options.only.nil? and !(file[:name] =~ /#{options.only}/i)
-        return true if !options.except.nil? and file[:name] =~ /#{options.except}/i
+        return true if !options.only.nil? and !(name =~ /#{options.only}/i)
+        return true if !options.except.nil? and name =~ /#{options.except}/i
         false
       end
 
       def filter_files(files, options=nil)
-        files.select{ |file| !filtered?(file, options) }.inject([], :<<)
+        files.select { |file| !filtered?(file[:name], options) }.inject([], :<<)
+      end
+
+      def filter_names(names, options=nil)
+        names.select { |name| !filtered?(name, options) }.inject([], :<<)
       end
 
       def total_size(file_sizes)

data/lib/xunlei/helpers/cookie_helper.rb

@@ -0,0 +1,10 @@
+module Xunlei
+  module Helper
+    module CookieHelper
+      def format_cookie(cookie)
+        expires = cookie[:expires] ? cookie[:expires].strftime("%s") : "0"
+        "#{cookie[:domain]}\tTRUE\t#{cookie[:path]}\tFALSE\t#{expires}\t#{cookie[:name]}\t#{cookie[:value]}\n"
+      end
+    end
+  end
+end

data/lib/xunlei/version.rb

@@ -1,3 +1,3 @@
 module Xunlei
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require "simplecov"
-SimpleCov.start
+SimpleCov.start do
+  add_filter 'spec'
+end
 
 Dir["./lib/xunlei/**/*.rb"].each { |file| require file }

data/spec/xunlei/engine_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
 
 describe Xunlei::Engine do
-
 end

data/spec/xunlei/helpers/cli_helper_spec.rb

@@ -13,7 +13,7 @@ describe Xunlei::Helper::CLIHelper do
 
   describe "filtered?" do
     before(:each) do
-      @file = { :name => "MatRiX" }
+      @file = "MatRiX"
     end
 
     it "should have a filtered? method" do
@@ -48,7 +48,7 @@ describe Xunlei::Helper::CLIHelper do
     it "should have a total_size method" do
       @main.should respond_to(:total_size)
     end
-    
+
     it "should calculate total size correctly" do
       @main.total_size(%w{1.1G 300M 512K}).should == 1.1 * 1000 + 300 + 1
     end

data/spec/xunlei/helpers/cookie_helper_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+module Xunlei
+  module Helper
+    describe CookieHelper do
+      let(:helper) { Class.new { include CookieHelper }.new }
+
+      describe "format_cookie" do
+        it "should format_cookie" do
+          expected = ".vip.xunlei.com\tTRUE\t/\tFALSE\t0\tlx_referfrom\t\n"
+          cookie_hash = {
+            :name => "lx_referfrom",
+            :value => "",
+            :path => "/",
+            :domain => ".vip.xunlei.com",
+            :expires => nil,
+            :secure => false
+          }
+
+          helper.format_cookie(cookie_hash).should == expected
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xunlei
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-07 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70260136889200 !ruby/object:Gem::Requirement
+  requirement: &70234773620780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70260136889200
+  version_requirements: *70234773620780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70260136888780 !ruby/object:Gem::Requirement
+  requirement: &70234773620360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70260136888780
+  version_requirements: *70234773620360
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70260136888360 !ruby/object:Gem::Requirement
+  requirement: &70234773619940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70260136888360
+  version_requirements: *70234773619940
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70260136887940 !ruby/object:Gem::Requirement
+  requirement: &70234773619520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70260136887940
+  version_requirements: *70234773619520
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70260136887520 !ruby/object:Gem::Requirement
+  requirement: &70234773619100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70260136887520
+  version_requirements: *70234773619100
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70260136887100 !ruby/object:Gem::Requirement
+  requirement: &70234773618660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70260136887100
+  version_requirements: *70234773618660
 description: A browser script to access lixian.vip.xunlei.com tasks automatically
 email:
 - afu@forresty.com
@@ -86,6 +86,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - Gemfile.ci
@@ -96,11 +97,12 @@ files:
 - lib/xunlei/configurator.rb
 - lib/xunlei/engine.rb
 - lib/xunlei/helpers/cli_helper.rb
-- lib/xunlei/search.rb
+- lib/xunlei/helpers/cookie_helper.rb
 - lib/xunlei/version.rb
 - spec/spec_helper.rb
 - spec/xunlei/engine_spec.rb
 - spec/xunlei/helpers/cli_helper_spec.rb
+- spec/xunlei/helpers/cookie_helper_spec.rb
 - xunlei.gemspec
 homepage: ''
 licenses: []
@@ -116,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1510607744516824055
+      hash: -147464010807530780
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1510607744516824055
+      hash: -147464010807530780
 requirements: []
 rubyforge_project: xunlei
 rubygems_version: 1.8.11
@@ -136,3 +138,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/xunlei/engine_spec.rb
 - spec/xunlei/helpers/cli_helper_spec.rb
+- spec/xunlei/helpers/cookie_helper_spec.rb

data/lib/xunlei/search.rb

@@ -1,62 +0,0 @@
-require "Nokogiri"
-require "uri"
-require "open-uri"
-
-module Xunlei
-  class Search
-    def initialize(driver = :chrome)
-    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
-    
-    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?
-      
-      search_result = Nokogiri::HTML(open("#{prefix}#{q}") { |page| page.read })
-      page_links = search_result.css(".g h3 a").map { |a| "http://www.google.com" + a['href'] }[0, limit]
-      
-      ed2k_links = []
-      
-      page_links.each do |page_link|
-        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
-      
-      ed2k_links
-    end
-  end
-end