From 3932dd60da2fb77c3911b056e339265c74544f23 Mon Sep 17 00:00:00 2001 From: snowykami Date: Tue, 17 Sep 2024 14:57:27 +0800 Subject: [PATCH] =?UTF-8?q?:package:=20docs:=20=E8=B5=84=E6=BA=90=E5=95=86?= =?UTF-8?q?=E5=BA=97=E6=96=B0=E5=A2=9E=E5=8F=91=E5=B8=83=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liteyuki_flow/const.py | 4 +++- liteyuki_flow/resource_handler.py | 14 +++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/liteyuki_flow/const.py b/liteyuki_flow/const.py index de919907..cfd8a72d 100644 --- a/liteyuki_flow/const.py +++ b/liteyuki_flow/const.py @@ -12,4 +12,6 @@ PLUGIN_PREFIX = "Plugin: " PLUGIN_JSON = "docs/publics/plugins.json" RESOURCE_JSON = "docs/publics/resources.json" -edit_tip = "若要修改请编辑这段front matter，不要编辑正文/If you want to modify, please edit the front matter, do not edit the body" +edit_content_tip = "若要修改请编辑这段front matter，不要编辑正文/If you want to modify, please edit the front matter, do not edit the body" + +edit_tip = "如需修改请编辑issue，请不要新建issue，我会自动检查" diff --git a/liteyuki_flow/resource_handler.py b/liteyuki_flow/resource_handler.py index a7f454e2..a0585790 100644 --- a/liteyuki_flow/resource_handler.py +++ b/liteyuki_flow/resource_handler.py @@ -10,16 +10,17 @@ from github.Repository import Repository import json import yaml -from liteyuki_flow.const import OPENED, EDITED, CLOSED, REOPENED, RESOURCE_JSON +from liteyuki_flow.const import OPENED, EDITED, CLOSED, REOPENED, RESOURCE_JSON, edit_tip from liteyuki_flow.markdown_parser import MarkdownParser from liteyuki_flow.typ import err, nil user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3" headers = { - "User-Agent": user_agent + "User-Agent": user_agent } + # opened: 创建新的资源包，预审核 # edited: 编辑资源包信息，需重新审核 # closed: 审核通过，修改json并提交 @@ -35,16 +36,15 @@ def pre_check(github: Github, issue: Issue, repo: Repository) -> err: homepage = parser.front_matters.get("homepage") # optional author = parser.front_matters.get("author") if not all((name, desc, link, author)): - issue.create_comment("name, desc, link, homepage 及 author 为必填字段.") + issue.create_comment("name, desc, link, homepage 及 author 为必填字段." + edit_tip) return ValueError("name, desc, link, homepage 及 author 为必填字段.") # 下载并解析资源包 r = requests.get(link, headers=headers) if r.status_code != 200: - issue.create_comment("下载失败.") + issue.create_comment("下载失败." + edit_tip) return ValueError("下载失败.") - try: with open(f"tmp/{name}.zip", "wb") as f: f.write(r.content) @@ -54,12 +54,12 @@ def pre_check(github: Github, issue: Issue, repo: Repository) -> err: # 检测包内metadata.yml文件 data = yaml.load(open(f"tmp/{name}/metadata.yml"), Loader=yaml.SafeLoader) except Exception: - issue.create_comment("解析资源包失败，可能是格式问题或metadata.yml不存在.") + issue.create_comment("解析资源包失败，可能是格式问题或metadata.yml不存在." + edit_tip) return ValueError("解析资源包失败，可能是格式问题或metadata.yml不存在.") # 检测必要字段 name，description，version if not all((data.get("name"), data.get("description"), data.get("version"))): - issue.create_comment("元数据中缺少必要字段 name, description 或 version.") + issue.create_comment("元数据中缺少必要字段 name, description 或 version." + edit_tip) return ValueError("元数据中缺少必要字段 name, description 或 version.") # 不检测重复资源包，因为资源包可能有多个版本