arb-xmu-course 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ea9805a0a962e812c6401616c1144f41bad7d91
-  data.tar.gz: d54afdb50f4d0a7abb0d9eecf1a1e7f675e8506a
+  metadata.gz: e85f64acb48eb553e908353453ac7e976cad47d6
+  data.tar.gz: 74bcb5fbc624ad94e17a454676fbfe722f11a9d7
 SHA512:
-  metadata.gz: 04533927f412c01fef853fb082f334cc25d0bce8ba044619102ef6696ae4c689ea3b2fdc58ac460063dd5796348d997f488767f85f21bd62d6640527e2a22e58
-  data.tar.gz: a55d52b58c144f6189bb0c597d85f8491198c099b62acfec8c1a813b0a51c024b8c4e4eb0ff3a6aecfbb0c0c7d6e6d1502ee9952e4597581c1b5838f30cb8fdc
+  metadata.gz: 9451ef7d6f5710ecf9eb25544a690a65a4b6c972bee897eac0de1feea3b5ec0a1ecf974dc3ca40fcd6bc38550f029d034f09b22c75ad30a1ae79de14e68ea25c
+  data.tar.gz: 3d59a5b48c0221a22976b296fd51bdacb36626dd0af1b56d7138d6d6bf3c7ab04116b87edd0c5a32581dc8e6ed3f4623d65a4c6de809dcf3f5f632215ead7a5d

data/bin/arb-xmu-course

@@ -22,7 +22,7 @@ def filter_text(raw)
       end
     end
   end
-  black_list =([] << "\r" << "\n" << "\t" << "'")
+  black_list =([] << "\r" << "\n" << "\t" << "'" << '<br>')
   black_list.each do |tmp|
     raw.gsub! tmp, ''
   end
@@ -122,10 +122,10 @@ def create_attempt_thread(max_interval, client, course, xxlx, lcid, &block)
       sleep interval
       res = request_select_course(client, course, xxlx, lcid)
       if res['success']
-        $stdout.puts "课程：《#{course.name}》已经成功选课！"
+        $stdout.puts '', "课程：《#{course.name}》已经成功选课！", ''
         break
       else
-        $stdout.puts "课程：《#{course.name}》第#{count}次尝试选课失败，#{interval}秒后将重试。（错误信息：#{res['message']}）"
+        $stdout.puts '', "课程：《#{course.name}》第#{count}次尝试选课失败，#{interval}秒后将重试。（错误信息：#{filter_text(res['message'])}）", ''
       end
       exit if block.binding.local_variable_get(:opened_thread_count)-1==0
     end
@@ -133,24 +133,29 @@ def create_attempt_thread(max_interval, client, course, xxlx, lcid, &block)
 end
 
 def prepare_select_course(client)
-  ensure_account
+  ensure_local_account
   username, password = get_account_info
   authorize_session(client, username, password)
 end
 
-def try_to_select_courses(client, courses, xxlx, lcid)
-  $stdout.puts ''
-  $stdout.puts '输入要选的课程ID， 以空格分割：'
-
-  ids = $stdin.gets.chomp.split(' ')
-
-  $stdout.puts '输入最大重试间隔时间，要求不得低于2秒：'
+def process_ids(str_ids)
+  #return int_ids
+  int_ids = str_ids.map do |item|
+    next item.to_i unless item=~/[^0-9]/
+    next (Range.new *(item.split('-').map(&:to_i))).to_a if item.include? '-'
+  end
+  int_ids.flatten.uniq
+end
 
+def try_to_select_courses(client, courses, xxlx, lcid)
+  $stdout.puts '', '输入要选的课程ID（重复无效，支持语法糖：x-y，会尝试选择ID从x到y的所有课程）， 以空格分割：'
+  ids = process_ids($stdin.gets.chomp.split(' '))
+  $stdout.puts '输入最大重试间隔时间，要求不得低于3秒：'
   max_interval = $stdin.gets.chomp.to_i
-  max_interval = 2 if max_interval<2
+  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.to_i }, xxlx, lcid) {}
+    create_attempt_thread(max_interval, client, courses.find { |course| course.index==id }, xxlx, lcid) {}
   end
 end
 
@@ -160,34 +165,37 @@ def get_account_info
     stu_id, passwd=SimpleDes.decrypt(file.read.split(TOKEN_SEPARATOR))
   end
   [stu_id, passwd]
+rescue
+  puts '账号信息受损，请重新设置：'
+  set_up_account && exit
 end
 
-
-def select_school_elective(client)
-
+def select_course_common(client, url, xxlx)
   prepare_select_course(client)
-  school_courses = parse_courses((client.get 'http://bkxk.xmu.edu.cn/xsxk/yxxx.html').body)
-  show_courses_in_table school_courses
-  try_to_select_courses(client, school_courses, 4, get_main_select_round(client))
-
+  courses = parse_courses((client.get url).body)
+  show_courses_in_table courses
+  try_to_select_courses(client, courses, xxlx, get_main_select_round(client))
   loop do
     sleep 3
   end
 end
 
-def select_general_elective
-
+def select_school_elective(client)
+  select_course_common client, 'http://bkxk.xmu.edu.cn/xsxk/yxxx.html?pagination=5000', 4
 end
 
-def select_public
+def select_general_elective(client)
+  select_course_common client, 'http://bkxk.xmu.edu.cn/xsxk/qxxxx.html?pagination=5000', 3
+end
 
+def select_public(client)
+  select_course_common client, 'http://bkxk.xmu.edu.cn/xsxk/ggk.html?pagination=5000', 5
 end
 
-def ensure_account
+def ensure_local_account
   unless (File.exists? TOKEN_FILE_NAME)
-    puts '请先设置账户信息（账户信息会先加密然后保存在本地，用于授权选课系统）'
-    set_up_account
-    exit
+    puts '请先设置账号信息（账号信息会先加密然后保存在本地，用于授权选课系统）'
+    set_up_account && exit
   end
 end
 
@@ -218,9 +226,9 @@ case true
   when opts.school?
     select_school_elective(CLIENT)
   when opts.general?
-    # select_general_elective
+    select_general_elective(CLIENT)
   when opts.public?
-    # select_public
+    select_public(CLIENT)
   else
     puts(opts) && exit
 end

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

@@ -1,7 +1,7 @@
 module Arb
   module Xmu
     module Course
-      VERSION = '1.2.1'
+      VERSION = '2.0.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arb-xmu-course
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - arybin