nonebot-plugin-bililive 2.1.1__tar.gz → 2.1.3__tar.gz

{nonebot_plugin_bililive-2.1.1 → nonebot_plugin_bililive-2.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-bililive
-Version: 2.1.1
+Version: 2.1.3
 Summary: Push bilibili dynamics and live notifications to QQ with NoneBot2.
 Keywords: nonebot,nonebot2,nonebot-plugin,bilibili,onebot,onebot-v11
 Author-Email: Akiyy_Lab <2806578374@qq.com>

{nonebot_plugin_bililive-2.1.1 → nonebot_plugin_bililive-2.1.3}/nonebot_plugin_bililive/__init__.py

@@ -1,6 +1,5 @@
 from nonebot import require
 from nonebot.plugin import PluginMetadata
-from nonebot.plugin.manager import PluginLoader
 
 from .config import Config, plugin_config
 from .version import VERSION, __version__
@@ -8,17 +7,11 @@ from .version import VERSION, __version__
 require("nonebot_plugin_localstore")
 require("nonebot_plugin_apscheduler")
 
+from .utils import on_startup
 
-def bootstrap_plugin(force: bool = False):
-    if force or isinstance(globals()["__loader__"], PluginLoader):
-        from .utils import on_startup
+on_startup()
 
-        on_startup()
-
-        from . import plugins  # noqa: F401
-
-
-bootstrap_plugin()
+from . import plugins  # noqa: F401
 
 __plugin_meta__ = PluginMetadata(
     name="BiliLive",

{nonebot_plugin_bililive-2.1.1 → nonebot_plugin_bililive-2.1.3}/nonebot_plugin_bililive/config.py

@@ -3,19 +3,12 @@ from collections.abc import Mapping
 from typing import Any
 
 from nonebot import get_plugin_config, logger
-from nonebot.compat import PYDANTIC_V2, ConfigDict, field_validator, model_validator
+from nonebot.compat import field_validator, model_validator
 from pydantic import BaseModel
 
 
 # 其他地方出现的类似 from .. import config，均是从 __init__.py 导入的 Config 实例
 class Config(BaseModel):
-    if PYDANTIC_V2:
-        model_config = ConfigDict(extra="ignore")
-    else:
-
-        class Config:
-            extra = "ignore"
-
     fastapi_reload: bool = False
     bililive_to_me: bool = True
     bililive_live_off_notify: bool = False

{nonebot_plugin_bililive-2.1.1 → nonebot_plugin_bililive-2.1.3}/nonebot_plugin_bililive/utils/__init__.py

@@ -28,10 +28,12 @@ from nonebot.rule import Rule
 
 from ..config import plugin_config
 
+DATA_DIR = store.get_plugin_data_dir()
+
 
 def get_data_dir():
     """获取插件数据目录。"""
-    return store.get_plugin_data_dir()
+    return DATA_DIR
 
 
 def get_path(*other):
@@ -294,8 +296,14 @@ def on_startup():
 
         check_proxy()
         install()
-        asyncio.get_event_loop().run_until_complete(check_playwright_env())
-        get_data_dir().mkdir(parents=True, exist_ok=True)
+        try:
+            asyncio.get_event_loop().run_until_complete(check_playwright_env())
+        except ImportError as err:
+            logger.warning(
+                "Playwright 运行环境不完整，已跳过启动时强校验；"
+                f"涉及截图/浏览器能力时可能不可用。错误：{err}"
+            )
+        DATA_DIR.mkdir(parents=True, exist_ok=True)
 
 
 def on_command(cmd, *args, **kwargs):

{nonebot_plugin_bililive-2.1.1 → nonebot_plugin_bililive-2.1.3}/nonebot_plugin_bililive/version.py

@@ -1,4 +1,4 @@
 from packaging.version import Version
 
-__version__ = "2.1.1"
+__version__ = "2.1.3"
 VERSION = Version(__version__)

{nonebot_plugin_bililive-2.1.1 → nonebot_plugin_bililive-2.1.3}/pyproject.toml

@@ -39,7 +39,7 @@ dependencies = [
     "msvc-runtime>=14.34.31931; sys_platform == \"win32\"",
 ]
 dynamic = []
-version = "2.1.1"
+version = "2.1.3"
 
 [project.license]
 text = "AGPL-3.0-or-later"
@@ -52,7 +52,6 @@ Issues = "https://github.com/Akiyy-dev/nonebot-plugin-bililive/issues"
 
 [project.entry-points."nonebot.plugin"]
 nonebot-plugin-bililive = "nonebot_plugin_bililive"
-nonebot_plugin_bililive = "nonebot_plugin_bililive"
 
 [project.scripts]
 bililive = "nonebot_plugin_bililive.__main__:main"
@@ -77,7 +76,6 @@ path = "nonebot_plugin_bililive/version.py"
 [tool.pdm.build]
 includes = [
     "nonebot_plugin_bililive",
-    "nonebot-plugin-bililive",
 ]
 
 [tool.pdm.dev-dependencies]

{nonebot_plugin_bililive-2.1.1 → nonebot_plugin_bililive-2.1.3}/tests/test_maintenance.py

@@ -6,6 +6,8 @@ from pathlib import Path
 from types import ModuleType, SimpleNamespace
 from unittest.mock import AsyncMock, patch
 
+import nonebot
+
 
 class DummyDriver:
     config = {}
@@ -22,6 +24,12 @@ fake_localstore = ModuleType("nonebot_plugin_localstore")
 
 
 class DummyScheduler:
+    def scheduled_job(self, *args, **kwargs):
+        def decorator(func):
+            return func
+
+        return decorator
+
     def add_listener(self, *args, **kwargs):
         return None
 
@@ -41,6 +49,8 @@ def _get_plugin_data_dir() -> Path:
 
 fake_localstore.get_plugin_data_dir = _get_plugin_data_dir
 
+nonebot.init(driver="~none", log_level="ERROR")
+
 
 with patch("nonebot.get_driver", return_value=DummyDriver()), patch(
     "nonebot.get_plugin_config", side_effect=lambda cls: cls()
@@ -56,7 +66,6 @@ with patch("nonebot.get_driver", return_value=DummyDriver()), patch(
     db_module = import_module("nonebot_plugin_bililive.database.db")
     web_dynamic = import_module("nonebot_plugin_bililive.libs.dynamic.web")
     plugin_entry = import_module("nonebot_plugin_bililive")
-    hyphen_plugin_entry = import_module("nonebot-plugin-bililive")
     DB = db_module.DB
     models = import_module("nonebot_plugin_bililive.database.models")
     Group = models.Group
@@ -103,7 +112,6 @@ class PluginEntryTests(unittest.TestCase):
         self.assertEqual(plugin_entry.__plugin_meta__.config, Config)
         self.assertEqual(plugin_entry.__plugin_meta__.extra["author"], "Akiyy_Lab")
         self.assertEqual(plugin_entry.__version__, core_version.__version__)
-        self.assertIs(hyphen_plugin_entry.__plugin_meta__, plugin_entry.__plugin_meta__)
 
     def test_default_data_dir_uses_localstore(self):
         expected = _get_plugin_data_dir() / "data.sqlite3"
@@ -117,15 +125,8 @@ class PluginEntryTests(unittest.TestCase):
             'nonebot-plugin-bililive = "nonebot_plugin_bililive"',
             pyproject,
         )
-        self.assertIn(
-            'nonebot_plugin_bililive = "nonebot_plugin_bililive"',
-            pyproject,
-        )
         self.assertIn('bililive = "nonebot_plugin_bililive.__main__:main"', pyproject)
-        self.assertIn(
-            'includes = ["nonebot_plugin_bililive", "nonebot-plugin-bililive"]',
-            pyproject,
-        )
+        self.assertIn('includes = ["nonebot_plugin_bililive"]', pyproject)
         self.assertNotIn('nonebot2[fastapi]>=', pyproject)
         self.assertNotIn('bilireq>=', pyproject)
 

nonebot_plugin_bililive-2.1.1/nonebot-plugin-bililive/__init__.py

@@ -1,3 +0,0 @@
-from nonebot_plugin_bililive import VERSION, __plugin_meta__, __version__, plugin_config
-
-__all__ = ["__plugin_meta__", "__version__", "VERSION", "plugin_config"]