fix 自定义订阅 Api

app/api/apiv1.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter
 
 from app.api.endpoints import login, user, site, message, webhook, subscribe, \
-    media, douban, search, plugin, tmdb, history, system, download, dashboard
+    media, douban, search, plugin, tmdb, history, system, download, dashboard, rss
 
 api_router = APIRouter()
 api_router.include_router(login.router, prefix="/login", tags=["login"])
@@ -19,3 +19,4 @@ api_router.include_router(system.router, prefix="/system", tags=["system"])
 api_router.include_router(plugin.router, prefix="/plugin", tags=["plugin"])
 api_router.include_router(download.router, prefix="/download", tags=["download"])
 api_router.include_router(dashboard.router, prefix="/dashboard", tags=["dashboard"])
+api_router.include_router(rss.router, prefix="/rss", tags=["rss"])

app/api/endpoints/rss.py

@@ -4,9 +4,11 @@ from fastapi import APIRouter, Depends
 from sqlalchemy.orm import Session
 
 from app import schemas
+from app.chain.rss import RssChain
 from app.core.security import verify_token
 from app.db import get_db
 from app.db.models.rss import Rss
+from app.schemas import MediaType
 
 router = APIRouter()
 
@@ -24,19 +26,25 @@ def read_rsses(
 @router.post("/", summary="新增自定义订阅", response_model=schemas.Response)
 def create_rss(
         *,
-        db: Session = Depends(get_db),
         rss_in: schemas.Rss,
         _: schemas.TokenPayload = Depends(verify_token)
 ) -> Any:
     """
     新增自定义订阅
     """
-    rss = Rss.get_by_tmdbid(db, tmdbid=rss_in.tmdbid, season=rss_in.season)
-    if rss:
-        return schemas.Response(success=False, message="自定义订阅已存在")
-    rss = Rss(**rss_in.dict())
-    rss.create(db)
-    return schemas.Response(success=True)
+    if rss_in.type:
+        mtype = MediaType(rss_in.type)
+    else:
+        mtype = None
+    rssid, errormsg = RssChain().add(
+        mtype=mtype,
+        **rss_in.dict()
+    )
+    if not rssid:
+        return schemas.Response(success=False, message=errormsg)
+    return schemas.Response(success=True, data={
+        "id": rssid
+    })
 
 
 @router.put("/", summary="更新自定义订阅", response_model=schemas.Response)
@@ -57,7 +65,7 @@ def update_rss(
     return schemas.Response(success=True)
 
 
-@router.get("/{rssid}", summary="查询订阅详情", response_model=schemas.Rss)
+@router.get("/{rssid}", summary="查询自定义订阅详情", response_model=schemas.Rss)
 def read_rss(
         rssid: int,
         db: Session = Depends(get_db),
@@ -66,3 +74,15 @@ def read_rss(
     根据ID查询自定义订阅详情
     """
     return Rss.get(db, rssid)
+
+
+@router.delete("/{rssid}", summary="删除自定义订阅", response_model=schemas.Response)
+def read_rss(
+        rssid: int,
+        db: Session = Depends(get_db),
+        _: schemas.TokenPayload = Depends(verify_token)) -> Any:
+    """
+    根据ID删除自定义订阅
+    """
+    Rss.delete(db, rssid)
+    return schemas.Response(success=True)

app/api/endpoints/site.py

@@ -14,6 +14,7 @@ from app.db.models.site import Site
 from app.db.models.siteicon import SiteIcon
 from app.db.systemconfig_oper import SystemConfigOper
 from app.schemas.types import SystemConfigKey
+from app.utils.string import StringUtils
 
 router = APIRouter()
 
@@ -167,6 +168,25 @@ def site_resource(site_id: int, keyword: str = None,
     return [torrent.to_dict() for torrent in torrents]
 
 
+@router.get("/domain/{site_url}", summary="站点详情", response_model=schemas.Site)
+def read_site_by_domain(
+        site_url: str,
+        db: Session = Depends(get_db),
+        _: schemas.TokenPayload = Depends(verify_token)
+) -> Any:
+    """
+    通过域名获取站点信息
+    """
+    domain = StringUtils.get_url_domain(site_url)
+    site = Site.get_by_domain(db, domain)
+    if not site:
+        raise HTTPException(
+            status_code=404,
+            detail=f"站点 {domain} 不存在",
+        )
+    return site
+
+
 @router.get("/{site_id}", summary="站点详情", response_model=schemas.Site)
 def read_site(
         site_id: int,
@@ -174,7 +194,7 @@ def read_site(
         _: schemas.TokenPayload = Depends(verify_token)
 ) -> Any:
     """
-    获取站点信息
+    通过ID获取站点信息
     """
     site = Site.get(db, site_id)
     if not site: