From d97ce9667cb30c54eb4a2da61641179d587ad9fa Mon Sep 17 00:00:00 2001 From: ZhehaoMi <1125263974@qq.com> Date: Fri, 14 Dec 2018 13:31:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=8D=95=E7=8B=AC=E5=AD=98=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config_default.py | 29 +------------------ plugins/broadcast.py | 6 +++- plugins/config/broadcast_config_default.py | 9 ++++++ plugins/config/hikotoko_config_default.py | 11 +++++++ plugins/config/oiwiki_config_default.py | 2 ++ .../config/python_runner_config_default.py | 6 ++++ plugins/config/repeat_config_default.py | 2 ++ plugins/config/sign_in_config_default.py | 2 ++ plugins/hitokoto.py | 6 +++- plugins/oierwiki_query.py | 7 ++++- plugins/python_runner.py | 9 ++++-- plugins/repeater.py | 7 ++++- plugins/sign_in.py | 5 +++- 13 files changed, 66 insertions(+), 35 deletions(-) create mode 100644 plugins/config/broadcast_config_default.py create mode 100644 plugins/config/hikotoko_config_default.py create mode 100644 plugins/config/oiwiki_config_default.py create mode 100644 plugins/config/python_runner_config_default.py create mode 100644 plugins/config/repeat_config_default.py create mode 100644 plugins/config/sign_in_config_default.py diff --git a/config_default.py b/config_default.py index 0bd80aa..b1cb99e 100644 --- a/config_default.py +++ b/config_default.py @@ -10,33 +10,6 @@ SECRET = "" POST_ADDRESS = "0.0.0.0" # 上报端口 POST_PORT = 5002 -# 小时和分钟，24时制 -BROADCAST_HOUR = 8 -BROADCAST_MINUTE = 0 -# 一言广播(小时) -HITOKOTO_HOUR = 8 -# 分钟 -HITOKOTO_MINUTE = 0 -# 启用HITOKOTO的群 -# list 或者URL的文本 -HITOKOTO_BROADCAST_LIST = "https://raw.githubusercontent.com/ZhehaoMi/countdown/master/hitokoto.json" -# 检查间隔 -CHECK_INTERVAL = 5 -# 执行延时 -EXECUTE_DELAY = 60 -# 列表地址 -LIST_URL = "https://raw.githubusercontent.com/ZhehaoMi/countdown/master/countdown.json" -# OI Wiki 列表地址 -OIWIKI_LIST_URL = "https://raw.githubusercontent.com/ZhehaoMi/countdown/master/wikipages.json" -# 一句话被重复几次后会进行复读 -REPEAT_TIME_LIMIT = 3 # 指令前缀 COMMAND_PREFIX = ["--", "!!"] -# 执行Python代码的输出长度限制 -OUTPUT_LENGTH_LIMIT = 200 -# 执行Python代码的时间限制(ms) -EXECUTE_TIME_LIMIT = 2000 -# 负责执行的Docker镜像名 -DOCKER_IMAGE = "" -# 签到数据文件路径 -ATTENDANCE_DATA = "./bot-data/" \ No newline at end of file + diff --git a/plugins/broadcast.py b/plugins/broadcast.py index 758d495..3fffffe 100644 --- a/plugins/broadcast.py +++ b/plugins/broadcast.py @@ -1,8 +1,12 @@ import global_vars -from global_vars import config from util import print_log from register import command, schedule_loop +try: + import plugins.config.broadcast_config as config +except ImportError as ex: + import plugins.config.broadcast_config_default as config + def plugin(): return { diff --git a/plugins/config/broadcast_config_default.py b/plugins/config/broadcast_config_default.py new file mode 100644 index 0000000..cf30d0a --- /dev/null +++ b/plugins/config/broadcast_config_default.py @@ -0,0 +1,9 @@ +# 小时和分钟，24时制 +BROADCAST_HOUR = 8 +BROADCAST_MINUTE = 0 +# 检查间隔 +CHECK_INTERVAL = 5 +# 执行延时 +EXECUTE_DELAY = 60 +# 列表地址 +LIST_URL = "https://raw.githubusercontent.com/ZhehaoMi/countdown/master/countdown.json" diff --git a/plugins/config/hikotoko_config_default.py b/plugins/config/hikotoko_config_default.py new file mode 100644 index 0000000..b4bd5cd --- /dev/null +++ b/plugins/config/hikotoko_config_default.py @@ -0,0 +1,11 @@ +# 小时 +HITOKOTO_HOUR = 8 +# 分钟 +HITOKOTO_MINUTE = 0 +# 启用HITOKOTO的群 +# list 或者URL的文本 +HITOKOTO_BROADCAST_LIST = "https://raw.githubusercontent.com/ZhehaoMi/countdown/master/hitokoto.json" +# 检查间隔 +CHECK_INTERVAL = 5 +# 执行延时 +EXECUTE_DELAY = 60 diff --git a/plugins/config/oiwiki_config_default.py b/plugins/config/oiwiki_config_default.py new file mode 100644 index 0000000..765c67b --- /dev/null +++ b/plugins/config/oiwiki_config_default.py @@ -0,0 +1,2 @@ +# OI Wiki 列表地址 +OIWIKI_LIST_URL = "https://raw.githubusercontent.com/ZhehaoMi/countdown/master/wikipages.json" diff --git a/plugins/config/python_runner_config_default.py b/plugins/config/python_runner_config_default.py new file mode 100644 index 0000000..c48417f --- /dev/null +++ b/plugins/config/python_runner_config_default.py @@ -0,0 +1,6 @@ +# 执行Python代码的输出长度限制 +OUTPUT_LENGTH_LIMIT = 200 +# 执行Python代码的时间限制(ms) +EXECUTE_TIME_LIMIT = 2000 +# 负责执行的Docker镜像名 +DOCKER_IMAGE = "" diff --git a/plugins/config/repeat_config_default.py b/plugins/config/repeat_config_default.py new file mode 100644 index 0000000..0ac0d65 --- /dev/null +++ b/plugins/config/repeat_config_default.py @@ -0,0 +1,2 @@ +# 一句话被重复几次后会进行复读 +REPEAT_TIME_LIMIT = 3 diff --git a/plugins/config/sign_in_config_default.py b/plugins/config/sign_in_config_default.py new file mode 100644 index 0000000..42419ff --- /dev/null +++ b/plugins/config/sign_in_config_default.py @@ -0,0 +1,2 @@ +# 签到数据文件路径 +ATTENDANCE_DATA = "plugins/data/group-data/" diff --git a/plugins/hitokoto.py b/plugins/hitokoto.py index 02195ac..3732ef2 100644 --- a/plugins/hitokoto.py +++ b/plugins/hitokoto.py @@ -2,11 +2,15 @@ from cqhttp import CQHttp from util import print_log from register import command, schedule_loop from global_vars import registered_commands as commands -from global_vars import config import global_vars import re import util +try: + import plugins.config.hitokoto_config as config +except ImportError as ex: + import plugins.config.hitokoto_config_default as config + def plugin(): return { diff --git a/plugins/oierwiki_query.py b/plugins/oierwiki_query.py index 47680d5..6b35489 100644 --- a/plugins/oierwiki_query.py +++ b/plugins/oierwiki_query.py @@ -2,10 +2,15 @@ from cqhttp import CQHttp from util import print_log from register import command from global_vars import registered_commands as commands -from global_vars import config import re import util +try: + import plugins.config.oiwiki_config as config +except ImportError as ex: + import plugins.config.oiwiki_config_default as config + + def plugin(): return { diff --git a/plugins/python_runner.py b/plugins/python_runner.py index faec3bd..2b839cd 100644 --- a/plugins/python_runner.py +++ b/plugins/python_runner.py @@ -10,12 +10,17 @@ from cqhttp import CQHttp import docker import util -from global_vars import config from global_vars import registered_commands as commands -from main import config from register import command from util import print_log +try: + import plugins.config.hitokoto_config as config +except ImportError as ex: + import plugins.config.hitokoto_config_default as config + + + def plugin(): return { "author": "officeyutong", diff --git a/plugins/repeater.py b/plugins/repeater.py index 0f996f8..639edea 100644 --- a/plugins/repeater.py +++ b/plugins/repeater.py @@ -1,8 +1,13 @@ -from global_vars import config, repeat_time, last_message +from global_vars import repeat_time, last_message from cqhttp import CQHttp from util import print_log from register import message_listener +try: + import plugins.config.repeat_config as config +except ImportError as ex: + import plugins.config.repeat_config_default as config + def plugin(): return { diff --git a/plugins/sign_in.py b/plugins/sign_in.py index 6672ae3..ce0eeee 100644 --- a/plugins/sign_in.py +++ b/plugins/sign_in.py @@ -17,7 +17,10 @@ def sign_in(bot, context, args): def load_data(group_id): - from global_vars import config + try: + import plugins.config.sign_in_config as config + except ImportError as ex: + import plugins.config.sign_in_config_default as config import os import json file_path = os.path.join(config.ATTENDANCE_DATA, -- Gitee