Merge pull request #100 from shinonomeow/shino_aio

feat: add torrent management and notification testing

Author: shinonomeow

backend/src/module/api/__init__.py

@@ -8,6 +8,7 @@
 from .program import router as program_router
 from .rss import router as rss_router
 from .search import router as search_router
+from .torrent import router as torrent_router
 
 __all__ = ["v1","lifespan"]
 
@@ -20,3 +21,4 @@
 v1.include_router(config_router)
 v1.include_router(rss_router)
 v1.include_router(search_router)
+v1.include_router(torrent_router)

backend/src/module/api/bangumi.py

@@ -6,7 +6,7 @@
 
 from module.database import Database, engine
 from module.manager import BangumiManager
-from module.models import APIResponse, Bangumi, BangumiUpdate, ResponseModel
+from module.models import APIResponse, Bangumi, BangumiUpdate, ResponseModel,Torrent
 from module.security.api import get_current_user
 
 from .response import u_response
@@ -217,12 +217,37 @@ async def refresh_single_poster(bangumi_id: int):
 async def reset_all():
     with Database(engine) as db:
         db.bangumi.delete_all()
-        return JSONResponse(
-            status_code=200,
-            content={
-                "msg_en": "Reset all rules successfully.",
-                "msg_zh": "重置所有规则成功。",
-            },
-        )
+    return JSONResponse(
+        status_code=200,
+        content={
+            "msg_en": "Reset all rules successfully.",
+            "msg_zh": "重置所有规则成功。",
+        },
+    )
+
+
+# @router.get("/get_torrent", response_model=list[Torrent], dependencies=[Depends(get_current_user)])
+# async def manage_bangumi(_id:int):
+#     """
+#     管理对应 Bangumi 的规则
+#     """
+#     try:
+#         resp = await BangumiManager().fetch_all_bangumi_torrents(_id)
+#         return resp
+#     except Exception as e:
+#         logger.error(f"[Bangumi] Error managing bangumi: {e}")
+#         return []
+#
+# @router.get("/download_torrent", response_model=APIResponse, dependencies=[Depends(get_current_user)])
+# async def download_bangumi(_id:int, torrent:Torrent):
+#     """
+#     手动下载对应 Bangumi 的种子
+#     """
+#     try:
+#         resp = BangumiManager().download_torrent(_id,torrent)
+#         return resp
+#     except Exception as e:
+#         logger.error(f"[Bangumi] Error downloading bangumi: {e}")
+#         return []
 
 

backend/src/module/api/config.py

@@ -5,6 +5,7 @@
 
 from module.conf import settings
 from module.models import APIResponse, Config
+from module.models.config import Notification
 from module.security.api import get_current_user
 
 router = APIRouter(prefix="/config", tags=["config"])
@@ -15,13 +16,43 @@
 async def get_config():
     return settings
 
+# 测试通知的是否生效
+@router.post("/test_notify", response_model=APIResponse, dependencies=[Depends(get_current_user)])
+async def test_notify(config: Notification):
+    try:
+        from module.notification.notification import PostNotification
+        from module.models import Message
+        print(config)
+
+        title = "AB通知测试"
+        link = "https://mikanani.me/images/Bangumi/202507/8a6beaff.jpg"
+        nt = Message(title=title, season="1", episode="1", poster_path=link)
+        sender = PostNotification()
+        sender.initialize(config)
+        await sender.send(nt)
+
+        logger.info("Notification test completed")
+        return JSONResponse(
+            status_code=200,
+            content={
+                "msg_en": "Test notification sent successfully.",
+                "msg_zh": "测试通知发送成功。",
+            },
+        )
+    except Exception as e:
+        logger.warning(e)
+        return JSONResponse(
+            status_code=406,
+            content={"msg_en": "Test notification failed.", "msg_zh": "测试通知失败。"},
+        )
+
 
 @router.patch(
     "/update", response_model=APIResponse, dependencies=[Depends(get_current_user)]
 )
 async def update_config(config: Config):
     try:
-        settings.save(config_dict=config.dict())
+        settings.save(config_dict=config.model_dump())
         settings.load()
         # update_rss()
         logger.info("Config updated")

backend/src/module/api/torrent.py

@@ -0,0 +1,127 @@
+import logging
+
+from fastapi import APIRouter, Depends, HTTPException
+from fastapi.responses import JSONResponse
+from sqlalchemy.util.concurrency import asyncio
+
+from module.database import Database, engine
+from module.manager import BangumiManager, TorrentManager
+from module.models import APIResponse, Bangumi, BangumiUpdate, ResponseModel, Torrent
+from module.security.api import get_current_user
+
+from .response import u_response
+
+router = APIRouter(prefix="/torrent", tags=["torrent"])
+logger = logging.getLogger(__name__)
+
+
+@router.get(
+    "/get_all",
+    response_model=list[Torrent],
+    dependencies=[Depends(get_current_user)],
+)
+async def manage_bangumi(_id: int):
+    """
+    管理对应 Bangumi 的规则
+    """
+    try:
+        resp = await TorrentManager().fetch_all_bangumi_torrents(_id)
+        return resp
+    except Exception as e:
+        logger.error(f"[Bangumi] Error managing bangumi: {e}")
+        return []
+
+
+@router.post(
+    "/delete",
+    response_model=APIResponse,
+    dependencies=[Depends(get_current_user)],
+)
+async def delete_torrent(url: str):
+    """
+    删除对应的种子
+    """
+    try:
+        resp = await TorrentManager().delete_torrent(url)
+        if resp:
+            resp = ResponseModel(
+                status_code=200,
+                status=True,
+                msg_en=f"Delete torrent for {url}",
+                msg_zh=f"删除 {url} 的种子",
+            )
+        else:
+            resp = ResponseModel(
+                status_code=406,
+                status=False,
+                msg_en=f"Can't find torrent with url {url}",
+                msg_zh=f"无法找到 url 为 {url} 的种子",
+            )
+        return resp
+    except Exception as e:
+        logger.error(f"[Bangumi] Error deleting torrent: {e}")
+        return ResponseModel(
+            status_code=500,
+            status=False,
+            msg_en="Internal server error",
+            msg_zh="服务器内部错误",
+        )
+
+
+@router.post("/disable",response_model=APIResponse,dependencies=[Depends(get_current_user)])
+async def disable_torrent(url:str,name,_id:int):
+    """
+    禁用对应的种子
+    """
+    try:
+        await TorrentManager().disable_torrent(url,name, _id)
+        return ResponseModel(
+            status_code=200,
+            status=True,
+            msg_en=f"Successfully disabled torrent with url {url}",
+            msg_zh=f"成功禁用 url 为 {url} 的种子",
+        )
+    except Exception as e:
+        logger.error(f"[Bangumi] Error disabling torrent: {e}")
+        return ResponseModel(
+            status_code=500,
+            status=False,
+            msg_en="Internal server error",
+            msg_zh="服务器内部错误",
+        )
+
+
+@router.post(
+    "/download",
+    response_model=APIResponse,
+    dependencies=[Depends(get_current_user)],
+)
+async def download_bangumi(_id: int, torrent: Torrent):
+    """
+    手动下载对应 Bangumi 的种子
+    """
+    try:
+        resp = TorrentManager().download_torrent(_id, torrent)
+        if resp:
+            resp = ResponseModel(
+                status_code=200,
+                status=True,
+                msg_en=f"Download torrent for {_id}",
+                msg_zh=f"下载 {_id} 的种子",
+            )
+        else:
+            resp = ResponseModel(
+                status_code=406,
+                status=False,
+                msg_en=f"Can't find id {_id}",
+                msg_zh=f"无法找到 id {_id}",
+            )
+        return resp
+    except Exception as e:
+        logger.error(f"[Bangumi] Error downloading bangumi: {e}")
+        return ResponseModel(
+            status_code=500,
+            status=False,
+            msg_en="Internal server error",
+            msg_zh="服务器内部错误",
+        )

backend/src/module/database/combine.py

@@ -1,6 +1,6 @@
 import logging
 
-from sqlmodel import Session, SQLModel, and_, delete, false, or_, select, text
+from sqlmodel import Session, SQLModel, and_, false, select, text
 
 from module.models import Bangumi, RSSItem, Torrent, User
 

backend/src/module/database/migration.py

@@ -408,6 +408,11 @@ def check_and_upgrade_database() -> bool:
 
         logger.info(f"数据库版本: {db_version}, 应用版本: {app_version}")
 
+        # 对 dev 版本进行特殊处理
+        if app_version == "DEV_VERSION":
+            logger.info("当前应用版本为开发版本，跳过数据库升级")
+            return True
+
         # 先检查应用版本是否大于数据库版本，如果不是则什么都不做
         version_comparison = migration._version_compare(app_version, db_version)
         if version_comparison <= 0:

backend/src/module/database/torrent.py

@@ -119,6 +119,7 @@ def delete_by_url(self, url: str) -> bool:
             )
             self.session.commit()
             return True
+        return False
 
     def delete_by_duid(self, duid: str) -> bool:
         stmt = select(Torrent).where(Torrent.download_uid == duid)

backend/src/module/downloader/download_client.py

@@ -249,7 +249,6 @@ async def move_torrent(self, hashes: list[str] | str, location: str) -> bool:
         if not await self.wait_for_login():
             return False  # 登录失败时返回False
         try:
-            #TODO: 好像是用 | 连起来就行,但现在好像用不上了
             result = await self.downloader.move(hashes=hashes, new_location=location)
             if result:
                 logger.info(f"[Downloader] Move torrents {hashes} to {location}")

backend/src/module/manager/bangumi.py

@@ -4,8 +4,10 @@
 from module.conf import settings
 from module.database import Database, engine
 from module.downloader import Client as DownlondClient
+from module.downloader import download_queue
 from module.manager.torrent import TorrentManager
 from module.models import Bangumi, BangumiUpdate, Torrent
+from module.network import RequestContent
 from module.parser import MikanParser, TmdbParser
 from module.utils import gen_save_path
 from module.utils.events import Event, EventType, event_bus
@@ -158,6 +160,10 @@ def search_one(self, _id: int | str):
                 return data
 
 
+
+
+
 if __name__ == "__main__":
     manager = TorrentManager()
-    asyncio.run(manager.refresh_poster())
+    manager = BangumiManager()
+    asyncio.run(manager.fetch_all_bangumi_torrents(1))

backend/src/module/manager/renamer.py

@@ -4,7 +4,7 @@
 from module.conf import settings
 from module.database import Database
 from module.downloader import Client as download_client
-from module.models import EpisodeFile, Notification, SubtitleFile
+from module.models import EpisodeFile, Message, SubtitleFile
 from module.models.bangumi import Bangumi
 from module.models.torrent import Torrent
 from module.parser import TitleParser, TmdbParser
@@ -173,17 +173,17 @@ async def rename_file(
         logger.debug(f"[Renamer] {ep=} ")
         if result and file_type == "media":
             # 重命名成功, 发送通知
-            notify_info = Notification(
+            notify_info = Message(
                 title=bangumi_name,
-                season=season,
-                episode=ep.episode,
+                season=str(season),
+                episode=str(ep.episode),
                 poster_path=bangumi.poster_link if bangumi else "",
             )
             await self._publish_notification_request(notify_info)
 
         return result
 
-    async def _publish_notification_request(self, notify_info: Notification) -> None:
+    async def _publish_notification_request(self, notify_info: Message) -> None:
         """发布下载开始事件
 
         Args:
@@ -248,6 +248,8 @@ async def rename_torrent(self, torrent: Torrent, bangumi: Bangumi | None = None)
             return
         if bangumi is None:
             with Database() as db:
+                #NOTE: 这里会更新一下 season 和 official_title
+                # 可能是因为更新了番剧信息导致的
                 bangumi = db.torrent_to_bangumi(torrent)
                 if not bangumi:
                     bangumi = Bangumi(