From b3f7590ee74b439562462d4876e90e63ea99bbbb Mon Sep 17 00:00:00 2001 From: yzhh Date: Tue, 18 Aug 2020 13:37:35 +0800 Subject: [PATCH] move mostly contents to plugins folder --- .github/ISSUE_TEMPLATE/91011.md | 2 +- CommandGen.py | 25 +++++++++---------- MessageGen.py | 8 +++--- mcvbot.py | 4 +-- newbiecheck.py => newbiebot.py | 7 +++--- UTC8.py => plugins/UTC8.py | 0 plugins/__init__.py | 0 {ab => plugins/ab}/__init__.py | 5 ++-- {bug => plugins/bug}/__init__.py | 0 {bug => plugins/bug}/bugtracker.py | 0 checkuser.py => plugins/checkuser.py | 0 findimage.py => plugins/findimage.py | 0 help.py => plugins/help.py | 0 .../interwikilist}/__init__.py | 0 .../interwikilist}/list.cfg | 0 {mcv => plugins/mcv}/__init__.py | 0 mcvrss.py => plugins/mcvrss.py | 8 +++--- {newbie => plugins/newbie}/__init__.py | 2 +- pathexist.py => plugins/pathexist.py | 0 pbc.py => plugins/pbc.py | 0 ping.py => plugins/ping.py | 0 {rc => plugins/rc}/__init__.py | 5 ++-- {server => plugins/server}/__init__.py | 0 {server => plugins/server}/be.py | 0 {server => plugins/server}/server.py | 0 {server => plugins/server}/serverraw.py | 0 {user => plugins/user}/__init__.py | 4 +-- {user => plugins/user}/ruserlib.py | 2 +- {user => plugins/user}/tool.py | 0 {user => plugins/user}/userlib.py | 4 +-- {userp => plugins/userp}/__init__.py | 3 +-- {userp => plugins/userp}/dpng.py | 0 {userp => plugins/userp}/gender.py | 0 {userp => plugins/userp}/hh.py | 0 {userp => plugins/userp}/puserlib.py | 0 {userp => plugins/userp}/tpg.py | 0 {wiki => plugins/wiki}/__init__.py | 4 +-- {wiki => plugins/wiki}/wikilib.py | 3 +-- {wiki => plugins/wiki}/wikitextlib.py | 0 39 files changed, 38 insertions(+), 48 deletions(-) rename newbiecheck.py => newbiebot.py (94%) rename UTC8.py => plugins/UTC8.py (100%) create mode 100644 plugins/__init__.py rename {ab => plugins/ab}/__init__.py (94%) rename {bug => plugins/bug}/__init__.py (100%) rename {bug => plugins/bug}/bugtracker.py (100%) rename checkuser.py => plugins/checkuser.py (100%) rename findimage.py => plugins/findimage.py (100%) rename help.py => plugins/help.py (100%) rename {interwikilist => plugins/interwikilist}/__init__.py (100%) rename {interwikilist => plugins/interwikilist}/list.cfg (100%) rename {mcv => plugins/mcv}/__init__.py (100%) rename mcvrss.py => plugins/mcvrss.py (82%) rename {newbie => plugins/newbie}/__init__.py (97%) rename pathexist.py => plugins/pathexist.py (100%) rename pbc.py => plugins/pbc.py (100%) rename ping.py => plugins/ping.py (100%) rename {rc => plugins/rc}/__init__.py (94%) rename {server => plugins/server}/__init__.py (100%) rename {server => plugins/server}/be.py (100%) rename {server => plugins/server}/server.py (100%) rename {server => plugins/server}/serverraw.py (100%) rename {user => plugins/user}/__init__.py (96%) rename {user => plugins/user}/ruserlib.py (99%) rename {user => plugins/user}/tool.py (100%) rename {user => plugins/user}/userlib.py (98%) rename {userp => plugins/userp}/__init__.py (98%) rename {userp => plugins/userp}/dpng.py (100%) rename {userp => plugins/userp}/gender.py (100%) rename {userp => plugins/userp}/hh.py (100%) rename {userp => plugins/userp}/puserlib.py (100%) rename {userp => plugins/userp}/tpg.py (100%) rename {wiki => plugins/wiki}/__init__.py (98%) rename {wiki => plugins/wiki}/wikilib.py (98%) rename {wiki => plugins/wiki}/wikitextlib.py (100%) diff --git a/.github/ISSUE_TEMPLATE/91011.md b/.github/ISSUE_TEMPLATE/91011.md index 9fb728bd..9c05cf11 100644 --- a/.github/ISSUE_TEMPLATE/91011.md +++ b/.github/ISSUE_TEMPLATE/91011.md @@ -5,7 +5,7 @@ labels: enhancement assignees: OasisAkari --- -**请注意，若您想要提出新的功能建议，则您需要自行给出可利用的接口，否则您提出的建议很可能会被关闭。** + **建议描述：** **实现方法：** diff --git a/CommandGen.py b/CommandGen.py index 738d7ee3..0387f0b5 100644 --- a/CommandGen.py +++ b/CommandGen.py @@ -1,18 +1,17 @@ import re -import string -from ab import ab -from bug import bugtracker -from checkuser import checkuser -from help import help -from mcv import mcv, mcbv, mcdv -from newbie import new -from ping import ping -from rc import rc -from server import ser -from user import Username -from userp import Userp -from wiki import wiki, im, imt, imarc +from plugins.ab import ab +from plugins.bug import bugtracker +from plugins.checkuser import checkuser +from plugins.help import help +from plugins.mcv import mcv, mcbv, mcdv +from plugins.newbie import new +from plugins.ping import ping +from plugins.rc import rc +from plugins.server import ser +from plugins.user import Username +from plugins.userp import Userp +from plugins.wiki import wiki def findcommand(str1, group=0): diff --git a/MessageGen.py b/MessageGen.py index 685eeb2e..4c3160b9 100644 --- a/MessageGen.py +++ b/MessageGen.py @@ -1,12 +1,10 @@ import re -from graia.application import GraiaMiraiApplication, Session -from graia.application.event.messages import TempMessage from graia.application.message.chain import MessageChain -from graia.application.message.elements.internal import Plain, At, Image, UploadMethods, Quote +from graia.application.message.elements.internal import Plain, Image, UploadMethods from os.path import abspath from CommandGen import command -from findimage import findimage +from plugins.findimage import findimage async def gen(app, message, target1, target2='0', msgtype='None'): @@ -49,7 +47,7 @@ async def gen(app, message, target1, target2='0', msgtype='None'): await app.sendTempMessage(group=group, target=member, message=msgchain.asSendable()) -from wiki import im, imt, imarc +from plugins.wiki import im, imt, imarc async def findwikitext(app, message, target1, target2='0', msgtype='None'): diff --git a/mcvbot.py b/mcvbot.py index d91cd195..9a1db754 100644 --- a/mcvbot.py +++ b/mcvbot.py @@ -1,4 +1,4 @@ -from mirai import Mirai, Group, MessageChain, Member, Plain, At, Source, Image, Friend +from mirai import Mirai, Plain qq = 2052142661 # 字段 qq 的值 authKey = '1145141919810' # 字段 authKey 的值 @@ -9,7 +9,7 @@ app = Mirai(f"mirai://{mirai_api_http_locate}?authKey={authKey}&qq={qq}", websoc @app.subroutine async def ver(app: Mirai): - from mcvrss import mcvrss + from plugins.mcvrss import mcvrss for qqgroup in mcvrss(): try: await app.sendGroupMessage(int(qqgroup), [Plain('已开启检测游戏版本。')]) diff --git a/newbiecheck.py b/newbiebot.py similarity index 94% rename from newbiecheck.py rename to newbiebot.py index 3ba48032..f32bc3a9 100644 --- a/newbiecheck.py +++ b/newbiebot.py @@ -2,11 +2,10 @@ import json import requests import time import traceback -from datetime import datetime -from mirai import Mirai, Group, MessageChain, Member, Plain, At, Source, Image, Friend +from mirai import Mirai, Plain -from UTC8 import UTC8 -from pbc import pbc1 +from plugins.UTC8 import UTC8 +from plugins.pbc import pbc1 qq = 2052142661 # 字段 qq 的值 authKey = '1145141919810' # 字段 authKey 的值 diff --git a/UTC8.py b/plugins/UTC8.py similarity index 100% rename from UTC8.py rename to plugins/UTC8.py diff --git a/plugins/__init__.py b/plugins/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ab/__init__.py b/plugins/ab/__init__.py similarity index 94% rename from ab/__init__.py rename to plugins/ab/__init__.py index eb38bf81..c514aafa 100644 --- a/ab/__init__.py +++ b/plugins/ab/__init__.py @@ -1,11 +1,10 @@ # -*- coding:utf-8 -*- import json -import re import aiohttp -from UTC8 import UTC8 -from pbc import pbc2 +from plugins.UTC8 import UTC8 +from plugins.pbc import pbc2 async def ab(): diff --git a/bug/__init__.py b/plugins/bug/__init__.py similarity index 100% rename from bug/__init__.py rename to plugins/bug/__init__.py diff --git a/bug/bugtracker.py b/plugins/bug/bugtracker.py similarity index 100% rename from bug/bugtracker.py rename to plugins/bug/bugtracker.py diff --git a/checkuser.py b/plugins/checkuser.py similarity index 100% rename from checkuser.py rename to plugins/checkuser.py diff --git a/findimage.py b/plugins/findimage.py similarity index 100% rename from findimage.py rename to plugins/findimage.py diff --git a/help.py b/plugins/help.py similarity index 100% rename from help.py rename to plugins/help.py diff --git a/interwikilist/__init__.py b/plugins/interwikilist/__init__.py similarity index 100% rename from interwikilist/__init__.py rename to plugins/interwikilist/__init__.py diff --git a/interwikilist/list.cfg b/plugins/interwikilist/list.cfg similarity index 100% rename from interwikilist/list.cfg rename to plugins/interwikilist/list.cfg diff --git a/mcv/__init__.py b/plugins/mcv/__init__.py similarity index 100% rename from mcv/__init__.py rename to plugins/mcv/__init__.py diff --git a/mcvrss.py b/plugins/mcvrss.py similarity index 82% rename from mcvrss.py rename to plugins/mcvrss.py index 17c8cb1f..2a2adec7 100644 --- a/mcvrss.py +++ b/plugins/mcvrss.py @@ -3,7 +3,7 @@ import re def mcvrss(): - w = open('mcvrss.txt', 'r') + w = open('../mcvrss.txt', 'r') s = w.read().split('\n') if '' in s: s.remove('') @@ -16,7 +16,7 @@ def mcvrssa(group): if group in q: return ('该群已在订阅列表中。') else: - wr = open('mcvrss.txt', 'a+') + wr = open('../mcvrss.txt', 'a+') wr.write(re.sub(r'\n$', '', '\n' + group)) wr.close() return ('已订阅。') @@ -26,8 +26,8 @@ def mcvrssr(group): q = mcvrss() if group in q: q.remove(group) - os.remove('mcvrss.txt') - wr = open('mcvrss.txt', 'a') + os.remove('../mcvrss.txt') + wr = open('../mcvrss.txt', 'a') y = [] h = '' for x in q: diff --git a/newbie/__init__.py b/plugins/newbie/__init__.py similarity index 97% rename from newbie/__init__.py rename to plugins/newbie/__init__.py index 4f061b05..1f2f704b 100644 --- a/newbie/__init__.py +++ b/plugins/newbie/__init__.py @@ -3,7 +3,7 @@ import aiohttp import json import re -from pbc import pbc2 +from plugins.pbc import pbc2 async def new(): diff --git a/pathexist.py b/plugins/pathexist.py similarity index 100% rename from pathexist.py rename to plugins/pathexist.py diff --git a/pbc.py b/plugins/pbc.py similarity index 100% rename from pbc.py rename to plugins/pbc.py diff --git a/ping.py b/plugins/ping.py similarity index 100% rename from ping.py rename to plugins/ping.py diff --git a/rc/__init__.py b/plugins/rc/__init__.py similarity index 94% rename from rc/__init__.py rename to plugins/rc/__init__.py index e03feacd..8639499a 100644 --- a/rc/__init__.py +++ b/plugins/rc/__init__.py @@ -1,10 +1,9 @@ # -*- coding:utf-8 -*- import aiohttp import json -import re -from UTC8 import UTC8 -from pbc import pbc2 +from plugins.UTC8 import UTC8 +from plugins.pbc import pbc2 async def rc(): diff --git a/server/__init__.py b/plugins/server/__init__.py similarity index 100% rename from server/__init__.py rename to plugins/server/__init__.py diff --git a/server/be.py b/plugins/server/be.py similarity index 100% rename from server/be.py rename to plugins/server/be.py diff --git a/server/server.py b/plugins/server/server.py similarity index 100% rename from server/server.py rename to plugins/server/server.py diff --git a/server/serverraw.py b/plugins/server/serverraw.py similarity index 100% rename from server/serverraw.py rename to plugins/server/serverraw.py diff --git a/user/__init__.py b/plugins/user/__init__.py similarity index 96% rename from user/__init__.py rename to plugins/user/__init__.py index e8ff4914..2f9c3e0c 100644 --- a/user/__init__.py +++ b/plugins/user/__init__.py @@ -1,7 +1,7 @@ import re -from help import userhelp -from interwikilist import iwlink, iwlist +from plugins.help import userhelp +from plugins.interwikilist import iwlink, iwlist from .ruserlib import rUser1 from .userlib import User1 diff --git a/user/ruserlib.py b/plugins/user/ruserlib.py similarity index 99% rename from user/ruserlib.py rename to plugins/user/ruserlib.py index df200746..22603267 100644 --- a/user/ruserlib.py +++ b/plugins/user/ruserlib.py @@ -3,7 +3,7 @@ import re import urllib from bs4 import BeautifulSoup as bs -from UTC8 import UTC8 +from plugins.UTC8 import UTC8 from .tool import yhz, gender diff --git a/user/tool.py b/plugins/user/tool.py similarity index 100% rename from user/tool.py rename to plugins/user/tool.py diff --git a/user/userlib.py b/plugins/user/userlib.py similarity index 98% rename from user/userlib.py rename to plugins/user/userlib.py index e6f4683d..44f73ac8 100644 --- a/user/userlib.py +++ b/plugins/user/userlib.py @@ -1,10 +1,8 @@ import aiohttp -import json -import re import re import urllib -from UTC8 import UTC8 +from plugins.UTC8 import UTC8 from .tool import yhz, gender diff --git a/userp/__init__.py b/plugins/userp/__init__.py similarity index 98% rename from userp/__init__.py rename to plugins/userp/__init__.py index cd0599e2..02be24d5 100644 --- a/userp/__init__.py +++ b/plugins/userp/__init__.py @@ -4,8 +4,7 @@ import re import traceback import urllib -from UTC8 import UTC8 -from wiki import im +from plugins.UTC8 import UTC8 from .gender import gender from .puserlib import PUser1 diff --git a/userp/dpng.py b/plugins/userp/dpng.py similarity index 100% rename from userp/dpng.py rename to plugins/userp/dpng.py diff --git a/userp/gender.py b/plugins/userp/gender.py similarity index 100% rename from userp/gender.py rename to plugins/userp/gender.py diff --git a/userp/hh.py b/plugins/userp/hh.py similarity index 100% rename from userp/hh.py rename to plugins/userp/hh.py diff --git a/userp/puserlib.py b/plugins/userp/puserlib.py similarity index 100% rename from userp/puserlib.py rename to plugins/userp/puserlib.py diff --git a/userp/tpg.py b/plugins/userp/tpg.py similarity index 100% rename from userp/tpg.py rename to plugins/userp/tpg.py diff --git a/wiki/__init__.py b/plugins/wiki/__init__.py similarity index 98% rename from wiki/__init__.py rename to plugins/wiki/__init__.py index e41242f2..c61e4a14 100644 --- a/wiki/__init__.py +++ b/plugins/wiki/__init__.py @@ -2,8 +2,8 @@ import asyncio import re import traceback -from help import wikihelp -from interwikilist import iwlist, iwlink +from plugins.help import wikihelp +from plugins.interwikilist import iwlist, iwlink from .wikilib import wiki1, wiki2 diff --git a/wiki/wikilib.py b/plugins/wiki/wikilib.py similarity index 98% rename from wiki/wikilib.py rename to plugins/wiki/wikilib.py index 66406039..8cb8da08 100644 --- a/wiki/wikilib.py +++ b/plugins/wiki/wikilib.py @@ -1,10 +1,9 @@ import aiohttp -import json import re import traceback import urllib -from interwikilist import iwlist, iwlink +from plugins.interwikilist import iwlist, iwlink async def get_data(url: str, fmt: str): diff --git a/wiki/wikitextlib.py b/plugins/wiki/wikitextlib.py similarity index 100% rename from wiki/wikitextlib.py rename to plugins/wiki/wikitextlib.py