From 52d070381273cd4e2cfefa0a08a94e2ecc6c533d Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Tue, 9 Jul 2024 08:09:58 +0800
Subject: [PATCH] v1.9.11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 支持环境变量配置DOH域名和DNS服务器
- 问题修复
---
 app/chain/download.py | 2 ++
 app/core/config.py    | 8 ++++----
 app/helper/plugin.py  | 6 +++---
 version.py            | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/chain/download.py b/app/chain/download.py
index 037c0c7b..ed4e7775 100644
--- a/app/chain/download.py
+++ b/app/chain/download.py
@@ -76,6 +76,8 @@ class DownloadChain(ChainBase):
             msg_text = f"{msg_text}\n促销：{torrent.volume_factor}"
         if torrent.hit_and_run:
             msg_text = f"{msg_text}\nHit&Run：是"
+        if torrent.labels:
+            msg_text = f"{msg_text}\n标签：{' '.join(torrent.labels)}"
         if torrent.description:
             html_re = re.compile(r'<[^>]+>', re.S)
             description = html_re.sub('', torrent.description)
diff --git a/app/core/config.py b/app/core/config.py
index aae1ca4d..6da5713f 100644
--- a/app/core/config.py
+++ b/app/core/config.py
@@ -225,7 +225,7 @@ class Settings(BaseSettings):
     # Github token，提高请求api限流阈值 ghp_****
     GITHUB_TOKEN: Optional[str] = None
     # 指定的仓库Github token，多个仓库使用,分隔，格式：{user1}/{repo1}:ghp_****,{user2}/{repo2}:github_pat_****
-    GITHUB_TOKEN_FOR_REPO: Optional[str] = None
+    REPO_GITHUB_TOKEN: Optional[str] = None
     # Github代理服务器，格式：https://mirror.ghproxy.com/
     GITHUB_PROXY: Optional[str] = ''
     # 自动检查和更新站点资源包（站点索引、认证等）
@@ -364,18 +364,18 @@ class Settings(BaseSettings):
             }
         return {}
 
-    def GITHUB_HEADERS_FOR_REPO(self, repo: str = None):
+    def REPO_GITHUB_HEADERS(self, repo: str = None):
         """
         Github指定的仓库请求头
         :param repo: 指定的仓库名称，格式为 "user/repo"。如果为空，或者没有找到指定仓库请求头，则返回默认的请求头信息
         :return: Github请求头
         """
         # 如果没有传入指定的仓库名称，或没有配置指定的仓库Token，则返回默认的请求头信息
-        if not repo or not self.GITHUB_TOKEN_FOR_REPO:
+        if not repo or not self.REPO_GITHUB_TOKEN:
             return self.GITHUB_HEADERS
         headers = {}
         # 格式：{user1}/{repo1}:ghp_****,{user2}/{repo2}:github_pat_****
-        token_pairs = self.GITHUB_TOKEN_FOR_REPO.split(",")
+        token_pairs = self.REPO_GITHUB_TOKEN.split(",")
         for token_pair in token_pairs:
             try:
                 parts = token_pair.split(":")
diff --git a/app/helper/plugin.py b/app/helper/plugin.py
index e65a1800..b17f5661 100644
--- a/app/helper/plugin.py
+++ b/app/helper/plugin.py
@@ -52,7 +52,7 @@ class PluginHelper(metaclass=Singleton):
             return {}
         raw_url = self._base_url % (user, repo)
         res = RequestUtils(proxies=self.proxies,
-                           headers=settings.GITHUB_HEADERS_FOR_REPO(repo=f"{user}/{repo}"),
+                           headers=settings.REPO_GITHUB_HEADERS(repo=f"{user}/{repo}"),
                            timeout=10).get_res(f"{raw_url}package.json")
         if res:
             try:
@@ -146,7 +146,7 @@ class PluginHelper(metaclass=Singleton):
             """
             file_api = f"https://api.github.com/repos/{user_repo}/contents/plugins/{_p}"
             r = RequestUtils(proxies=settings.PROXY,
-                             headers=settings.GITHUB_HEADERS_FOR_REPO(repo=user_repo),
+                             headers=settings.REPO_GITHUB_HEADERS(repo=user_repo),
                              timeout=30).get_res(file_api)
             if r is None:
                 return None, "连接仓库失败"
@@ -169,7 +169,7 @@ class PluginHelper(metaclass=Singleton):
                     download_url = f"{settings.GITHUB_PROXY}{item.get('download_url')}"
                     # 下载插件文件
                     res = RequestUtils(proxies=self.proxies,
-                                       headers=settings.GITHUB_HEADERS_FOR_REPO(repo=user_repo),
+                                       headers=settings.REPO_GITHUB_HEADERS(repo=user_repo),
                                        timeout=60).get_res(download_url)
                     if not res:
                         return False, f"文件 {item.get('name')} 下载失败！"
diff --git a/version.py b/version.py
index a2d652fd..082c3319 100644
--- a/version.py
+++ b/version.py
@@ -1 +1 @@
-APP_VERSION = 'v1.9.10-1'
+APP_VERSION = 'v1.9.11'