modified: basic_plugins/admin_bot_manage/_data_source.py

modified: basic_plugins/admin_bot_manage/admin_config.py modified: basic_plugins/admin_bot_manage/custom_welcome_message.py modified: basic_plugins/admin_bot_manage/timing_task.py modified: basic_plugins/apscheduler/__init__.py modified: basic_plugins/ban/__init__.py modified: basic_plugins/ban/data_source.py modified: basic_plugins/chat_history/chat_message.py modified: basic_plugins/chat_history/chat_message_handle.py modified: basic_plugins/group_handle/__init__.py modified: basic_plugins/hooks/_utils.py modified: basic_plugins/hooks/ban_hook.py modified: basic_plugins/hooks/chkdsk_hook.py modified: basic_plugins/init_plugin_config/__init__.py deleted: basic_plugins/init_plugin_config/init_group_manager.py modified: basic_plugins/invite_manager/__init__.py new file: basic_plugins/invite_manager/utils.py modified: basic_plugins/nickname.py modified: basic_plugins/plugin_shop/__init__.py modified: basic_plugins/plugin_shop/data_source.py modified: basic_plugins/scripts.py modified: basic_plugins/shop/__init__.py modified: basic_plugins/shop/buy.py modified: basic_plugins/shop/gold.py modified: basic_plugins/shop/my_props/__init__.py deleted: basic_plugins/shop/reset_today_gold.py modified: basic_plugins/shop/shop_handle/__init__.py modified: basic_plugins/shop/shop_handle/data_source.py modified: basic_plugins/shop/use/__init__.py modified: basic_plugins/shop/use/data_source.py modified: basic_plugins/super_cmd/__init__.py modified: basic_plugins/super_cmd/bot_friend_group.py modified: basic_plugins/super_cmd/clear_data.py modified: basic_plugins/super_cmd/exec_sql.py modified: basic_plugins/super_cmd/manager_group.py modified: basic_plugins/super_cmd/reload_setting.py modified: basic_plugins/super_cmd/set_admin_permissions.py deleted: basic_plugins/super_cmd/super_task_switch.py modified: basic_plugins/super_cmd/update_friend_group_info.py modified: basic_plugins/super_help/__init__.py modified: basic_plugins/update_info.py modified: configs/config.py modified: configs/utils/__init__.py modified: models/bag_user.py modified: models/ban_user.py modified: models/chat_history.py modified: models/friend_user.py modified: models/goods_info.py modified: models/group_info.py modified: models/group_member_info.py modified: models/level_user.py modified: models/sign_group_user.py modified: models/user_shop_gold_log.py modified: plugins/aconfig/__init__.py modified: plugins/ai/__init__.py modified: plugins/ai/data_source.py modified: plugins/bilibili_sub/__init__.py modified: plugins/bilibili_sub/data_source.py modified: plugins/bilibili_sub/model.py modified: plugins/black_word/__init__.py modified: plugins/black_word/model.py modified: plugins/black_word/utils.py modified: plugins/bt/data_source.py modified: plugins/genshin/almanac/__init__.py modified: plugins/genshin/material_remind/__init__.py modified: plugins/genshin/query_user/_models/__init__.py modified: plugins/genshin/query_user/_utils/__init__.py modified: plugins/genshin/query_user/bind/__init__.py modified: plugins/genshin/query_user/genshin_sign/__init__.py modified: plugins/genshin/query_user/genshin_sign/data_source.py modified: plugins/genshin/query_user/genshin_sign/init_task.py modified: plugins/genshin/query_user/mihoyobbs_sign/__init__.py modified: plugins/genshin/query_user/query_memo/__init__.py modified: plugins/genshin/query_user/query_memo/data_source.py modified: plugins/genshin/query_user/query_role/__init__.py modified: plugins/genshin/query_user/query_role/data_source.py modified: plugins/genshin/query_user/reset_today_query_user_data/__init__.py modified: plugins/genshin/query_user/resin_remind/__init__.py modified: plugins/genshin/query_user/resin_remind/init_task.py modified: plugins/gold_redbag/model.py modified: plugins/image_management/send_image/__init__.py modified: plugins/my_info/__init__.py modified: plugins/open_cases/models/buff_prices.py modified: plugins/open_cases/models/open_cases_user.py modified: plugins/open_cases/open_cases_c.py modified: plugins/open_cases/utils.py modified: plugins/parse_bilibili_json.py modified: plugins/pid_search.py modified: plugins/pix_gallery/__init__.py modified: plugins/pix_gallery/_data_source.py modified: plugins/pix_gallery/_model/omega_pixiv_illusts.py modified: plugins/pix_gallery/_model/pixiv.py modified: plugins/pix_gallery/_model/pixiv_keyword_user.py modified: plugins/pix_gallery/pix_add_keyword.py modified: plugins/pix_gallery/pix_pass_del_keyword.py modified: plugins/pix_gallery/pix_show_info.py modified: plugins/pix_gallery/pix_update.py modified: plugins/pixiv_rank_search/data_source.py modified: plugins/poke/__init__.py modified: plugins/russian/__init__.py modified: plugins/russian/data_source.py modified: plugins/russian/model.py modified: plugins/send_dinggong_voice/__init__.py modified: plugins/send_setu_/_model.py modified: plugins/send_setu_/send_setu/__init__.py modified: plugins/send_setu_/send_setu/data_source.py modified: plugins/send_setu_/update_setu/data_source.py modified: plugins/sign_in/goods_register.py modified: plugins/sign_in/group_user_checkin.py modified: plugins/sign_in/random_event.py modified: plugins/sign_in/utils.py modified: plugins/statistics/_model.py modified: plugins/statistics/statistics_handle.py modified: plugins/statistics/statistics_hook.py modified: plugins/update_picture.py modified: plugins/web_ui/api/request.py modified: plugins/word_bank/_model.py deleted: plugins/word_bank/_old_model.py modified: plugins/word_bank/_rule.py modified: plugins/word_bank/word_handle.py modified: plugins/word_clouds/data_source.py modified: resources/image/sign/sign_res/bar.png modified: resources/image/sign/sign_res/bar_white.png modified: services/db_context.py modified: services/log.py modified: utils/browser.py modified: utils/data_utils.py modified: utils/depends/__init__.py modified: utils/http_utils.py modified: utils/image_utils.py modified: utils/manager/admin_manager.py modified: utils/message_builder.py modified: utils/utils.py
2026-10-18 02:30:08 +08:00 · 2023-02-18 18:46:54 +08:00
parent a6105e8a1b
commit 7685b95031
134 changed files with 5402 additions and 6033 deletions
@@ -1,28 +1,29 @@
-from nonebot import on_command, on_regex
-from nonebot.typing import T_State
-from nonebot.adapters.onebot.v11 import Bot, MessageEvent, GroupMessageEvent, Message
+from typing import Any, Optional, Tuple

+import nonebot
+from nonebot import Driver, on_command, on_regex
+from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageEvent
+from nonebot.params import ArgStr, CommandArg, RegexGroup
+from nonebot.typing import T_State
+
+from configs.config import Config
+from models.level_user import LevelUser
+from services.log import logger
 from utils.image_utils import text2image
+from utils.manager import group_manager
 from utils.message_builder import image
+from utils.utils import get_bot, is_number, scheduler
+
 from .data_source import (
+    BilibiliSub,
+    SubManager,
    add_live_sub,
-    delete_sub,
-    add_up_sub,
    add_season_sub,
+    add_up_sub,
+    delete_sub,
    get_media_id,
    get_sub_status,
-    SubManager,
-    BilibiliSub,
 )
-from models.level_user import LevelUser
-from utils.manager import group_manager
-from configs.config import Config
-from utils.utils import is_number, scheduler, get_bot
-from typing import Optional, Tuple, Any
-from services.log import logger
-from nonebot import Driver
-from nonebot.params import CommandArg, ArgStr, RegexGroup
-import nonebot

 __zx_plugin_name__ = "B站订阅"
 __plugin_usage__ = """
@@ -168,20 +169,20 @@ async def _(
    sub_user: str = ArgStr("sub_user"),
 ):
    if sub_type in ["主播", "直播"]:
-        result = await BilibiliSub.delete_bilibili_sub(int(id_),sub_user,"live")
+        result = await BilibiliSub.delete_bilibili_sub(int(id_), sub_user, "live")
    elif sub_type.lower() in ["up", "用户"]:
-        result = await BilibiliSub.delete_bilibili_sub(int(id_),sub_user,"up")    
-    else: result = await BilibiliSub.delete_bilibili_sub(int(id_),sub_user)  
+        result = await BilibiliSub.delete_bilibili_sub(int(id_), sub_user, "up")
+    else:
+        result = await BilibiliSub.delete_bilibili_sub(int(id_), sub_user)
    if result:
        await del_sub.send(f"删除订阅id：{id_} 成功...")
        logger.info(
-        f"(USER {event.user_id}, GROUP "
-        f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
-        f" 删除订阅 {id_}"
-    )
+            f"(USER {event.user_id}, GROUP "
+            f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
+            f" 删除订阅 {id_}"
+        )
    else:
        await del_sub.send(f"删除订阅id：{id_} 失败...")
-       


@show_sub_info.handle()
@@ -190,7 +191,7 @@ async def _(event: MessageEvent):
        id_ = f"{event.group_id}"
    else:
        id_ = f"{event.user_id}"
-    data = await BilibiliSub.get_sub_data(id_)
+    data = await BilibiliSub.filter(sub_users__contains=id_).all()
    live_rst = ""
    up_rst = ""
    season_rst = ""
@@ -217,11 +218,9 @@ async def _(event: MessageEvent):
        )
    await show_sub_info.send(
        image(
-            b64=(
-                await text2image(
-                    live_rst + up_rst + season_rst, padding=10, color="#f9f6f2"
-                )
-            ).pic2bs4()
+            await text2image(
+                live_rst + up_rst + season_rst, padding=10, color="#f9f6f2"
+            )
        )
    )

@@ -277,7 +276,9 @@ async def send_sub_msg(rst: str, sub: BilibiliSub, bot: Bot):
                        ):
                            rst = "[CQ:at,qq=all]\n" + rst
                    if group_manager.get_plugin_status("bilibili_sub", group_id):
-                        await bot.send_group_msg(group_id=group_id, message=Message(rst))
+                        await bot.send_group_msg(
+                            group_id=group_id, message=Message(rst)
+                        )
                else:
                    await bot.send_private_msg(user_id=int(x), message=Message(rst))
            except Exception as e:
@@ -1,34 +1,33 @@
-from bilireq.exceptions import ResponseCodeError
-from nonebot.adapters.onebot.v11 import MessageSegment
-
-from utils.manager import resources_manager
+import random
 from asyncio.exceptions import TimeoutError
+from datetime import datetime
+from typing import Optional, Tuple

-from utils.utils import get_bot
-from .model import BilibiliSub
-from bilireq.live import get_room_info_by_id
-from .utils import get_meta, get_user_card
-from utils.message_builder import image
-from bilireq.user import get_videos
 # from .utils import get_videos
 from bilireq import dynamic
-from typing import Optional, Tuple
-from configs.path_config import IMAGE_PATH
-from datetime import datetime
-from utils.browser import get_browser
-from services.db_context import db
+from bilireq.exceptions import ResponseCodeError
+from bilireq.live import get_room_info_by_id
+from bilireq.user import get_videos
+from nonebot.adapters.onebot.v11 import MessageSegment
+
+from configs.path_config import IMAGE_PATH, TEMP_PATH
 from services.log import logger
-from utils.http_utils import AsyncHttpx
-import random
+from utils.browser import get_browser
+from utils.http_utils import AsyncHttpx, AsyncPlaywright
+from utils.manager import resources_manager
+from utils.message_builder import image
+from utils.utils import get_bot
+
+from .model import BilibiliSub
+from .utils import get_meta, get_user_card
+
+SEARCH_URL = "https://api.bilibili.com/x/web-interface/search/all/v2"
+
+DYNAMIC_PATH = IMAGE_PATH / "bilibili_sub" / "dynamic"
+DYNAMIC_PATH.mkdir(exist_ok=True, parents=True)


-bilibili_search_url = "https://api.bilibili.com/x/web-interface/search/all/v2"
-
-dynamic_path = IMAGE_PATH / "bilibili_sub" / "dynamic"
-dynamic_path.mkdir(exist_ok=True, parents=True)
-
-
-resources_manager.add_temp_dir(dynamic_path)
+resources_manager.add_temp_dir(DYNAMIC_PATH)


 async def add_live_sub(live_id: int, sub_user: str) -> str:
@@ -49,7 +48,7 @@ async def add_live_sub(live_id: int, sub_user: str) -> str:
        short_id = live_info["short_id"]
        title = live_info["title"]
        live_status = live_info["live_status"]
-        if await BilibiliSub.add_bilibili_sub(
+        if await BilibiliSub.sub_handle(
            room_id,
            "live",
            sub_user,
@@ -58,14 +57,14 @@ async def add_live_sub(live_id: int, sub_user: str) -> str:
            live_status=live_status,
        ):
            await _get_up_status(room_id)
-            uname = (await BilibiliSub.get_sub(room_id)).uname
+            uname = (await BilibiliSub.get_or_none(sub_id=room_id)).uname
            return (
                "已成功订阅主播：\n"
                f"\ttitle：{title}\n"
                f"\tname： {uname}\n"
                f"\tlive_id：{room_id}\n"
                f"\tuid：{uid}"
-                )
+            )
        else:
            return "添加订阅失败..."
    except Exception as e:
@@ -80,35 +79,34 @@ async def add_up_sub(uid: int, sub_user: str) -> str:
    :param sub_user: 订阅用户
    """
    try:
-        async with db.transaction():
-            try:
-                """bilibili_api.user库中User类的get_user_info改为bilireq.user库的get_user_info方法"""
-                user_info = await get_user_card(uid)
-            except ResponseCodeError:
-                return f"未找到UpId：{uid} 的信息，请检查Id是否正确"
-            uname = user_info["name"]
-            """bilibili_api.user库中User类的get_dynamics改为bilireq.dynamic库的get_user_dynamics方法"""
-            dynamic_info = await dynamic.get_user_dynamics(uid)
-            dynamic_upload_time = 0
-            if dynamic_info.get("cards"):
-                dynamic_upload_time = dynamic_info["cards"][0]["desc"]["timestamp"]
-            """bilibili_api.user库中User类的get_videos改为bilireq.user库的get_videos方法"""
-            video_info = await get_videos(uid)
-            latest_video_created = 0
-            if video_info["list"].get("vlist"):
-                latest_video_created = video_info["list"]["vlist"][0]["created"]
-            if await BilibiliSub.add_bilibili_sub(
-                uid,
-                "up",
-                sub_user,
-                uid=uid,
-                uname=uname,
-                dynamic_upload_time=dynamic_upload_time,
-                latest_video_created=latest_video_created,
-            ):
-                return "已成功订阅UP：\n" f"\tname: {uname}\n" f"\tuid：{uid}"
-            else:
-                return "添加订阅失败..."
+        try:
+            """bilibili_api.user库中User类的get_user_info改为bilireq.user库的get_user_info方法"""
+            user_info = await get_user_card(uid)
+        except ResponseCodeError:
+            return f"未找到UpId：{uid} 的信息，请检查Id是否正确"
+        uname = user_info["name"]
+        """bilibili_api.user库中User类的get_dynamics改为bilireq.dynamic库的get_user_dynamics方法"""
+        dynamic_info = await dynamic.get_user_dynamics(uid)
+        dynamic_upload_time = 0
+        if dynamic_info.get("cards"):
+            dynamic_upload_time = dynamic_info["cards"][0]["desc"]["timestamp"]
+        """bilibili_api.user库中User类的get_videos改为bilireq.user库的get_videos方法"""
+        video_info = await get_videos(uid)
+        latest_video_created = 0
+        if video_info["list"].get("vlist"):
+            latest_video_created = video_info["list"]["vlist"][0]["created"]
+        if await BilibiliSub.sub_handle(
+            uid,
+            "up",
+            sub_user,
+            uid=uid,
+            uname=uname,
+            dynamic_upload_time=dynamic_upload_time,
+            latest_video_created=latest_video_created,
+        ):
+            return "已成功订阅UP：\n" f"\tname: {uname}\n" f"\tuid：{uid}"
+        else:
+            return "添加订阅失败..."
    except Exception as e:
        logger.error(f"订阅Up uid：{uid} 发生了错误 {type(e)}：{e}")
    return "添加订阅失败..."
@@ -121,30 +119,29 @@ async def add_season_sub(media_id: int, sub_user: str) -> str:
    :param sub_user: 订阅用户
    """
    try:
-        async with db.transaction():
-            try:
-                """bilibili_api.bangumi库中get_meta改为bilireq.bangumi库的get_meta方法"""
-                season_info = await get_meta(media_id)
-            except ResponseCodeError:
-                return f"未找到media_id：{media_id} 的信息，请检查Id是否正确"
-            season_id = season_info["media"]["season_id"]
-            season_current_episode = season_info["media"]["new_ep"]["index"]
-            season_name = season_info["media"]["title"]
-            if await BilibiliSub.add_bilibili_sub(
-                media_id,
-                "season",
-                sub_user,
-                season_name=season_name,
-                season_id=season_id,
-                season_current_episode=season_current_episode,
-            ):
-                return (
-                    "已成功订阅番剧：\n"
-                    f"\ttitle: {season_name}\n"
-                    f"\tcurrent_episode: {season_current_episode}"
-                )
-            else:
-                return "添加订阅失败..."
+        try:
+            """bilibili_api.bangumi库中get_meta改为bilireq.bangumi库的get_meta方法"""
+            season_info = await get_meta(media_id)
+        except ResponseCodeError:
+            return f"未找到media_id：{media_id} 的信息，请检查Id是否正确"
+        season_id = season_info["media"]["season_id"]
+        season_current_episode = season_info["media"]["new_ep"]["index"]
+        season_name = season_info["media"]["title"]
+        if await BilibiliSub.sub_handle(
+            media_id,
+            "season",
+            sub_user,
+            season_name=season_name,
+            season_id=season_id,
+            season_current_episode=season_current_episode,
+        ):
+            return (
+                "已成功订阅番剧：\n"
+                f"\ttitle: {season_name}\n"
+                f"\tcurrent_episode: {season_current_episode}"
+            )
+        else:
+            return "添加订阅失败..."
    except Exception as e:
        logger.error(f"订阅番剧 media_id：{media_id} 发生了错误 {type(e)}：{e}")
    return "添加订阅失败..."
@@ -171,9 +168,7 @@ async def get_media_id(keyword: str) -> dict:
    for _ in range(3):
        try:
            _season_data = {}
-            response = await AsyncHttpx.get(
-                bilibili_search_url, params=params, timeout=5
-            )
+            response = await AsyncHttpx.get(SEARCH_URL, params=params, timeout=5)
            if response.status_code == 200:
                data = response.json()
                if data.get("data"):
@@ -227,9 +222,9 @@ async def _get_live_status(id_: int) -> Optional[str]:
    room_id = live_info["room_id"]
    live_status = live_info["live_status"]
    cover = live_info["user_cover"]
-    sub = await BilibiliSub.get_sub(id_)
+    sub = await BilibiliSub.get_or_none(sub_id=id_)
    if sub.live_status != live_status:
-        await BilibiliSub.update_sub_info(id_, live_status=live_status)
+        await BilibiliSub.sub_handle(id_, live_status=live_status)
    if sub.live_status in [0, 2] and live_status == 1:
        return (
            f""
@@ -247,7 +242,7 @@ async def _get_up_status(id_: int) -> Optional[str]:
    :param id_: 订阅 id
    :return:
    """
-    _user = await BilibiliSub.get_sub(id_)
+    _user = await BilibiliSub.get_or_none(sub_id=id_)
    """bilibili_api.user库中User类的get_user_info改为bilireq.user库的get_user_info方法"""
    user_info = await get_user_card(_user.uid)
    uname = user_info["name"]
@@ -257,14 +252,14 @@ async def _get_up_status(id_: int) -> Optional[str]:
    video = None
    dividing_line = "\n-------------\n"
    if _user.uname != uname:
-        await BilibiliSub.update_sub_info(id_, uname=uname)
+        await BilibiliSub.sub_handle(id_, uname=uname)
    dynamic_img, dynamic_upload_time, link = await get_user_dynamic(_user.uid, _user)
    if video_info["list"].get("vlist"):
        video = video_info["list"]["vlist"][0]
        latest_video_created = video["created"]
    rst = ""
    if dynamic_img:
-        await BilibiliSub.update_sub_info(id_, dynamic_upload_time=dynamic_upload_time)
+        await BilibiliSub.sub_handle(id_, dynamic_upload_time=dynamic_upload_time)
        rst += f"{uname} 发布了动态！\n" f"{dynamic_img}\n{link}"
    if (
        latest_video_created
@@ -273,9 +268,7 @@ async def _get_up_status(id_: int) -> Optional[str]:
        and _user.latest_video_created < latest_video_created
    ):
        rst = rst + dividing_line if rst else rst
-        await BilibiliSub.update_sub_info(
-            id_, latest_video_created=latest_video_created
-        )
+        await BilibiliSub.sub_handle(id_, latest_video_created=latest_video_created)
        rst += (
            f'{image(video["pic"])}\n'
            f"{uname} 投稿了新视频啦\n"
@@ -295,10 +288,10 @@ async def _get_season_status(id_) -> Optional[str]:
    """bilibili_api.bangumi库中get_meta改为bilireq.bangumi库的get_meta方法"""
    season_info = await get_meta(id_)
    title = season_info["media"]["title"]
-    _idx = (await BilibiliSub.get_sub(id_)).season_current_episode
+    _idx = (await BilibiliSub.get_or_none(sub_id=id_)).season_current_episode
    new_ep = season_info["media"]["new_ep"]["index"]
    if new_ep != _idx:
-        await BilibiliSub.update_sub_info(
+        await BilibiliSub.sub_handle(
            id_, season_current_episode=new_ep, season_update_time=datetime.now()
        )
        return (
@@ -320,55 +313,22 @@ async def get_user_dynamic(
    """
    """bilibili_api.user库中User类的get_dynamics改为bilireq.dynamic库的get_user_dynamics方法"""
    dynamic_info = await dynamic.get_user_dynamics(uid)
-    browser = await get_browser()
-    if dynamic_info.get("cards") and browser:
+    if dynamic_info.get("cards"):
        dynamic_upload_time = dynamic_info["cards"][0]["desc"]["timestamp"]
        dynamic_id = dynamic_info["cards"][0]["desc"]["dynamic_id"]
        if local_user.dynamic_upload_time < dynamic_upload_time:
-            context = await browser.new_context()
-            page = await context.new_page()
-            try:
-                await page.goto(
-                    f"https://t.bilibili.com/{dynamic_id}",
-                    wait_until="networkidle",
-                    timeout=10000,
-                )
-                # await page.set_viewport_size({"width": 2560, "height": 1080, "timeout": 10000*20}) # timeout: 200s
-                # 删除置顶
-                # await page.evaluate(
-                #     """
-                #     xs = document.getElementsByClassName('bili-dyn-item__tag');
-                #     for (x of xs) {
-                #       x.parentNode.parentNode.remove();
-                #     }
-                # """
-                # )
-                # async with page.expect_popup() as popup_info:
-                #     await page.locator(".bili-rich-text__content").click()
-                # details_page = await popup_info.value
-                await page.set_viewport_size(
-                    {"width": 2560, "height": 1080, "timeout": 10000 * 20}
-                )
-                await page.wait_for_selector(".bili-dyn-item__main")
-                card = page.locator(".bili-dyn-item__main")
-                await card.wait_for()
-                await card.screenshot(
-                    path=dynamic_path / f"{local_user.sub_id}_{dynamic_upload_time}.jpg",
-                )
-            except Exception as e:
-                logger.error(f"B站订阅：获取用户动态 发送错误 {type(e)}：{e}")
-            finally:
-                await context.close()
-                await page.close()
-            return (
-                image(
-                    f"{local_user.sub_id}_{dynamic_upload_time}.jpg",
-                    "bilibili_sub/dynamic",
-                ),
-                dynamic_upload_time,
-                f"https://t.bilibili.com/{dynamic_id}"
+            image = await AsyncPlaywright.screenshot(
+                f"https://t.bilibili.com/{dynamic_id}",
+                DYNAMIC_PATH / f"sub_{local_user.sub_id}.png",
+                ".bili-dyn-item__main",
+                wait_until="networkidle",
            )
-    return None, 0, ''
+            return (
+                image,
+                dynamic_upload_time,
+                f"https://t.bilibili.com/{dynamic_id}",
+            )
+    return None, 0, ""


 class SubManager:
@@ -1,43 +1,58 @@
-from services.log import logger
-from services.db_context import db
 from datetime import datetime
-from typing import Optional, List
+from typing import List, Optional, Tuple
+
+from tortoise import fields
+
+from services.db_context import Model
+from services.log import logger


-class BilibiliSub(db.Model):
-    __tablename__ = "bilibili_sub"
+class BilibiliSub(Model):

-    id = db.Column(db.Integer(), primary_key=True)
-    sub_id = db.Column(db.Integer(), nullable=False)
-    sub_type = db.Column(db.String(), nullable=False)
-    # 订阅用户
-    sub_users = db.Column(db.String(), nullable=False)
-    # 直播
-    live_short_id = db.Column(db.Integer())
-    live_status = db.Column(db.Integer)
-    # 主播/UP
-    uid = db.Column(db.BigInteger())
-    uname = db.Column(db.String())
-    latest_video_created = db.Column(db.BigInteger())  # 视频上传时间
-    dynamic_upload_time = db.Column(db.BigInteger(), default=0)  # 动态发布时间
-    # 番剧
-    season_name = db.Column(db.String())
-    season_id = db.Column(db.Integer())
-    season_current_episode = db.Column(db.String())
-    season_update_time = db.Column(db.DateTime())
+    id = fields.IntField(pk=True, generated=True, auto_increment=True)
+    """自增id"""
+    sub_id = fields.IntField()
+    """订阅id"""
+    sub_type = fields.CharField(255)
+    """订阅类型"""
+    sub_users = fields.TextField()
+    """订阅用户"""
+    live_short_id = fields.IntField(null=True)
+    """直播短id"""
+    live_status = fields.IntField(null=True)
+    """直播状态 0: 停播  1: 直播"""
+    uid = fields.BigIntField(null=True)
+    """主播/UP UID"""
+    uname = fields.CharField(255, null=True)
+    """主播/UP 名称"""
+    latest_video_created = fields.BigIntField(null=True)
+    """最后视频上传时间"""
+    dynamic_upload_time = fields.BigIntField(null=True, default=0)
+    """动态发布时间"""
+    season_name = fields.CharField(255, null=True)
+    """番剧名称"""
+    season_id = fields.IntField(null=True)
+    """番剧id"""
+    season_current_episode = fields.CharField(255, null=True)
+    """番剧最新集数"""
+    season_update_time = fields.DateField(null=True)
+    """番剧更新日期"""

-    _idx1 = db.Index("bilibili_sub_idx1", "sub_id", "sub_type", unique=True)
+    class Meta:
+        table = "bilibili_sub"
+        table_description = "B站订阅数据表"
+        unique_together = ("sub_id", "sub_type")

    @classmethod
-    async def add_bilibili_sub(
+    async def sub_handle(
        cls,
        sub_id: int,
-        sub_type: str,
-        sub_user: str,
+        sub_type: Optional[str] = None,
+        sub_user: str = "",
        *,
        live_short_id: Optional[int] = None,
        live_status: Optional[int] = None,
-        dynamic_upload_time: Optional[int] = None,
+        dynamic_upload_time: int = 0,
        uid: Optional[int] = None,
        uname: Optional[str] = None,
        latest_video_created: Optional[int] = None,
@@ -64,50 +79,60 @@ class BilibiliSub(db.Model):
            :param season_current_episode: 番剧最新集数
            :param season_update_time: 番剧更新时间
        """
-        try:
-            query = (
-                await cls.query.where( (cls.sub_id == sub_id) & (cls.sub_type == sub_type) )
-                .with_for_update()
-                .gino.first()
-            )
+        # try:
+        data = {
+            "sub_type": sub_type,
+            "sub_user": sub_user,
+            "live_short_id": live_short_id,
+            "live_status": live_status,
+            "dynamic_upload_time": dynamic_upload_time,
+            "uid": uid,
+            "uname": uname,
+            "latest_video_created": latest_video_created,
+            "season_name": season_name,
+            "season_id": season_id,
+            "season_current_episode": season_current_episode,
+            "season_update_time": season_update_time,
+        }
+        if sub_user:
            sub_user = sub_user if sub_user[-1] == "," else f"{sub_user},"
-            if query:
-                if sub_user not in query.sub_users:
-                    sub_users = query.sub_users + sub_user
-                    await query.update(sub_users=sub_users).apply()
-            else:
-                sub = await cls.create(
-                    sub_id=sub_id, sub_type=sub_type, sub_users=sub_user
-                )
-                await sub.update(
-                    live_short_id=live_short_id
-                    if live_short_id
-                    else sub.live_short_id,
-                    live_status=live_status if live_status else sub.live_status,
-                    dynamic_upload_time=dynamic_upload_time
-                    if dynamic_upload_time
-                    else sub.dynamic_upload_time,
-                    uid=uid if uid else sub.uid,
-                    uname=uname if uname else sub.uname,
-                    latest_video_created=latest_video_created
-                    if latest_video_created
-                    else sub.latest_video_created,
-                    season_update_time=season_update_time
-                    if season_update_time
-                    else sub.season_update_time,
-                    season_current_episode=season_current_episode
-                    if season_current_episode
-                    else sub.season_current_episode,
-                    season_id=season_id if season_id else sub.season_id,
-                    season_name=season_name if season_name else sub.season_name,
-                ).apply()
-            return True
-        except Exception as e:
-            logger.info(f"bilibili_sub 添加订阅错误 {type(e)}: {e}")
-        return False
+        sub = None
+        if sub_type:
+            sub = await cls.get_or_none(sub_id=sub_id, sub_type=sub_type)
+        else:
+            sub = await cls.get_or_none(sub_id=sub_id)
+        if sub:
+            sub_users = sub.sub_users + sub_user
+            data["sub_type"] = sub_type or sub.sub_type
+            data["sub_user"] = sub_users
+            data["live_short_id"] = live_short_id or sub.live_short_id
+            data["live_status"] = (
+                live_status if live_status is not None else sub.live_status
+            )
+            data["dynamic_upload_time"] = dynamic_upload_time or sub.dynamic_upload_time
+            data["uid"] = uid or sub.uid
+            data["uname"] = uname or sub.uname
+            data["latest_video_created"] = (
+                latest_video_created or sub.latest_video_created
+            )
+            data["season_name"] = season_name or sub.season_name
+            data["season_id"] = season_id or sub.season_id
+            data["season_current_episode"] = (
+                season_current_episode or sub.season_current_episode
+            )
+            data["season_update_time"] = season_update_time or sub.season_update_time
+        else:
+            await cls.create(sub_id=sub_id, sub_type=sub_type, sub_users=sub_user)
+        await cls.update_or_create(sub_id=sub_id, defaults=data)
+        return True
+        # except Exception as e:
+        #     logger.info(f"bilibili_sub 添加订阅错误 {type(e)}: {e}")
+        # return False

    @classmethod
-    async def delete_bilibili_sub(cls, sub_id: int, sub_user: str,sub_type: Optional[str] = None) -> bool:
+    async def delete_bilibili_sub(
+        cls, sub_id: int, sub_user: str, sub_type: Optional[str] = None
+    ) -> bool:
        """
        说明:
            删除订阅
@@ -116,129 +141,30 @@ class BilibiliSub(db.Model):
            :param sub_user: 删除此条目的用户
        """
        try:
-            async with db.transaction():
-                if sub_type:
-                    query = (
-                        await cls.query.where(
-                            (cls.sub_id == sub_id) & (cls.sub_users.contains(sub_user) & (cls.sub_type == sub_type))
-                        )
-                        .with_for_update()
-                        .gino.first()
-                    )
-                else:
-                    query = (
-                        await cls.query.where(
-                            (cls.sub_id == sub_id) & (cls.sub_users.contains(sub_user))
-                        )
-                        .with_for_update()
-                        .gino.first()
-                    )
-                if not query:
-                    return False
-                await query.update(
-                    sub_users=query.sub_users.replace(f"{sub_user},", "")
-                ).apply()
-                if not query.sub_users.strip():
-                    await query.delete()
-                return True
+            if sub_type:
+                sub = await cls.filter(
+                    sub_id=sub_id, sub_type=sub_type, sub_users__contains=sub_user
+                ).first()
+            else:
+                sub = await cls.filter(
+                    sub_id=sub_id, sub_users__contains=sub_user
+                ).first()
+            if not sub:
+                return False
+            sub.sub_users = sub.sub_users.replace(f"{sub_user},", "")
+            if sub.sub_users.strip():
+                await sub.save(update_fields=["sub_users"])
+            else:
+                await sub.delete()
+            return True
        except Exception as e:
            logger.info(f"bilibili_sub 删除订阅错误 {type(e)}: {e}")
        return False

-    @classmethod
-    async def get_sub(cls, sub_id: int) -> Optional["BilibiliSub"]:
-        """
-        说明:
-            获取订阅对象
-        参数:
-            :param sub_id: 订阅 id
-        """
-        return await cls.query.where(cls.sub_id == sub_id).gino.first()
-
-    @classmethod
-    async def get_sub_data(cls, id_: str) -> List["BilibiliSub"]:
-        """
-        获取 id_ 订阅的所有内容
-        :param id_: id
-        """
-        query = cls.query.where(cls.sub_users.contains(id_))
-        return await query.gino.all()
-
-    @classmethod
-    async def update_sub_info(
-        cls,
-        sub_id: int,
-        *,
-        live_short_id: Optional[int] = None,
-        live_status: Optional[int] = None,
-        dynamic_upload_time: Optional[int] = None,
-        uid: Optional[int] = None,
-        uname: Optional[str] = None,
-        latest_video_created: Optional[int] = None,
-        season_name: Optional[str] = None,
-        season_id: Optional[int] = None,
-        season_current_episode: Optional[str] = None,
-        season_update_time: Optional[datetime] = None,
-    ) -> bool:
-        """
-        说明:
-            更新订阅信息
-        参数:
-            :param sub_id: 订阅名称，房间号，番剧号等
-            :param live_short_id: 直接短 id
-            :param live_status: 主播开播状态
-            :param dynamic_upload_time: 主播/UP最新动态时间
-            :param uid: 主播/UP uid
-            :param uname: 用户名称
-            :param latest_video_created: 最新视频上传时间
-            :param season_name: 番剧名称
-            :param season_id: 番剧 season_id
-            :param season_current_episode: 番剧最新集数
-            :param season_update_time: 番剧更新时间
-        """
-        try:
-            async with db.transaction():
-                sub = (
-                    await cls.query.where(cls.sub_id == sub_id)
-                    .with_for_update()
-                    .gino.first()
-                )
-                if sub:
-                    await sub.update(
-                        live_short_id=live_short_id
-                        if live_short_id is not None
-                        else sub.live_short_id,
-                        live_status=live_status
-                        if live_status is not None
-                        else sub.live_status,
-                        dynamic_upload_time=dynamic_upload_time
-                        if dynamic_upload_time is not None
-                        else sub.dynamic_upload_time,
-                        uid=uid if uid is not None else sub.uid,
-                        uname=uname if uname is not None else sub.uname,
-                        latest_video_created=latest_video_created
-                        if latest_video_created is not None
-                        else sub.latest_video_created,
-                        season_update_time=season_update_time
-                        if season_update_time is not None
-                        else sub.season_update_time,
-                        season_current_episode=season_current_episode
-                        if season_current_episode is not None
-                        else sub.season_current_episode,
-                        season_id=season_id if season_id is not None else sub.season_id,
-                        season_name=season_name
-                        if season_name is not None
-                        else sub.season_name,
-                    ).apply()
-                    return True
-        except Exception as e:
-            logger.info(f"bilibili_sub 更新订阅错误 {type(e)}: {e}")
-        return False
-
    @classmethod
    async def get_all_sub_data(
        cls,
-    ) -> "List[BilibiliSub], List[BilibiliSub], List[BilibiliSub]":
+    ) -> Tuple[List["BilibiliSub"], List["BilibiliSub"], List["BilibiliSub"]]:
        """
        说明:
            分类获取所有数据
@@ -246,7 +172,7 @@ class BilibiliSub(db.Model):
        live_data = []
        up_data = []
        season_data = []
-        query = await cls.query.gino.all()
+        query = await cls.all()
        for x in query:
            if x.sub_type == "live":
                live_data.append(x)