arb-xmu-course 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faa1cdb5d3d96c3a79fd07d63d077978eee9fa01
-  data.tar.gz: 3ff92b1591be12dd60f78699233e87d17f320188
+  metadata.gz: ad79bdaebc016960dc856a9bbac2758a2fadf00e
+  data.tar.gz: d717f48f46109f8f683dc90879cab3d88ec286c7
 SHA512:
-  metadata.gz: ec55e9d04a7a59894d96752ebf0b584c12941543cdb8ed02869c94aac4156c282de91f35f6fa9f9c6f0d78e0565f75be4237304a9b7b95b50c916bd91a735b60
-  data.tar.gz: edb38c3d58380f07663e0c72b2d28c7e7d96b89e1df7e04fe52ece673569969679134253a1600b1e49a37e7dc8bfc5aabe3f91e6c51ef951a4cd64ad298c6d95
+  metadata.gz: 1c2cfe9ced779a47efd2e5afba8b9018d36c15e294af4182f49dcca43f7931ebb474c7e4e743c105475dfdda63f3182de3bbd386a092a69e175fcfa6c80137b9
+  data.tar.gz: 3422450527621467757d33baf1e010cfc390ff0dd00599da2d4bbf541bc285f8205a82b78ec0614d5164a37f2b567db4f19b35fec6ccd9d08477e7ec1a318359

data/bin/arb-xmu-course

@@ -42,6 +42,8 @@ def select_course_common(client, url, xxlx)
   loop do
     global_gets
   end
+rescue Timeout::Error, HTTPClient::TimeoutError
+  exit_with_error "服务器无响应，程序结束运行。"
 end
 
 def set_up_account
@@ -118,24 +120,33 @@ def parse_courses(raw_html)
   courses.select { |course| course.id.size>0 }
 end
 
-def create_attempt_thread(max_interval, client, course, xxlx, lcid, &block)
+def create_attempt_thread(max_interval, client, course, xxlx, lcid, retry_count, &block)
   Thread.new do
-    count=0
-    loop do
-      count+=1
-      interval= 1+rand(max_interval)
-      res = request_select_course(client, course, xxlx, lcid)
-      if res['success']
-        global_puts "《#{course.name}》（#{course.class_name}班）已经成功选课！" 
-        break
-      else
-        global_puts  "《#{course.name}》（#{course.class_name}班）第#{count}次尝试选课失败，#{interval}秒后将重试。（#{filter_text(res['message'])}）"
+    begin
+      count=0
+      loop do
+        count+=1
+        interval= 1+rand(max_interval)
+        begin
+          res = request_select_course(client, course, xxlx, lcid)
+          if res['success']
+            global_puts "《#{course.name}》（#{course.class_name}班）已经成功选课！" 
+            break
+          else
+            global_puts  "《#{course.name}》（#{course.class_name}班）第#{count}次尝试选课失败，#{interval}秒后将重试。（#{filter_text(res['message'])}）"
+          end
+          sleep interval
+        rescue Timeout::Error, HTTPClient::TimeoutError
+          retry if retry_count!=0 and retry_count-=1 and global_puts('网络超时，重新连接中……')
+          exit_with_error('超时次数耗尽，程序结束运行。') if retry_count==0
+        end
       end
-      sleep interval
+      opened_thread_count=block.binding.local_variable_get(:opened_thread_count)
+      exit unless opened_thread_count > 0
+      block.binding.local_variable_set :opened_thread_count, opened_thread_count-1
+    rescue
+      exit_with_error('未知原因导致程序运行出错，请联系作者。')
     end
-    opened_thread_count=block.binding.local_variable_get(:opened_thread_count)
-    exit unless opened_thread_count > 0
-    block.binding.local_variable_set :opened_thread_count, opened_thread_count-1
   end
 end
 
@@ -171,7 +182,7 @@ def try_to_select_courses(client, courses, xxlx, lcid)
   max_interval = 3 if max_interval<3
   opened_thread_count = ids.size
   ids.each do |id|
-    create_attempt_thread(max_interval, client, courses.find { |course| course.index==id }, xxlx, lcid) {}
+    create_attempt_thread(max_interval, client, courses.find { |course| course.index==id }, xxlx, lcid, $arb_retry_count) {}
   end
 end
 
@@ -224,11 +235,12 @@ def filter_text(raw)
 end
 
 def global_puts(*args)
-  fileout=File.open($logfile,'a') if $logfile
+  fileout=File.open($arb_logfile,'a') if $arb_logfile
   [fileout,$stdout].compact.each do |stream|
-    stream.puts '',Time.now,*args
+    stream.puts Time.now,*args,''
   end
-  fileout.close rescue nil
+  fileout.close rescue true
+  true
 end
 
 def global_gets(*args)
@@ -238,19 +250,25 @@ def global_gets(*args)
   tmp
 end
 
+def exit_with_error(*args)
+  global_puts(*args) and exit
+end
+
 
 TOKEN_FILE_NAME = 'encrypted_token'
 TOKEN_SEPARATOR = ':'
 CLIENT = HTTPClient.new
+CLIENT.tap{|client| client.methods.grep(/timeout=$/).each{|method| client.send(method,20)}}
 
 begin
   opts = Slop.parse do |o|
-    o.banner="为缓解选课服务器压力，请酌情选择较大的“最大重试间隔”，此外，在任何需要输入的地方输入“q”或“quit”可以结束本程序。       -Powered By AryBin"
+    o.banner="为缓解选课服务器压力，请酌情选择较大的“最大重试间隔”。在任何需要输入的地方输入“q”或“quit”可以结束本程序。 --Powered By AryBin"
 
     o.bool *%w{-h --help}, '显示帮助'
     o.bool *%w{-c --clear}, '清除本地账户信息'
     o.bool *%w{-r --reset}, '重置账户信息'
     o.string *%w{-l --log},'记录到指定的日志文件'
+    o.integer *%w{-R --retry-count},'超时重连次数，默认无限次'
 
     #院选课程 xxlx=4
     o.bool *%w{-s --school}, '院选选课模式'
@@ -268,14 +286,18 @@ begin
     o.bool *%w{-v --version}, '显示当前版本'
   end
 rescue Slop::MissingArgument
-  global_puts '参数不足，请确认。'
+  exit_with_error '参数不足，请确认。'
 rescue Slop::UnknownOption
-  global_puts '未知选项，请确认。'
+  exit_with_error '未知选项，请确认。'
+rescue
 end
 
 #error
 exit unless opts
-$logfile = opts[:log]
+$arb_logfile = opts[:log]
+$arb_retry_count = opts[:'retry-count'] or -1
+global_puts '参数解析完毕，连接服务器……'
+
 
 case true
 when opts.clear?

data/lib/arb/xmu/course/version.rb

@@ -1,7 +1,7 @@
 module Arb
   module Xmu
     module Course
-      VERSION = '2.4.0'
+      VERSION = '2.5.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arb-xmu-course
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - arybin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler