TeamPGM/PagerMaid-Modify
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

✨ apt 支持一键更新、关闭 debug (#44)

Browse Source 
* ✨ apt 支持一键更新

* ♻️ 移除 logging
This commit is contained in:
Xtao_dada 2021-01-23 20:22:59 +08:00 committed by GitHub
parent f948b0dc86
commit 896ee59963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pagermaid/__init__.py
View File

@ -7,7 +7,6 @@ from sys import version_info, platform
from yaml import load, FullLoader
from shutil import copyfile
from redis import StrictRedis
from logging import getLogger, INFO, DEBUG, StreamHandler
from distutils2.util import strtobool
from coloredlogs import ColoredFormatter
from telethon import TelegramClient
@ -15,15 +14,9 @@ from telethon import TelegramClient
persistent_vars = {}
module_dir = __path__[0]
working_dir = getcwd()
logging_format = "%(levelname)s [%(asctime)s] [%(name)s] %(message)s"
config = None
help_messages = {}
posthog.api_key = '1WepU-o7JwNKYqPNymWr_mrCu3RVPD-p28PUikPDfsI'
logs = getLogger(__name__)
logging_handler = StreamHandler()
logging_handler.setFormatter(ColoredFormatter(logging_format))
logs.addHandler(logging_handler)
logs.setLevel(INFO)
try:
config = load(open(r"config.yml"), Loader=FullLoader)
@ -32,10 +25,6 @@ except FileNotFoundError:
copyfile(f"{module_dir}/assets/config.gen.yml", "config.yml")
exit(1)
if strtobool(config['debug']):
logs.setLevel(DEBUG)
else:
logs.setLevel(INFO)
if platform == "linux" or platform == "linux2" or platform == "darwin" or platform == "freebsd7" \
or platform == "freebsd8" or platform == "freebsdN" or platform == "openbsd6":

35
pagermaid/modules/plugin.py
View File

@ -227,7 +227,8 @@ async def plugin(context):
await context.edit("出错了呜呜呜 ~ 无效的参数。")
elif context.parameter[0] == "update":
unneed_update = "无需更新："
need_update = "\n需要更新："
need_update = "\n已更新："
need_update_list = []
if not exists(f"{plugin_directory}version.json"):
await context.edit("安装一个仓库内插件再试试？")
return
@ -243,16 +244,44 @@ async def plugin(context):
if (float(i['version']) - float(value)) <= 0:
unneed_update += "\n`" + key + "`：Ver " + value
else:
need_update_list.extend([key])
need_update += "\n`" + key + "`：Ver " + value + " --> Ver " + i['version']
continue
if unneed_update == "无需更新：":
unneed_update = ''
if need_update == "\n需要更新：":
if need_update == "\n已更新：":
need_update = ''
if unneed_update == '' and need_update == '':
await context.edit("不如去安装一些插件？")
else:
await context.edit(unneed_update + need_update)
if len(need_update_list) == 0:
await context.edit('正在读取云端插件列表...完成\n正在读取本地插件版本信息...完成\n**没有需要更新的插件。**')
else:
print(6)
await context.edit('正在读取云端插件列表...完成\n正在读取本地插件版本信息...完成\n正在更新插件...')
plugin_directory = f"{working_dir}/plugins/"
for i in need_update_list:
file_path = i + ".py"
plugin_content = get(
f"https://raw.githubusercontent.com/xtaodada/PagerMaid_Plugins/master/{i}.py").content
with open(file_path, 'wb') as f:
f.write(plugin_content)
with open(f"{plugin_directory}version.json", 'r', encoding="utf-8") as f:
version_json = json.load(f)
for m in plugin_online:
if m['name'] == i:
version_json[i] = m['version']
with open(f"{plugin_directory}version.json", 'w') as f:
json.dump(version_json, f)
if exists(f"{plugin_directory}{file_path}"):
remove(f"{plugin_directory}{file_path}")
move(file_path, plugin_directory)
elif exists(f"{plugin_directory}{file_path}.disabled"):
remove(f"{plugin_directory}{file_path}.disabled")
move(file_path, f"{plugin_directory}{file_path}.disabled")
else:
move(file_path, plugin_directory)
await context.edit('正在读取云端插件列表...完成\n正在读取本地插件版本信息...完成\n' + need_update)
elif context.parameter[0] == "search":
if len(context.parameter) == 1:
await context.edit("没插件名我怎么搜索？")