From c2d53a8b785a1b75d394f013d8b21f3057eff897 Mon Sep 17 00:00:00 2001 From: KenanZhu <3471685733@qq.com> Date: Tue, 25 Nov 2025 08:48:18 +0800 Subject: [PATCH] chore(*): refactor the project structure --- .gitignore | 12 ++++++------ readme.md | 3 +-- requirement.txt | Bin 0 -> 1498 bytes Main.py => src/Main.py | 0 LibOperator.py => src/base/LibOperator.py | 2 +- MsgBase.py => src/base/MsgBase.py | 0 src/base/__init__.py | 8 ++++++++ {gui => src/gui}/ALConfigWidget.py | 10 +++++----- {gui => src/gui}/ALConfigWidget.ui | 0 {gui => src/gui}/ALMainWindow.py | 4 ++-- {gui => src/gui}/ALMainWindow.ui | 0 {gui => src/gui}/AutoLibraryResource.qrc | 0 {gui => src/gui}/SeatFrame.py | 0 {gui => src/gui}/SeatMapTable.py | 0 {gui => src/gui}/SeatMapWidget.py | 2 +- {gui => src/gui}/configs/readme.md | 0 {gui => src/gui}/icons/AutoLibrary.ico | Bin {gui => src/gui}/translators/qtbase_zh_CN.ts | 0 AutoLib.py => src/operators/AutoLib.py | 14 +++++++------- LibChecker.py => src/operators/LibChecker.py | 2 +- LibCheckin.py => src/operators/LibCheckin.py | 2 +- LibCheckout.py => src/operators/LibCheckout.py | 2 +- LibLogin.py => src/operators/LibLogin.py | 2 +- LibLogout.py => src/operators/LibLogout.py | 2 +- LibRenew.py => src/operators/LibRenew.py | 2 +- LibReserve.py => src/operators/LibReserve.py | 2 +- src/operators/__init__.py | 12 ++++++++++++ ConfigReader.py => src/utils/ConfigReader.py | 0 ConfigWriter.py => src/utils/ConfigWriter.py | 0 src/utils/__init__.py | 7 +++++++ 30 files changed, 57 insertions(+), 31 deletions(-) create mode 100644 requirement.txt rename Main.py => src/Main.py (100%) rename LibOperator.py => src/base/LibOperator.py (94%) rename MsgBase.py => src/base/MsgBase.py (100%) create mode 100644 src/base/__init__.py rename {gui => src/gui}/ALConfigWidget.py (99%) rename {gui => src/gui}/ALConfigWidget.ui (100%) rename {gui => src/gui}/ALMainWindow.py (98%) rename {gui => src/gui}/ALMainWindow.ui (100%) rename {gui => src/gui}/AutoLibraryResource.qrc (100%) rename {gui => src/gui}/SeatFrame.py (100%) rename {gui => src/gui}/SeatMapTable.py (100%) rename {gui => src/gui}/SeatMapWidget.py (99%) rename {gui => src/gui}/configs/readme.md (100%) rename {gui => src/gui}/icons/AutoLibrary.ico (100%) rename {gui => src/gui}/translators/qtbase_zh_CN.ts (100%) rename AutoLib.py => src/operators/AutoLib.py (96%) rename LibChecker.py => src/operators/LibChecker.py (99%) rename LibCheckin.py => src/operators/LibCheckin.py (98%) rename LibCheckout.py => src/operators/LibCheckout.py (93%) rename LibLogin.py => src/operators/LibLogin.py (99%) rename LibLogout.py => src/operators/LibLogout.py (96%) rename LibRenew.py => src/operators/LibRenew.py (91%) rename LibReserve.py => src/operators/LibReserve.py (99%) create mode 100644 src/operators/__init__.py rename ConfigReader.py => src/utils/ConfigReader.py (100%) rename ConfigWriter.py => src/utils/ConfigWriter.py (100%) create mode 100644 src/utils/__init__.py diff --git a/.gitignore b/.gitignore index 07a30c3..c676a0b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,10 +8,10 @@ build/ dist/ model/*.onnx driver/*.exe -gui/configs/*.json -gui/translators/qtbase_zh_CN.qm -gui/AutoLibraryResources.py -gui/AutoLibraryResource.py -gui/Ui_ALMainWindow.py -gui/Ui_ALConfigWidget.py +src/gui/configs/*.json +src/gui/translators/qtbase_zh_CN.qm +src/gui/AutoLibraryResources.py +src/gui/AutoLibraryResource.py +src/gui/Ui_ALMainWindow.py +src/gui/Ui_ALConfigWidget.py Main.spec diff --git a/readme.md b/readme.md index ff1863a..090e724 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,5 @@ # AutoLibrary -请访问[AutoLibrary 网站](http://autolibrary.cv) - +请访问[AutoLibrary 网站](http://autolibrary.cv)\ Please access the [AutoLibrary Website](http://autolibrary.cv) diff --git a/requirement.txt b/requirement.txt new file mode 100644 index 0000000000000000000000000000000000000000..5ee4f335b61b92661f9b19f5faf4bfeba0377152 GIT binary patch literal 1498 zcmaKs&2HO341{?u&_}UQS&5q*a_FJ=0C|AGKk^R}YXw_|iHw+l# zr>X?1cCOouTVEkKJu)P@NMdPi<=-}0t9GsMgVrj4l2i|_RXa;%GuK$_G;SAmlGfUt zUAw*)dTNbhx9YKWj^LlY``POBUOb%`4(h4ZH+)^P;^=&*-#a1cy3u(U@wr!)Fbp|S zTvCt3I_K{*-!#`E>m?AW*BOfb^*oS>rCpL9pQaUqnGO>&6M*;gH)TV-syTNrn#_3 zX~h)bDRTjVN8GcWI0_V8wKEpapCKp8Jn8cyhKc7xj?8h9yDr;#pS!xK+DeNVquk1G znP}`f-9O6Llj9KWB(r!&-O#um7LH^$s%q<`2QRKQ#dk-xzqdq&T$9m5oUIS z`x@Ivf@klfQL1Dx=ocm&XdK7Z(HDwj-01{+58sUtjos-PPQeVS_Ii?Sadzj^=T;Tm zRxAroAI8sfI=WW84br=Rb}jrLb)Gj0Zv*z5Jm%gHn-D$VAD2bS4SZ}v>1s^+EXDD@mHOD%A6Q`8)c^nh literal 0 HcmV?d00001 diff --git a/Main.py b/src/Main.py similarity index 100% rename from Main.py rename to src/Main.py diff --git a/LibOperator.py b/src/base/LibOperator.py similarity index 94% rename from LibOperator.py rename to src/base/LibOperator.py index 883744f..64ded14 100644 --- a/LibOperator.py +++ b/src/base/LibOperator.py @@ -9,7 +9,7 @@ See the LICENSE file for details. """ import queue -from MsgBase import MsgBase +from base.MsgBase import MsgBase class LibOperator(MsgBase): diff --git a/MsgBase.py b/src/base/MsgBase.py similarity index 100% rename from MsgBase.py rename to src/base/MsgBase.py diff --git a/src/base/__init__.py b/src/base/__init__.py new file mode 100644 index 0000000..9f385bf --- /dev/null +++ b/src/base/__init__.py @@ -0,0 +1,8 @@ + +""" + Base module for the AutoLibrary project. + + Here are the classes and modules in this package: + - MsgBase: Base class for messages.\ + - LibOperator: Base class for library operators. +""" \ No newline at end of file diff --git a/gui/ALConfigWidget.py b/src/gui/ALConfigWidget.py similarity index 99% rename from gui/ALConfigWidget.py rename to src/gui/ALConfigWidget.py index 160d858..0b9a0aa 100644 --- a/gui/ALConfigWidget.py +++ b/src/gui/ALConfigWidget.py @@ -18,12 +18,12 @@ from PySide6.QtWidgets import ( ) from PySide6.QtGui import QCloseEvent -from .Ui_ALConfigWidget import Ui_ALConfigWidget -from .SeatMapWidget import SeatMapWidget +from gui.Ui_ALConfigWidget import Ui_ALConfigWidget +from gui.SeatMapWidget import SeatMapWidget -from .SeatMapTable import seats_maps -from ConfigReader import ConfigReader -from ConfigWriter import ConfigWriter +from gui.SeatMapTable import seats_maps +from utils.ConfigReader import ConfigReader +from utils.ConfigWriter import ConfigWriter class ALConfigWidget(QWidget, Ui_ALConfigWidget): diff --git a/gui/ALConfigWidget.ui b/src/gui/ALConfigWidget.ui similarity index 100% rename from gui/ALConfigWidget.ui rename to src/gui/ALConfigWidget.ui diff --git a/gui/ALMainWindow.py b/src/gui/ALMainWindow.py similarity index 98% rename from gui/ALMainWindow.py rename to src/gui/ALMainWindow.py index bd68fdf..466f627 100644 --- a/gui/ALMainWindow.py +++ b/src/gui/ALMainWindow.py @@ -27,8 +27,8 @@ from .ALConfigWidget import ALConfigWidget from . import AutoLibraryResource -from AutoLib import AutoLib -from ConfigReader import ConfigReader +from operators.AutoLib import AutoLib +from utils.ConfigReader import ConfigReader class AutoLibWorker(QThread): diff --git a/gui/ALMainWindow.ui b/src/gui/ALMainWindow.ui similarity index 100% rename from gui/ALMainWindow.ui rename to src/gui/ALMainWindow.ui diff --git a/gui/AutoLibraryResource.qrc b/src/gui/AutoLibraryResource.qrc similarity index 100% rename from gui/AutoLibraryResource.qrc rename to src/gui/AutoLibraryResource.qrc diff --git a/gui/SeatFrame.py b/src/gui/SeatFrame.py similarity index 100% rename from gui/SeatFrame.py rename to src/gui/SeatFrame.py diff --git a/gui/SeatMapTable.py b/src/gui/SeatMapTable.py similarity index 100% rename from gui/SeatMapTable.py rename to src/gui/SeatMapTable.py diff --git a/gui/SeatMapWidget.py b/src/gui/SeatMapWidget.py similarity index 99% rename from gui/SeatMapWidget.py rename to src/gui/SeatMapWidget.py index 7bc518e..542c46d 100644 --- a/gui/SeatMapWidget.py +++ b/src/gui/SeatMapWidget.py @@ -18,7 +18,7 @@ from PySide6.QtWidgets import ( from PySide6.QtGui import ( QPainter, QWheelEvent, QCloseEvent ) -from .SeatFrame import SeatFrame +from gui.SeatFrame import SeatFrame class SeatMapWidget(QWidget): diff --git a/gui/configs/readme.md b/src/gui/configs/readme.md similarity index 100% rename from gui/configs/readme.md rename to src/gui/configs/readme.md diff --git a/gui/icons/AutoLibrary.ico b/src/gui/icons/AutoLibrary.ico similarity index 100% rename from gui/icons/AutoLibrary.ico rename to src/gui/icons/AutoLibrary.ico diff --git a/gui/translators/qtbase_zh_CN.ts b/src/gui/translators/qtbase_zh_CN.ts similarity index 100% rename from gui/translators/qtbase_zh_CN.ts rename to src/gui/translators/qtbase_zh_CN.ts diff --git a/AutoLib.py b/src/operators/AutoLib.py similarity index 96% rename from AutoLib.py rename to src/operators/AutoLib.py index 4b13aec..2c73e18 100644 --- a/AutoLib.py +++ b/src/operators/AutoLib.py @@ -16,14 +16,14 @@ from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC from selenium.webdriver.edge.service import Service -from MsgBase import MsgBase -from LibChecker import LibChecker -from LibLogin import LibLogin -from LibLogout import LibLogout -from LibReserve import LibReserve -from LibCheckin import LibCheckin +from base.MsgBase import MsgBase +from operators.LibChecker import LibChecker +from operators.LibLogin import LibLogin +from operators.LibLogout import LibLogout +from operators.LibReserve import LibReserve +from operators.LibCheckin import LibCheckin -from ConfigReader import ConfigReader +from utils.ConfigReader import ConfigReader class AutoLib(MsgBase): diff --git a/LibChecker.py b/src/operators/LibChecker.py similarity index 99% rename from LibChecker.py rename to src/operators/LibChecker.py index f7f3fb9..730fd4c 100644 --- a/LibChecker.py +++ b/src/operators/LibChecker.py @@ -16,7 +16,7 @@ from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC -from LibOperator import LibOperator +from base.LibOperator import LibOperator class LibChecker(LibOperator): diff --git a/LibCheckin.py b/src/operators/LibCheckin.py similarity index 98% rename from LibCheckin.py rename to src/operators/LibCheckin.py index 17cf49c..5791e82 100644 --- a/LibCheckin.py +++ b/src/operators/LibCheckin.py @@ -16,7 +16,7 @@ from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC -from LibOperator import LibOperator +from base.LibOperator import LibOperator class LibCheckin(LibOperator): diff --git a/LibCheckout.py b/src/operators/LibCheckout.py similarity index 93% rename from LibCheckout.py rename to src/operators/LibCheckout.py index 9693b8c..b08ffeb 100644 --- a/LibCheckout.py +++ b/src/operators/LibCheckout.py @@ -16,7 +16,7 @@ from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC -from LibOperator import LibOperator +from base.LibOperator import LibOperator class LibCheckout(LibOperator): diff --git a/LibLogin.py b/src/operators/LibLogin.py similarity index 99% rename from LibLogin.py rename to src/operators/LibLogin.py index 491611b..85c5945 100644 --- a/LibLogin.py +++ b/src/operators/LibLogin.py @@ -17,7 +17,7 @@ from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC -from LibOperator import LibOperator +from base.LibOperator import LibOperator class LibLogin(LibOperator): diff --git a/LibLogout.py b/src/operators/LibLogout.py similarity index 96% rename from LibLogout.py rename to src/operators/LibLogout.py index 8a09987..920b42b 100644 --- a/LibLogout.py +++ b/src/operators/LibLogout.py @@ -13,7 +13,7 @@ from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC -from LibOperator import LibOperator +from base.LibOperator import LibOperator class LibLogout(LibOperator): diff --git a/LibRenew.py b/src/operators/LibRenew.py similarity index 91% rename from LibRenew.py rename to src/operators/LibRenew.py index dbf6373..2f8ba05 100644 --- a/LibRenew.py +++ b/src/operators/LibRenew.py @@ -10,7 +10,7 @@ See the LICENSE file for details. import os import queue -from LibOperator import LibOperator +from base.LibOperator import LibOperator class LibRenew(LibOperator): diff --git a/LibReserve.py b/src/operators/LibReserve.py similarity index 99% rename from LibReserve.py rename to src/operators/LibReserve.py index a114433..74a5596 100644 --- a/LibReserve.py +++ b/src/operators/LibReserve.py @@ -16,7 +16,7 @@ from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC -from LibOperator import LibOperator +from base.LibOperator import LibOperator class LibReserve(LibOperator): diff --git a/src/operators/__init__.py b/src/operators/__init__.py new file mode 100644 index 0000000..9c88fb0 --- /dev/null +++ b/src/operators/__init__.py @@ -0,0 +1,12 @@ +""" + Operators module for the AutoLibrary project. + + Here are the classes and modules in this package: + - AutoLib: AutoLibrary operator. + - LibLogin: Library operator for logging in. + - LibLogout: Library operator for logging out. + - LibReserve: Library operator for reserving seat. + - LibCheckin: Library operator for checking in seat. + - LibCheckout: Library operator for checking out seat. + - LibRenew: Library operator for renewing seat. +""" \ No newline at end of file diff --git a/ConfigReader.py b/src/utils/ConfigReader.py similarity index 100% rename from ConfigReader.py rename to src/utils/ConfigReader.py diff --git a/ConfigWriter.py b/src/utils/ConfigWriter.py similarity index 100% rename from ConfigWriter.py rename to src/utils/ConfigWriter.py diff --git a/src/utils/__init__.py b/src/utils/__init__.py new file mode 100644 index 0000000..d1a4a08 --- /dev/null +++ b/src/utils/__init__.py @@ -0,0 +1,7 @@ +""" + Utils module for the AutoLibrary project. + + Here are the classes and modules in this package: + - ConfigReader: Configuration reader class for the AutoLibrary project. + - ConfigWriter: Configuration writer class for the AutoLibrary project. +""" \ No newline at end of file