bug fix

source/canvas_update.py

@@ -5,7 +5,6 @@
 from bs4 import BeautifulSoup
 import json
 import os
-import sys
 from time import sleep
 from PyQt5.QtCore import qDebug
 from PyQt5.QtCore import QThread
@@ -22,9 +21,7 @@ def __init__(self, parent, session=None):
         self.parent = parent
         self.status = False
 
-        self.log_dir = os.path.join(
-                       os.path.split(os.path.abspath(__file__))[0],
-                       "log")
+        self.log_dir = self.parent.log_dir
         if not os.path.exists(self.log_dir):
             os.mkdir(self.log_dir)
 

source/captcha.py

@@ -9,12 +9,10 @@
 
 
 class Captcha(QtWidgets.QDialog, Ui_Captcha):
-    def __init__(self):
+    def __init__(self, parent):
         super(Captcha, self).__init__()
         self.setupUi(self)
-        log_dir = os.path.join(
-                       os.path.split(os.path.abspath(__file__))[0],
-                       "log")
+        log_dir = parent.log_dir
         pixmap = QtGui.QPixmap(os.path.join(log_dir, "captcha.jpeg"))
         self.captcha.setPixmap(pixmap)
         self.show()

source/credential.py

@@ -35,14 +35,10 @@ def _get_login_page(session, url):
 
 
 @retry(retry=retry_if_exception_type(RequestException), wait=wait_fixed(3))
-def _bypass_captcha(session, url):
+def _bypass_captcha(parent, session, url):
     # return captcha code
     captcha = session.get(url)
-    log_dir = os.path.join(
-                   os.path.split(os.path.abspath(__file__))[0],
-                   "log")
-    if not os.path.exists(log_dir):
-        os.mkdir(log_dir)
+    log_dir = parent.log_dir
     with open(os.path.join(log_dir, 'captcha.jpeg'), 'wb') as f:
         f.write(captcha.content)
     qDebug("out captcha")
@@ -77,8 +73,6 @@ def _login(session, sid, returl, se, client, username, password, code, uuid):
 def login(url, parent=None, username=None, password=None):
     if (not password) or (not username):
         return None
-#       username = input('Username: ')
-#       password = getpass('Password(no echo): ')
     qDebug("in login")
     while True:
         session = _create_session()
@@ -94,8 +88,8 @@ def login(url, parent=None, username=None, password=None):
         captcha_id += get_timestamp()
         captcha_url = 'https://jaccount.sjtu.edu.cn/jaccount/captcha?' +\
                       captcha_id
-        _bypass_captcha(session, captcha_url)
-        check = Captcha()
+        code = _bypass_captcha(parent, session, captcha_url)
+        check = Captcha(parent)
         if not check.exec_():
             session.close()
             return None

source/download_queue.py

@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# @author: YangLeiSX
+# @data: 2020-04-06
+
 from PyQt5 import QtCore
 import os
 from time import sleep

source/mainwindow.py

@@ -5,7 +5,6 @@
 import sys
 import os
 import json
-import time
 from PyQt5.QtGui import QIcon, QPixmap
 from PyQt5.QtCore import qDebug, QFileInfo
 from PyQt5.QtCore import pyqtSignal as Signal
@@ -59,6 +58,8 @@ def initRender(self):
         self.progress.setValue(0)
         self.isSave.setChecked(False)
         self.Speed.setText("500")
+        if not os.path.exists(self.log_dir):
+            os.mkdir(self.log_dir)
         if os.path.exists(os.path.join(self.log_dir, 'loginInfo.json')):
             with open(os.path.join(self.log_dir, 'loginInfo.json'), 'r') as f:
                 loginInfo = json.loads(f.read())
@@ -83,7 +84,7 @@ def on_LoginBtn_clicked(self):
         qDebug(jaccount)
         qDebug(password)
         self.session = login(url="https://oc.sjtu.edu.cn/login/openid_connect",
-                             parent=self, username=jaccount, password=password,)
+                             parent=self, username=jaccount, password=password)
         if self.session:
             self.LogInfo.emit("[MSG]Log in Successfully!\n")
             loginInfo = {}
@@ -102,7 +103,7 @@ def on_UpdateBtn_clicked(self):
             return
         self.cu = CanvasUpdate(self, self.session)
         self.cu.start()
-        self.parseRemote()
+        # self.parseRemote()
 
     @Slot()
     def on_GetPathBtn_clicked(self):