diff --git a/src/utils/AutoScriptEngine.py b/src/dsl/AutoScriptEngine.py similarity index 100% rename from src/utils/AutoScriptEngine.py rename to src/dsl/AutoScriptEngine.py diff --git a/src/dsl/__init__.py b/src/dsl/__init__.py new file mode 100644 index 0000000..878d740 --- /dev/null +++ b/src/dsl/__init__.py @@ -0,0 +1,9 @@ +""" + DSL module for the AutoLibrary project. + + Contains the AutoScript DSL engine and related components + for preprocessing user reservation data in timer tasks. + + Classes: + - AutoScriptEngine: AutoScript script engine class. +""" diff --git a/src/gui/ALAutoScriptOrchDialog.py b/src/gui/ALAutoScriptOrchDialog.py index d4b7e78..e244763 100644 --- a/src/gui/ALAutoScriptOrchDialog.py +++ b/src/gui/ALAutoScriptOrchDialog.py @@ -17,7 +17,7 @@ from PySide6.QtWidgets import ( QGroupBox, QSizePolicy ) -from utils.AutoScriptEngine import AutoScriptEngine +from dsl.AutoScriptEngine import AutoScriptEngine VARIABLE_META = AutoScriptEngine.VARIABLE_META diff --git a/src/gui/ALConfigWidget.py b/src/gui/ALConfigWidget.py index 9a203e8..d97d9b5 100644 --- a/src/gui/ALConfigWidget.py +++ b/src/gui/ALConfigWidget.py @@ -24,7 +24,7 @@ import managers.config.ConfigManager as ConfigManager from utils.JSONReader import JSONReader from utils.JSONWriter import JSONWriter -from utils.ConfigUtils import ConfigUtils +from managers.config.ConfigUtils import ConfigUtils from gui.resources.ui.Ui_ALConfigWidget import Ui_ALConfigWidget from gui.ALSeatMapSelectDialog import ALSeatMapSelectDialog diff --git a/src/gui/ALMainWindow.py b/src/gui/ALMainWindow.py index 38d4402..3974b34 100644 --- a/src/gui/ALMainWindow.py +++ b/src/gui/ALMainWindow.py @@ -20,7 +20,7 @@ from PySide6.QtGui import ( ) from base.MsgBase import MsgBase -from utils.ConfigUtils import ConfigUtils +from managers.config.ConfigUtils import ConfigUtils from gui.resources.ui.Ui_ALMainWindow import Ui_ALMainWindow from gui.resources import ALResource diff --git a/src/gui/ALMainWorkers.py b/src/gui/ALMainWorkers.py index 9bc1c9f..f6003d3 100644 --- a/src/gui/ALMainWorkers.py +++ b/src/gui/ALMainWorkers.py @@ -18,7 +18,7 @@ from PySide6.QtCore import ( from base.MsgBase import MsgBase from operators.AutoLib import AutoLib from utils.JSONReader import JSONReader -from utils.AutoScriptEngine import AutoScriptEngine +from dsl.AutoScriptEngine import AutoScriptEngine class AutoLibWorker(MsgBase, QThread): diff --git a/src/utils/ConfigUtils.py b/src/managers/config/ConfigUtils.py similarity index 98% rename from src/utils/ConfigUtils.py rename to src/managers/config/ConfigUtils.py index bab72ec..8d399aa 100644 --- a/src/utils/ConfigUtils.py +++ b/src/managers/config/ConfigUtils.py @@ -43,4 +43,4 @@ class ConfigUtils: data = {"current": index, "paths": paths} auto_config[f"{cfg_type}_path"] = data cfg_mgr.set(ConfigManager.ConfigType.GLOBAL, "automation", auto_config) - return config_paths \ No newline at end of file + return config_paths diff --git a/src/utils/__init__.py b/src/utils/__init__.py index 8c4cdf0..b84955c 100644 --- a/src/utils/__init__.py +++ b/src/utils/__init__.py @@ -5,6 +5,4 @@ - TimerUtils: Timer utils class for the AutoLibrary project. - JSONReader: JSON reader class for the AutoLibrary project. - JSONWriter: JSON writer class for the AutoLibrary project. - - ConfigUtils: Config utils class for the AutoLibrary project. - - AutoScriptEngine: AutoScript script engine class for the AutoLibrary project. -""" \ No newline at end of file +"""