From 703fca74a44f4bce4fb331929199c85df84dd050 Mon Sep 17 00:00:00 2001
From: Samueli924 <454867105@qq.com>
Date: Sat, 9 Apr 2022 15:58:53 +0800
Subject: [PATCH] 20220409

---
 api/__pycache__/__init__.cpython-39.pyc | Bin 0 -> 142 bytes
 api/__pycache__/chaoxing.cpython-39.pyc | Bin 0 -> 6727 bytes
 api/chaoxing.py                         |   2 +-
 main.py                                 |  42 ++++++++++++++----------
 4 files changed, 25 insertions(+), 19 deletions(-)
 create mode 100644 api/__pycache__/__init__.cpython-39.pyc
 create mode 100644 api/__pycache__/chaoxing.cpython-39.pyc

diff --git a/api/__pycache__/__init__.cpython-39.pyc b/api/__pycache__/__init__.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b3b8965d1cedcd6eaaed1020c08c1c83d4acd8ce
GIT binary patch
literal 142
zcmYe~<>g`kf+rS%Ng(<$h(HF6K#l_t7qb9~6oz01O-8?!3`HPe1o6w**(xTWC_gJT
zxuiHIpt2+*KM&4L&PdF!$jnQRNi4{WiI30B%PfhH*DI*J#bJ}1pHiBWY6mjxGY~TX
E047o)RR910

literal 0
HcmV?d00001

diff --git a/api/__pycache__/chaoxing.cpython-39.pyc b/api/__pycache__/chaoxing.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ee12c17436d7e050188d9b52cae2de3081dc7640
GIT binary patch
literal 6727
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

literal 0
HcmV?d00001

diff --git a/api/chaoxing.py b/api/chaoxing.py
index 65a8d7f..af28e77 100644
--- a/api/chaoxing.py
+++ b/api/chaoxing.py
@@ -51,7 +51,7 @@ def login(self):
             save_users(usernm=self.usernm, passwd=self.passwd)
             return True
         else:
-            self.logger.error("登录失败：" + resp.json())
+            self.logger.error("登录失败：" + str(resp.json()))
             return False
 
     def status(self):
diff --git a/main.py b/main.py
index 42da8b8..e817da5 100644
--- a/main.py
+++ b/main.py
@@ -67,21 +67,27 @@ def do_work(chaoxingAPI):
 
 
 if __name__ == '__main__':
-    ft.init_all_path(["saves", "logs"])  # 检查文件夹
-    logger = ft.Logger("main")  # 初始化日志类
-    ft.title_show()     # 显示头
-    logger.info("正在获取用户数据...")
-    usernm, passwd = ft.load_users()    # 获取账号密码
-    chaoxing = Chaoxing(usernm, passwd)     # 实例化超星API
-    chaoxing.init_explorer()    # 实例化浏览Explorer
-    logger.info("开始登录")
-    if chaoxing.login():    # 登录
-        logger.info("开始读取所有课程")
-        if chaoxing.get_all_courses():  # 读取所有的课程
-            logger.info("开始选课")
-            if chaoxing.select_course():    # 选择要学习的课程
-                chaoxing.speed = int(input("当前倍速： 1 倍速 \n在不紧急的情况下建议使用 1 倍速，因使用不合理的多倍速造成的一切风险与作者无关\n请输入您想要的整数学习倍速:"))
-                logger.info("开始学习")
-                do_work(chaoxing)   # 开始学习
-    input("任务已结束，请点击回车键退出程序")
-
+    try:
+        ft.init_all_path(["saves", "logs"])  # 检查文件夹
+        logger = ft.Logger("main")  # 初始化日志类
+        ft.title_show()     # 显示头
+        logger.info("正在获取用户数据...")
+        usernm, passwd = ft.load_users()    # 获取账号密码
+        chaoxing = Chaoxing(usernm, passwd)     # 实例化超星API
+        chaoxing.init_explorer()    # 实例化浏览Explorer
+        logger.info("开始登录")
+        if chaoxing.login():    # 登录
+            logger.info("开始读取所有课程")
+            if chaoxing.get_all_courses():  # 读取所有的课程
+                logger.info("开始选课")
+                if chaoxing.select_course():    # 选择要学习的课程
+                    chaoxing.speed = int(input("当前倍速： 1 倍速 \n在不紧急的情况下建议使用 1 倍速，因使用不合理的多倍速造成的一切风险与作者无关\n请输入您想要的整数学习倍速:"))
+                    logger.info("开始学习")
+                    do_work(chaoxing)   # 开始学习
+        input("任务已结束，请点击回车键退出程序")
+    except Exception as e:
+        print(f"出现报错{e.__class__}")
+        print(f"错误文件名：{e.__traceback__.tb_frame.f_globals['__file__']}")
+        print(f"错误行数：{e.__traceback__.tb_lineno}")
+        print(f"错误原因:{e}")
+        input("请截图提交至Github或Telegram供作者修改代码\n点击回车键退出程序")