feat: fixed many bugs

This commit is contained in:
RTAkland
2021-12-20 21:22:42 +08:00
parent c8b2662d02
commit 28e1319ee3
2 changed files with 48 additions and 73 deletions

View File

@@ -5,31 +5,8 @@
# @Create Time: 2021/12/15
# @File Name: __init__.py
"""
Check the configuration file
"""
import os
import sys
from core.logger import Logger
from core.language import Language
from core.read_config import read_config
settings = read_config()
if not os.path.exists('./logs'):
os.mkdir('./logs')
for mail in settings[0].values():
if not mail:
Logger.critical('mail-settings 有未填写项目')
sys.exit(1)
for request in settings[1].values():
if not request:
Logger.critical('request-settings 有未填写项目')
sys.exit(1)
for other in settings[1].values():
if not other:
Logger.critical('client-settings 有未填写项目')
sys.exit(1)

View File

@@ -11,19 +11,17 @@ import getpass
from core.logger import Logger
from core.language import Language
from core.read_excel import read_excel
from core.read_config import read_config
from ruamel.yaml import YAML
def change_settings(flag: bool = True):
def change_settings():
"""
:return: None
使用read_excel.py搜索到的结果再次进行二次选择, 并写入文件
:return:
"""
language = Language()
settings = read_config()
if not settings[1]['mode'] or not flag:
Logger.info(f'[Modify]{language["change_setting"]}')
Logger.info(f'[Modify]{language["fill_the_config"]}')
Logger.info(f'[Modify]{language["input_a_city_name"]}')
while True:
@@ -31,10 +29,10 @@ def change_settings(flag: bool = True):
city_name = input('-->')
match city_name:
case 'q':
Logger.info(f'[Modify]User quit.')
Logger.info(f'[Exit]{language["exit"]}')
sys.exit(0)
case '':
Logger.critical(f'[Modify]{language["null_value"]}')
Logger.error(f'[Modify]{language["null_value"]}')
continue
case _:
break
@@ -50,7 +48,7 @@ def change_settings(flag: bool = True):
time.sleep(0.3)
user_input = input('-->')
if user_input == 'q':
Logger.info('[Quit]User quit')
Logger.info(f'[Exit]{language["exit"]}')
sys.exit(1)
index = searched_city[int(user_input)]
with open('./config.yml', 'r', encoding='utf-8') as of:
@@ -68,5 +66,5 @@ def change_settings(flag: bool = True):
Logger.error(f'[Write]{language["input_type_error"]}')
continue
finally:
Logger.info('[Done]Program has done.')
Logger.info(f'[Exit]{language["exit"]}')
sys.exit(0)