lzybetter/myAssistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整配置文件结构，使不同插件可以将结果发送至不同telegram bot上

Browse Source
This commit is contained in:
lzybetter
2024-05-06 23:18:21 +08:00
parent 7dc397f833
commit c1f0ba1a1b
4 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
util/config.py
View File

@@ -6,8 +6,8 @@ class Config:
__BASE_PATH = os.getcwd()
__CONFIG_PATH = os.path.join(__BASE_PATH, 'config')
__CONFIG_NAME = 'test.yaml'
__SCHEDULER_DB_FILE_NAME = 'schedule_db.db'
__CONFIG_NAME = 'config.yaml'
# __SCHEDULER_DB_FILE_NAME = 'schedule_db.db'
__LOG_FILE_NAME = 'myAssistant.log'
__CONFIG_DICT = {}
@@ -29,17 +29,17 @@ class Config:
def BASE_PATH(self):
return self.__BASE_PATH
def get_scheduler_db_file_path(self):
try:
return os.path.join(self.__BASE_PATH, self.__CONFIG_DICT['SCHEDULER_DB_PATH'],
self.__SCHEDULER_DB_FILE_NAME)
except:
return os.path.join(self.__CONFIG_PATH, 'schedule_db', self.__SCHEDULER_DB_FILE_NAME)
# def get_scheduler_db_file_path(self):
# try:
# return os.path.join(self.__BASE_PATH, self.__CONFIG_DICT['SCHEDULER_DB_PATH'],
# self.__SCHEDULER_DB_FILE_NAME)
# except:
# return os.path.join(self.__CONFIG_PATH, 'schedule_db', self.__SCHEDULER_DB_FILE_NAME)
def set_scheduler_db_path(self, new_path):
self.__CONFIG_DICT['SCHEDULER_DB_PATH'] = new_path
with open(os.path.join(self.__CONFIG_PATH, self.__CONFIG_NAME), 'w') as f:
f.write(yaml.safe_dump(self.__CONFIG_DICT, sort_keys=False))
# def set_scheduler_db_path(self, new_path):
# self.__CONFIG_DICT['SCHEDULER_DB_PATH'] = new_path
# with open(os.path.join(self.__CONFIG_PATH, self.__CONFIG_NAME), 'w') as f:
# f.write(yaml.safe_dump(self.__CONFIG_DICT, sort_keys=False))
def get_log_file_path(self):
try:
@@ -75,8 +75,7 @@ class Config:
f.write(yaml.safe_dump(self.__CONFIG_DICT, sort_keys=False))
def get_plugin_config(self, config_name, config_path):
print(config_path)
if config_path != '':
with open(os.path.join(config_path, self.__CONFIG_NAME)) as f:
config_d = yaml.safe_load(f)
return config_d[config_name]
return config_d[config_name]