From 397e28a62c5ba0ae9eb98cfe89671f442818fe7e Mon Sep 17 00:00:00 2001
From: Ting-Jun Wang <levi900227@gmail.com>
Date: Sat, 3 Jul 2021 01:28:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E9=8C=AF=E8=AA=A4?=
 =?UTF-8?q?=E7=9A=84API=E5=90=8D=E7=A8=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Moodle.py      | 4 ++--
 Ncnu.py        | 4 ++--
 NcnuMainWin.py | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Moodle.py b/Moodle.py
index 514e690..ab577af 100644
--- a/Moodle.py
+++ b/Moodle.py
@@ -1,5 +1,5 @@
 from tkinter import *
-from api.moodle import Moodle
+from api.moodle import MoodleAPI
 from config import CONFIG
 from tkhtmlview import HTMLLabel
 
@@ -14,7 +14,7 @@ def getIdAndName(course):
     
 
 def createMoodleWin():
-    moodle = Moodle(CONFIG['moodle']['username'], CONFIG['moodle']['password'])
+    moodle = MoodleAPI(CONFIG['moodle']['username'], CONFIG['moodle']['password'])
     
     if moodle.status:
          # ===== 取得課程ID與名稱 =====
diff --git a/Ncnu.py b/Ncnu.py
index 33cae82..b6f8863 100644
--- a/Ncnu.py
+++ b/Ncnu.py
@@ -1,11 +1,11 @@
 from tkinter import *
-from api.ncnu import NCNU
+from api.ncnu import NcnuAPI
 from config import CONFIG
 from tkinter import messagebox
 from tkhtmlview import HTMLLabel
 
 def createNcnuWin():
-    ncnu = NCNU(CONFIG['NCNU']['username'], CONFIG['NCNU']['password'])
+    ncnu = NcnuAPI(CONFIG['NCNU']['username'], CONFIG['NCNU']['password'])
     if ncnu.status:
         def dlCurriculum(sem):
             if ncnu.getCourseTable(sem):
diff --git a/NcnuMainWin.py b/NcnuMainWin.py
index a372dd1..3c2e6c1 100644
--- a/NcnuMainWin.py
+++ b/NcnuMainWin.py
@@ -1,12 +1,12 @@
 from tkinter import *
 from tkhtmlview import HTMLLabel
-from api.ncnuMain import NcnuMain
+from api.ncnuMain import NcnuMainAPI
 
 def createNcnuMainWin():
     win=Tk()
     win.title("暨大官網最新資訊!")
     win.geometry("600x600")
-    main = NcnuMain()
+    main = NcnuMainAPI()
     Link='''<span style="background-color:#ffcccc"><ul>'''
     textLb=Label(win,text="暨大校園最新資訊",font="Helvetica 20",bg="#ffcccc")
     

From 0d9b40cd94e913dd3df1f7808dc49978c120df20 Mon Sep 17 00:00:00 2001
From: Ting-Jun Wang <levi900227@gmail.com>
Date: Sat, 3 Jul 2021 01:29:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E7=95=B6=E9=80=B1?=
 =?UTF-8?q?=E7=89=A9=E4=BB=B6=E7=84=A1=E9=80=A3=E7=B5=90=E6=99=82=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E6=B3=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/moodle.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/moodle.py b/api/moodle.py
index f4104e6..cc97b11 100644
--- a/api/moodle.py
+++ b/api/moodle.py
@@ -122,7 +122,7 @@ class MoodleAPI():
             return [{
                 'name': " ".join( link.text.split(' ')[:-1] ),
                 'type': link.text.split(' ')[-1],
-                'link': link.find('a').get('href')
+                'link': link.find('a').get('href') if link.find('a') != None else ""
             } for link in links]
         else:
             return None