arb-xmu-course 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 033892d7b5333bf00107dbfec09930a09e51d68d
-  data.tar.gz: 6ab649181d6263af37af3248b21084e679b8a28c
+  metadata.gz: 95c02ba43fd8cff44bd99d0992f983f4be15b0a3
+  data.tar.gz: 1fe1077cff0959c77facb0d390bc2ceb7d7c8278
 SHA512:
-  metadata.gz: bef7169c325840623e5af693600a9b694614dc54791185647a343d08bd761290e2e8f1949e705976821b2389028de7320a7e5ebb091bbe7eca7e73f3302b2ade
-  data.tar.gz: 0a02725936ec1a99a09fff4ca0b61704cd1a97309c482a875ffe9075025ff3df7f6ecf6c095665673c34442cf68fa82d5e05eb6091d0db5fc167d906830d8557
+  metadata.gz: f83d157aed86f3291b09dd02f4d977fc71a65b7488577f73f85edd0adc5be632acea93ed9485d444b1f005b4f3a959b8a269d02f18a0bcf2c4e0bfcc8aa3a42c
+  data.tar.gz: 66fdacc1923b13469499aa558da1e6fa17ba168b0c26ac004559c98bacd0ccf0aba84ccc4e5886cf01eb956131d549167510e767e3dda8257e6e4c14d8aedd4c

data/bin/arb-xmu-course

@@ -11,6 +11,7 @@ include Arb::Xmu::Course
 
 TOKEN_FILE_NAME = 'encrypted_token'
 TOKEN_SEPARATOR = ':'
+CLIENT = HTTPClient.new
 
 
 def filter_text(raw)
@@ -112,74 +113,82 @@ def request_select_course(client, course_entity, xxlx, lcid)
   JSON::parse msg.body
 end
 
-def create_attempt_thread(max_interval, client, course_entity, xxlx, lcid)
-   Thread.new do
+def create_attempt_thread(max_interval, client, course, xxlx, lcid, &block)
+  Thread.new do
     count=0
     loop do
       count+=1
-      interval = 1+rand(max_interval)
+      interval= 1+rand(max_interval)
       sleep interval
-      res = request_select_course(client, course_entity, xxlx, lcid)
-      if res[:success]
-        $stdout.puts "课程：《#{course_entity.name}》已经成功选课！"
+      res = request_select_course(client, course, xxlx, lcid)
+      if res['success']
+        $stdout.puts "课程：《#{course.name}》已经成功选课！"
         break
       else
-        $stdout.puts "课程：《#{course_entity.name}》第#{count}次尝试选课失败，#{interval}秒后将重试。"
+        $stdout.puts "课程：《#{course.name}》第#{count}次尝试选课失败，#{interval}秒后将重试。（错误信息：#{res['message']}）"
       end
+      exit if block.binding.local_variable_get(:opened_thread_count)-1==0
     end
-
   end
 end
 
-
-def select_school_elective(client, username, password)
+def prepare_select_course(client)
+  ensure_account
+  username, password = get_account_info
   authorize_session(client, username, password)
-  lcid=get_main_select_round(client)
-
-  school_courses = parse_courses((client.get 'http://bkxk.xmu.edu.cn/xsxk/yxxx.html').body)
-  show_courses_in_table school_courses
+end
 
-  $stdout.puts
+def try_to_select_courses(client, courses, xxlx, lcid)
+  $stdout.puts ''
   $stdout.puts '输入要选的课程ID， 以空格分割：'
 
   ids = $stdin.gets.chomp.split(' ')
 
-  $stdout.puts '输入最大重试间隔时间，默认3秒，要求不得低于2秒：'
+  $stdout.puts '输入最大重试间隔时间，要求不得低于2秒：'
 
   max_interval = $stdin.gets.chomp.to_i
   max_interval = 2 if max_interval<2
-
+  opened_thread_count = ids.size
   ids.each do |id|
-    create_attempt_thread(max_interval, client, school_courses.find { |course| course.index==id.to_i }, 1, lcid)
+    create_attempt_thread(max_interval, client, courses.find { |course| course.index==id.to_i }, xxlx, lcid) {}
   end
+end
 
-  loop do
-    sleep 3
+def get_account_info
+  stu_id, passwd=nil
+  File.open TOKEN_FILE_NAME, 'r' do |file|
+    stu_id, passwd=SimpleDes.decrypt(file.read.split(TOKEN_SEPARATOR))
   end
+  [stu_id, passwd]
+end
 
 
-end
+def select_school_elective(client)
 
-def select_general_elective
+  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))
 
+  loop do
+    sleep 3
+  end
 end
 
-def select_public
+def select_general_elective
 
 end
 
+def select_public
 
-unless (File.exists? TOKEN_FILE_NAME)
-  puts '请先设置账户信息（账户信息会先加密然后保存在本地，用于授权选课系统）'
-  set_up_account
-  exit
 end
 
-stu_id, passwd=nil
-client = HTTPClient.new
-
-File.open TOKEN_FILE_NAME, 'r' do |file|
-  stu_id, passwd=SimpleDes.decrypt(file.read.split(TOKEN_SEPARATOR))
+def ensure_account
+  unless (File.exists? TOKEN_FILE_NAME)
+    puts '请先设置账户信息（账户信息会先加密然后保存在本地，用于授权选课系统）'
+    set_up_account
+    exit
+  end
 end
 
 opts = Slop.parse do |o|
@@ -188,14 +197,18 @@ opts = Slop.parse do |o|
   o.bool *%w{-r --reset}, '重置账户信息'
 
   #院选课程 xxlx=4
-  o.bool *%w{-s --school}, '院选选课'
+  o.bool *%w{-s --school}, '院选选课模式'
   #校选课程 xxlx=3
-  o.bool *%w{-g --general}, '校选选课'
+  o.bool *%w{-g --general}, '校选选课模式'
   #公共课程 xxlx=5
-  o.bool *%w{-p --public}, '公共课选课'
+  o.bool *%w{-p --public}, '公共课选课模式'
+
+  o.bool *%w{-v --version}, '显示当前版本'
 end
 
 case true
+  when opts.version?
+    puts Arb::Xmu::Course::VERSION
   when opts.help?
     puts(opts) && exit
   when opts.clear?
@@ -203,34 +216,11 @@ case true
   when opts.reset?
     set_up_account && exit
   when opts.school?
-    select_school_elective(client, stu_id, passwd)
+    select_school_elective(CLIENT)
   when opts.general?
     # select_general_elective
   when opts.public?
     # select_public
-end
-
-# client = HTTPClient.new
-
-# #session init
-# client.get 'http://bkxk.xmu.edu.cn/xsxk/login.html'
-#
-# File.open 'checkcode.jpeg','wb' do |file|
-#   file.write(client.get('http://bkxk.xmu.edu.cn/xsxk/getCheckCode').body)
-# end
-#
-# puts 'enter your student id'
-# user= gets.chomp
-# puts 'enter your password'
-# passwd=gets.chomp
-# puts 'enter the checkcode'
-# checkcode=gets.chomp
-#
-# client.get 'http://bkxk.xmu.edu.cn/xsxk/login.html',username: user,password: passwd,checkCode: checkcode
-#
-# puts (client.get 'http://bkxk.xmu.edu.cn/xsxk/localInfo.html').body
-#
-# Nokogiri::parse((client.get 'http://bkxk.xmu.edu.cn/xsxk/index.html').body).css('script').each do |x|
-#   puts x.text
-# end
-#
+  else
+    puts(opts) && exit
+end

data/lib/arb/xmu/course/util/simple_des.rb

@@ -5,7 +5,7 @@ module Arb
   module Util
     class SimpleDes
       ALG = 'DES-EDE3-CBC'
-      KEY = (Dir.pwd.split('').select { |char| char=~/\w/ }.join+'bYaRyBin')[0..7]
+      KEY = 'bYaRyBin'
       DES_KEY = KEY.swapcase
       class << self
         %i{encrypt decrypt}.each do |type|

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

@@ -1,7 +1,7 @@
 module Arb
   module Xmu
     module Course
-      VERSION = '1.0.0'
+      VERSION = '1.2.0'
     end
   end
 end

metadata

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