xunlei 0.0.5 → 0.0.6

data/bin/xunlei

@@ -218,23 +218,26 @@ command :download do |c|
   c.description = "download all files in #{xunlei_tasks_path}"
   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.action do |args, options|
     options.default :only => nil, :except => nil
     
     files = filter_files(options)
     
+    files.reverse! if options.reverse
+    
     if files.empty?
       puts "Nothing to do."
     else
       puts "\nAbout to download following files:"
       puts
-      filter_files(options).each do |file|
+      files.each do |file|
         puts file[:name]
       end
       
       if agree("\nConfirm? (yes or no)")
-        filter_files(options).each do |file|
+        files.each do |file|
           cmd = "wget --load-cookies=#{xunlei_cookies_path} '#{file[:url]}' -c -O \"#{file[:name]}\""
           if system(cmd)
             move_to_downloaded_file(file)

data/lib/xunlei/engine.rb

@@ -9,6 +9,10 @@ module Xunlei
       @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
     end
     
     def dump_cookies
@@ -62,7 +66,7 @@ module Xunlei
     end
     
     def process_current_page
-      get_task_list.divs(:class => "rw_list").inject([]) do |all_files, task_div|
+      get_task_list.divs(:class => "rw_inter").inject([]) do |all_files, task_div|
         all_files += process_task(task_div)
       end
     end
@@ -71,7 +75,9 @@ module Xunlei
       task_files = []
       
       task_div.wait_until_present
-
+      
+      @browser.execute_script("document.getElementById('#{task_div.parent.id}').scrollIntoView()")
+      
       if task_is_ready?(task_div)
         # puts "task is ready"
         task_div.click
@@ -95,7 +101,7 @@ module Xunlei
     
     def process_normal_task(task_div)
       normal_task_a = task_div.span(:class => "namelink").as.first
-      task_id = task_div.id.gsub(/\D+/, "")
+      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 }
     end

data/lib/xunlei/version.rb

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

metadata

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