'+id+'
'); +} + +(function() { + 'use strict'; + + let node=$('.nav.nav-tabs.sl_nav_tabs li'); + node.each(function(){ + let str=$(this).children('a')[0].getAttribute("onclick"); + $(this).append(''+str.substr(str.indexOf("','")+3,32)+'
'); + }); + waitForKeyElements('.body_tr', showid, false); +})(); \ No newline at end of file diff --git a/sjtu_automata/__version__.py b/sjtu_automata/__version__.py index 9051f97..413d4a9 100644 --- a/sjtu_automata/__version__.py +++ b/sjtu_automata/__version__.py @@ -2,7 +2,7 @@ __description__ = 'Auto elect script for SJTUer.' __url__ = 'https://github.com/MXWXZ/sjtu-automata' __update_url__ = 'https://raw.githubusercontent.com/MXWXZ/sjtu-automata/master/version' -__version__ = '0.2.1' +__version__ = '0.3.0' __author__ = 'MXWXZ' __author_email__ = 'me@imwxz.com' __license__ = 'GNU General Public License v3 (GPLv3)' diff --git a/sjtu_automata/autoelect.py b/sjtu_automata/autoelect.py index 73a040b..e24b73a 100644 --- a/sjtu_automata/autoelect.py +++ b/sjtu_automata/autoelect.py @@ -1,8 +1,3 @@ -from sjtu_automata.electsys.automata import ( - get_studentid, get_params, elect_class) -from sjtu_automata.credential import login -from sjtu_automata.__version__ import __author__, __url__, __version__ -from sjtu_automata import check_update, echoerror, echoinfo, echowarning import getopt import sys from time import sleep @@ -12,7 +7,11 @@ import threading sys.path.append('../') - +from sjtu_automata.electsys.automata import ( + get_studentid, get_params, elect_class) +from sjtu_automata.credential import login +from sjtu_automata.__version__ import __author__, __url__, __version__ +from sjtu_automata import check_update, echoerror, echoinfo, echowarning class UserInterface(object): def __init__(self): @@ -53,7 +52,7 @@ def login(self, ocr, delay): while 1: self.params = get_params(self.session, self.studentid) - if self.params['xkkz_id'][0] and self.params['xkkz_id'][1] and self.params['xkkz_id'][2] and self.params['njdm_id'] and self.params['zyh_id']: + if self.params['njdm_id'] and self.params['zyh_id']: break echoinfo('Not open, retry in %d seconds...' % delay) sleep(delay) @@ -61,10 +60,10 @@ def login(self, ocr, delay): echoinfo('Login successful!') return True - def __elect_thread(self, tid, classtype, classid, delay): + def __elect_thread(self, tid, xkkzid, classid, delay): while self.status[tid] == 2 or self.status[tid] == 4 or self.status[tid] == -1: ret = elect_class(self.session, self.studentid, - self.params, classtype, classid) + self.params, xkkzid, classid) with self.tl[tid]: if self.status[tid] != 0 and self.status[tid] != 1 and self.status[tid] != 3: self.status[tid] = ret @@ -73,10 +72,10 @@ def __elect_thread(self, tid, classtype, classid, delay): break sleep(delay) - def add_elect(self, number, classtype, classid, delay): + def add_elect(self, number, xkkzid, classid, delay): for i in range(number): self.tp.append(threading.Thread( - target=self.__elect_thread, args=(self.id, classtype, classid, delay,))) + target=self.__elect_thread, args=(self.id, xkkzid, classid, delay,))) self.tl.append(threading.Lock()) self.tclass.append(classid) self.status.append(-1) @@ -170,14 +169,15 @@ def cli(no_update, ocr, print_cookie, delay, check_delay, number, classtypeid): exit() ui = UserInterface() - ui.login(ocr, check_delay) + if not ui.login(ocr, check_delay): + exit() if print_cookie: ui.print_cookie() for i in range(0, len(classtypeid), 2): - if not (0 <= int(classtypeid[i]) <= 2): + if len(classtypeid[i]) != 32: echowarning('Class type ' + classtypeid[i] + ' invalid! Ignore.') continue - ui.add_elect(number, int(classtypeid[i]), classtypeid[i+1], delay) + ui.add_elect(number, classtypeid[i], classtypeid[i+1], delay) ui.start_elect() cmd = threading.Thread(target=ui.get_input) cmd.daemon = True diff --git a/sjtu_automata/electsys/automata.py b/sjtu_automata/electsys/automata.py index 8f9c11d..75ef940 100644 --- a/sjtu_automata/electsys/automata.py +++ b/sjtu_automata/electsys/automata.py @@ -62,26 +62,18 @@ def get_params(session, studentid): Returns: dict: - xkkz_id: list, [0] is '主修课程', [1] is '通识课', [2] is '通选课' njdm_id: str, njdm_id zyh_id: str, zyh_id """ params = {'gnmkdm': 'N253512', 'layout': 'default', 'su': studentid} req = _request( session, 'GET', 'http://i.sjtu.edu.cn/xsxk/zzxkyzb_cxZzxkYzbIndex.html', params=params) - xkkz_id = [] - xkkz_id.append(re_search( - r'\'01\',\'(.*)\'\)" role="tab" data-toggle="tab">', req)) - xkkz_id.append(re_search( - r'\'10\',\'(.*)\'\)" role="tab" data-toggle="tab">', req)) - xkkz_id.append(re_search( - r'\'11\',\'(.*)\'\)" role="tab" data-toggle="tab">', req)) njdm_id = re_search(r'id="njdm_id" value="(.*?)"/>', req) zyh_id = re_search(r'id="zyh_id" value="(.*?)"/>', req) - return {'xkkz_id': xkkz_id, 'njdm_id': njdm_id, 'zyh_id': zyh_id} + return {'njdm_id': njdm_id, 'zyh_id': zyh_id} -def elect_class(session, studentid, params, classtype, classid): +def elect_class(session, studentid, params, xkkzid, classid): """Elect class. Directly elect class. @@ -91,16 +83,14 @@ def elect_class(session, studentid, params, classtype, classid): session: requests session, login session. studentid: str, student id. params: dict, get_params returned - classtype: int, 0 is '主修课程', 1 is '通识课', 2 is '通选课' + xkkzid: str, 32 length id classid: str, class id Returns: int, -1 for param error, 0 for success, 1 for time conflict, 2 for full, 3 for param error, 4 for other. """ - if not (0 <= classtype <= 2): - return -1 post_params = {'gnmkdm': 'N253512', 'su': studentid} - data = {'jxb_ids': classid, 'xkkz_id': params['xkkz_id'][classtype], + data = {'jxb_ids': classid, 'xkkz_id': xkkzid, 'njdm_id': params['njdm_id'], 'zyh_id': params['zyh_id']} req = _request( diff --git a/version b/version index 7dff5b8..9325c3c 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.2.1 \ No newline at end of file +0.3.0 \ No newline at end of file