nonebot-plugin-bittorrents 1.1.0__tar.gz → 1.1.2__tar.gz

{nonebot_plugin_bittorrents-1.1.0/nonebot_plugin_bittorrents.egg-info → nonebot_plugin_bittorrents-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-bittorrents
-Version: 1.1.0
+Version: 1.1.2
 Summary: 适配NoneBot的磁力搜索插件，通过机器人帮你寻找电影、软件或者学习资料
 Author: NightDust981989
 License-Expression: MIT
@@ -8,13 +8,10 @@ Project-URL: homepage, https://github.com/NightDust981989/nonebot-plugin-BitTorr
 Project-URL: repository, https://github.com/NightDust981989/nonebot-plugin-BitTorrents
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx
-Requires-Dist: beautifulsoup4
-Requires-Dist: lxml
-Requires-Dist: pydantic
-Requires-Dist: pydantic-settings
-Requires-Dist: nonebot2
-Requires-Dist: nonebot-adapter-onebot
+Requires-Dist: httpx>=0.23.0
+Requires-Dist: beautifulsoup4>=4.11.0
+Requires-Dist: lxml>=4.9.0
+Requires-Dist: nonebot2>=2.3.0
 Dynamic: license-file
 
 # NoneBot 磁力搜索插件

{nonebot_plugin_bittorrents-1.1.0 → nonebot_plugin_bittorrents-1.1.2}/nonebot_plugin_BitTorrents/__init__.py

@@ -8,6 +8,7 @@ __plugin_meta__ = PluginMetadata(
     type="application",
     homepage="https://github.com/NightDust981989/nonebot-plugin-BitTorrents",
     config=Config,
+    supported_adapters=None,
 )
 
 from . import main

{nonebot_plugin_bittorrents-1.1.0 → nonebot_plugin_bittorrents-1.1.2}/nonebot_plugin_BitTorrents/main.py

@@ -11,9 +11,11 @@ from nonebot.adapters import Message
 from nonebot.params import CommandArg
 
 try:
-    from pydantic import BaseSettings
+    from pydantic import BaseModel
+    from nonebot import get_plugin_config
 except ImportError:
-    from pydantic_settings import BaseSettings
+    from pydantic import BaseSettings as BaseModel
+    from nonebot import get_driver
 
 # ========== 1. 配置映射类（从配置文件读取参数） ==========
 @dataclass
@@ -91,26 +93,34 @@ class MagnetSearchService:
         self.client: httpx.AsyncClient = None
 
     async def _init_client(self):
-        """初始化客户端：使用配置文件的超时时间"""
-        headers = {
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
-            "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
-            "Accept-Language": "zh-CN,zh;q=0.9",
-            "Origin": self.config.base_url,
-            "Content-Type": "application/x-www-form-urlencoded",
-            "Referer": self.config.base_url
-        }
-
-        self.client = httpx.AsyncClient(
-            headers=headers,
-            cookies=self.config.captcha_cookies,
-            timeout=self.config.request_timeout,  # 从配置读取超时时间
-            follow_redirects=False,              # 关闭自动重定向
-            verify=False
-        )
+        """初始化客户端"""
+        if self.client is None:
+            headers = {
+                "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+                "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+                "Accept-Language": "zh-CN,zh;q=0.9",
+                "Origin": self.config.base_url,
+                "Content-Type": "application/x-www-form-urlencoded",
+                "Referer": self.config.base_url
+            }
+
+            self.client = httpx.AsyncClient(
+                headers=headers,
+                cookies=self.config.captcha_cookies,
+                timeout=self.config.request_timeout,  # 从配置读取超时时间
+                follow_redirects=False,              # 关闭自动重定向
+                verify=False
+            )
+
+    async def close_client(self):
+        """关闭客户端"""
+        if self.client:
+            await self.client.aclose()
+            self.client = None
 
     async def search(self, keyword: str, sort_param: str = "") -> List[str]:
         """搜索逻辑：使用配置文件的站点/接口/结果数"""
+        # 确保客户端已初始化
         await self._init_client()
         results = []
 
@@ -215,28 +225,24 @@ class MagnetSearchService:
         except Exception as e:
             print(f"搜索异常：{str(e)}")
             results = [f"搜索失败：{str(e)[:50]}"]
-        finally:
-            if self.client:
-                await self.client.aclose()
 
         return results
 
-# ========== 4. 初始化配置和服务 ==========
-# 从 nonebot 配置中获取参数，如果不存在则使用默认值
-from nonebot import get_driver
-
-class Config(BaseSettings):
+# ========== 4. 配置类定义 ==========
+class Config(BaseModel):
     magnet_base_url: str = "https://clg2.clgapp1.xyz"
     magnet_search_path: str = "/cllj.php"
     magnet_max_results: int = 3
     magnet_request_timeout: int = 15
 
-    class Config:
-        extra = "allow"
-
-driver = get_driver()
-global_config = driver.config
-plugin_config = Config(**global_config.dict())
+try:
+    plugin_config = get_plugin_config(Config)
+except:
+    # 兜底
+    from nonebot import get_driver
+    driver = get_driver()
+    global_config = driver.config
+    plugin_config = Config(**global_config.dict())
 
 # 初始化配置类
 magnet_config = MagnetConfig(

{nonebot_plugin_bittorrents-1.1.0 → nonebot_plugin_bittorrents-1.1.2/nonebot_plugin_bittorrents.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-bittorrents
-Version: 1.1.0
+Version: 1.1.2
 Summary: 适配NoneBot的磁力搜索插件，通过机器人帮你寻找电影、软件或者学习资料
 Author: NightDust981989
 License-Expression: MIT
@@ -8,13 +8,10 @@ Project-URL: homepage, https://github.com/NightDust981989/nonebot-plugin-BitTorr
 Project-URL: repository, https://github.com/NightDust981989/nonebot-plugin-BitTorrents
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx
-Requires-Dist: beautifulsoup4
-Requires-Dist: lxml
-Requires-Dist: pydantic
-Requires-Dist: pydantic-settings
-Requires-Dist: nonebot2
-Requires-Dist: nonebot-adapter-onebot
+Requires-Dist: httpx>=0.23.0
+Requires-Dist: beautifulsoup4>=4.11.0
+Requires-Dist: lxml>=4.9.0
+Requires-Dist: nonebot2>=2.3.0
 Dynamic: license-file
 
 # NoneBot 磁力搜索插件

nonebot_plugin_bittorrents-1.1.2/nonebot_plugin_bittorrents.egg-info/requires.txt

@@ -0,0 +1,4 @@
+httpx>=0.23.0
+beautifulsoup4>=4.11.0
+lxml>=4.9.0
+nonebot2>=2.3.0

{nonebot_plugin_bittorrents-1.1.0 → nonebot_plugin_bittorrents-1.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-bittorrents"
-version = "1.1.0"
+version = "1.1.2"
 description = "适配NoneBot的磁力搜索插件，通过机器人帮你寻找电影、软件或者学习资料"
 authors = [
     {name = "NightDust981989"}
@@ -8,13 +8,10 @@ authors = [
 license = "MIT"
 readme = "README.md"
 dependencies = [
-    "httpx",
-    "beautifulsoup4",
-    "lxml",
-    "pydantic",
-    "pydantic-settings",
-    "nonebot2",
-    "nonebot-adapter-onebot"
+    "httpx>=0.23.0",
+    "beautifulsoup4>=4.11.0",
+    "lxml>=4.9.0",
+    "nonebot2>=2.3.0",
 ]
 
 [project.urls]

nonebot_plugin_bittorrents-1.1.0/nonebot_plugin_bittorrents.egg-info/requires.txt

@@ -1,7 +0,0 @@
-httpx
-beautifulsoup4
-lxml
-pydantic
-pydantic-settings
-nonebot2
-nonebot-adapter-onebot