From a5fcd627ca7ff288e4b53e99fc7a5006bce1adc8 Mon Sep 17 00:00:00 2001
From: NianBroken <suinian666@gmail.com>
Date: Wed, 22 May 2024 10:06:54 +0800
Subject: [PATCH] Update the project structure by moving the Python script
 files to a folder called "scripts" and the data files to a folder called
 "data" to organize the project files more clearly.

---
 grade.txt                                     |  1 -
 info.txt                                      |  1 -
 main.py                                       | 24 ++++++++++++-------
 old_grade.txt                                 |  1 -
 .../delete_old_runs.py                        |  0
 get_grade.py => scripts/get_grade.py          |  0
 .../get_selected_courses.py                   |  2 +-
 get_user_info.py => scripts/get_user_info.py  |  2 +-
 pushplus.py => scripts/pushplus.py            |  0
 user_login.py => scripts/user_login.py        |  2 +-
 zfn_api.py => scripts/zfn_api.py              |  0
 11 files changed, 18 insertions(+), 15 deletions(-)
 delete mode 100644 grade.txt
 delete mode 100644 info.txt
 delete mode 100644 old_grade.txt
 rename delete_old_runs.py => scripts/delete_old_runs.py (100%)
 rename get_grade.py => scripts/get_grade.py (100%)
 rename get_selected_courses.py => scripts/get_selected_courses.py (99%)
 rename get_user_info.py => scripts/get_user_info.py (97%)
 rename pushplus.py => scripts/pushplus.py (100%)
 rename user_login.py => scripts/user_login.py (97%)
 rename zfn_api.py => scripts/zfn_api.py (100%)

diff --git a/grade.txt b/grade.txt
deleted file mode 100644
index 157260f..0000000
--- a/grade.txt
+++ /dev/null
@@ -1 +0,0 @@
-cc20700204d06fbeb5498cf0078f3725
\ No newline at end of file
diff --git a/info.txt b/info.txt
deleted file mode 100644
index 691b3c9..0000000
--- a/info.txt
+++ /dev/null
@@ -1 +0,0 @@
-09975406912bb31cacc59f2573b68768
\ No newline at end of file
diff --git a/main.py b/main.py
index 7bbdc07..6903dfc 100644
--- a/main.py
+++ b/main.py
@@ -3,11 +3,11 @@ import re
 import hashlib
 import os
 import shutil
-from user_login import login
-from get_user_info import get_user_info
-from get_grade import get_grade
-from get_selected_courses import get_selected_courses
-from pushplus import send_message
+from .scripts.user_login import login
+from .scripts.get_user_info import get_user_info
+from .scripts.get_grade import get_grade
+from .scripts.get_selected_courses import get_selected_courses
+from .scripts.pushplus import send_message
 from datetime import datetime
 
 
@@ -39,9 +39,10 @@ github_step_summary = os.environ.get("GITHUB_STEP_SUMMARY")
 force_push_message = force_push_message == "True" if github_actions else True
 
 # 定义文件路径
-info_file_path = "info.txt"
-grade_file_path = "grade.txt"
-old_grade_file_path = "old_grade.txt"
+folder_path = "data"
+info_file_path = os.path.join(folder_path, "info.txt")
+grade_file_path = os.path.join(folder_path, "grade.txt")
+old_grade_file_path = os.path.join(folder_path, "old_grade.txt")
 
 # 初始化运行次数
 run_count = 2
@@ -67,6 +68,10 @@ integrated_info = get_user_info(student_client, output_type="integrated_info")
 # 加密个人信息
 encrypted_info = md5_encrypt(info)
 
+# 检查文件夹是否存在，如果不存在则创建
+if not os.path.exists(folder_path):
+    os.makedirs(folder_path)
+
 # 判断info.txt文件是否存在
 if not os.path.exists(info_file_path):
     # 如果文件不存在,创建并写入加密后的个人信息
@@ -209,7 +214,8 @@ if run_log:
 
 # 删除 __pycache__ 缓存目录及其内容
 current_directory = os.getcwd()
-cache_folder = os.path.join(current_directory, "__pycache__")
+scripts_folder = os.path.join(current_directory, "scripts")
+cache_folder = os.path.join(scripts_folder, "__pycache__")
 # 检查目录是否存在
 if os.path.exists(cache_folder):
     # 删除目录及其内容
diff --git a/old_grade.txt b/old_grade.txt
deleted file mode 100644
index 157260f..0000000
--- a/old_grade.txt
+++ /dev/null
@@ -1 +0,0 @@
-cc20700204d06fbeb5498cf0078f3725
\ No newline at end of file
diff --git a/delete_old_runs.py b/scripts/delete_old_runs.py
similarity index 100%
rename from delete_old_runs.py
rename to scripts/delete_old_runs.py
diff --git a/get_grade.py b/scripts/get_grade.py
similarity index 100%
rename from get_grade.py
rename to scripts/get_grade.py
diff --git a/get_selected_courses.py b/scripts/get_selected_courses.py
similarity index 99%
rename from get_selected_courses.py
rename to scripts/get_selected_courses.py
index b0a2bd0..a74c6da 100644
--- a/get_selected_courses.py
+++ b/scripts/get_selected_courses.py
@@ -1,5 +1,5 @@
 import traceback
-from get_grade import get_grade
+from .get_grade import get_grade
 
 
 def get_selected_courses(student_client):
diff --git a/get_user_info.py b/scripts/get_user_info.py
similarity index 97%
rename from get_user_info.py
rename to scripts/get_user_info.py
index 625db4a..63f693d 100644
--- a/get_user_info.py
+++ b/scripts/get_user_info.py
@@ -1,4 +1,4 @@
-from get_grade import get_grade
+from .get_grade import get_grade
 import traceback
 
 
diff --git a/pushplus.py b/scripts/pushplus.py
similarity index 100%
rename from pushplus.py
rename to scripts/pushplus.py
diff --git a/user_login.py b/scripts/user_login.py
similarity index 97%
rename from user_login.py
rename to scripts/user_login.py
index 6add6c6..0fab664 100644
--- a/user_login.py
+++ b/scripts/user_login.py
@@ -2,7 +2,7 @@ import base64
 import os
 import sys
 from pprint import pprint
-from zfn_api import Client
+from .zfn_api import Client
 
 
 def login(url, username, password):
diff --git a/zfn_api.py b/scripts/zfn_api.py
similarity index 100%
rename from zfn_api.py
rename to scripts/zfn_api.py