Merge branch '3.1-dev' into self-rss

# Conflicts:
#	.gitignore
#	backend/src/module/database/bangumi.py
#	backend/src/module/database/orm/update.py
#	backend/src/module/models/__init__.py
#	backend/src/module/rss/poller.py

backend/src/module/models/__init__.py

@@ -1,5 +1,5 @@
-from .bangumi import BangumiData
+from .bangumi import Bangumi, Episode
 from .config import Config
-from .rss import RSSItem, TorrentData
+from .rss import RSSTorrents
 from .torrent import EpisodeFile, SubtitleFile, TorrentBase
 from .user import UserLogin

backend/src/module/models/bangumi.py

@@ -1,27 +1,50 @@
 from dataclasses import dataclass
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
+from sqlmodel import SQLModel, Field
+from typing import Optional
 
 
-class BangumiData(BaseModel):
-    id: int = Field(0, alias="id", title="番剧ID")
-    official_title: str = Field("official_title", alias="official_title", title="番剧中文名")
-    year: str | None = Field(None, alias="year", title="番剧年份")
-    title_raw: str = Field("title_raw", alias="title_raw", title="番剧原名")
-    season: int = Field(1, alias="season", title="番剧季度")
-    season_raw: str | None = Field(None, alias="season_raw", title="番剧季度原名")
-    group_name: str | None = Field(None, alias="group_name", title="字幕组")
-    dpi: str | None = Field(None, alias="dpi", title="分辨率")
-    source: str | None = Field(None, alias="source", title="来源")
-    subtitle: str | None = Field(None, alias="subtitle", title="字幕")
-    eps_collect: bool = Field(False, alias="eps_collect", title="是否已收集")
-    offset: int = Field(0, alias="offset", title="番剧偏移量")
-    filter: list[str] = Field(["720", "\\d+-\\d+"], alias="filter", title="番剧过滤器")
-    rss_link: list[str] = Field([], alias="rss_link", title="番剧RSS链接")
-    poster_link: str | None = Field(None, alias="poster_link", title="番剧海报链接")
-    added: bool = Field(False, alias="added", title="是否已添加")
-    rule_name: str | None = Field(None, alias="rule_name", title="番剧规则名")
-    save_path: str | None = Field(None, alias="save_path", title="番剧保存路径")
+class Bangumi(SQLModel, table=True):
+    id: int = Field(default=None, primary_key=True)
+    official_title: str = Field(
+        default="official_title", alias="official_title", title="番剧中文名"
+    )
+    year: Optional[str] = Field(alias="year", title="番剧年份")
+    title_raw: str = Field(default="title_raw", alias="title_raw", title="番剧原名")
+    season: int = Field(default=1, alias="season", title="番剧季度")
+    season_raw: Optional[str] = Field(alias="season_raw", title="番剧季度原名")
+    group_name: Optional[str] = Field(alias="group_name", title="字幕组")
+    dpi: Optional[str] = Field(alias="dpi", title="分辨率")
+    source: Optional[str] = Field(alias="source", title="来源")
+    subtitle: Optional[str] = Field(alias="subtitle", title="字幕")
+    eps_collect: bool = Field(default=False, alias="eps_collect", title="是否已收集")
+    offset: int = Field(default=0, alias="offset", title="番剧偏移量")
+    filter: str = Field(default="720, \\d+-\\d+", alias="filter", title="番剧过滤器")
+    rss_link: str = Field(default="", alias="rss_link", title="番剧RSS链接")
+    poster_link: Optional[str] = Field(alias="poster_link", title="番剧海报链接")
+    added: bool = Field(default=False, alias="added", title="是否已添加")
+    rule_name: Optional[str] = Field(alias="rule_name", title="番剧规则名")
+    save_path: Optional[str] = Field(alias="save_path", title="番剧保存路径")
+    deleted: bool = Field(False, alias="deleted", title="是否已删除")
+
+
+class BangumiUpdate(SQLModel):
+    official_title: str = Field(
+        default="official_title", alias="official_title", title="番剧中文名"
+    )
+    year: Optional[str] = Field(alias="year", title="番剧年份")
+    season: int = Field(default=1, alias="season", title="番剧季度")
+    season_raw: Optional[str] = Field(alias="season_raw", title="番剧季度原名")
+    group_name: Optional[str] = Field(alias="group_name", title="字幕组")
+    dpi: Optional[str] = Field(alias="dpi", title="分辨率")
+    source: Optional[str] = Field(alias="source", title="来源")
+    subtitle: Optional[str] = Field(alias="subtitle", title="字幕")
+    eps_collect: bool = Field(default=False, alias="eps_collect", title="是否已收集")
+    offset: int = Field(default=0, alias="offset", title="番剧偏移量")
+    filter: str = Field(default="720, \\d+-\\d+", alias="filter", title="番剧过滤器")
+    rss_link: str = Field(default="", alias="rss_link", title="番剧RSS链接")
+    added: bool = Field(default=False, alias="added", title="是否已添加")
     deleted: bool = Field(False, alias="deleted", title="是否已删除")
 
 
@@ -29,14 +52,14 @@ class Notification(BaseModel):
     official_title: str = Field(..., alias="official_title", title="番剧名")
     season: int = Field(..., alias="season", title="番剧季度")
     episode: int = Field(..., alias="episode", title="番剧集数")
-    poster_path: str | None = Field(None, alias="poster_path", title="番剧海报路径")
+    poster_path: Optional[str] = Field(None, alias="poster_path", title="番剧海报路径")
 
 
 @dataclass
 class Episode:
-    title_en: str | None
-    title_zh: str | None
-    title_jp: str | None
+    title_en: Optional[str]
+    title_zh: Optional[str]
+    title_jp: Optional[str]
     season: int
     season_raw: str
     episode: int

backend/src/module/models/config.py

@@ -1,3 +1,4 @@
+from os.path import expandvars
 from pydantic import BaseModel, Field
 
 # Sub config
@@ -12,21 +13,35 @@ class Program(BaseModel):
 class Downloader(BaseModel):
     type: str = Field("qbittorrent", description="Downloader type")
     host: str = Field("172.17.0.1:8080", description="Downloader host")
-    username: str = Field("admin", description="Downloader username")
-    password: str = Field("adminadmin", description="Downloader password")
+    username_: str = Field("admin", alias="username", description="Downloader username")
+    password_: str = Field(
+        "adminadmin", alias="password", description="Downloader password"
+    )
     path: str = Field("/downloads/Bangumi", description="Downloader path")
     ssl: bool = Field(False, description="Downloader ssl")
 
+    @property
+    def username(self):
+        return expandvars(self.username_)
+
+    @property
+    def password(self):
+        return expandvars(self.password_)
+
 
 class RSSParser(BaseModel):
     enable: bool = Field(True, description="Enable RSS parser")
     type: str = Field("mikan", description="RSS parser type")
-    token: str = Field("token", description="RSS parser token")
+    token_: str = Field("token", alias="token", description="RSS parser token")
     custom_url: str = Field("mikanani.me", description="Custom RSS host url")
     parser_type: str = Field("parser", description="Parser type")
     filter: list[str] = Field(["720", r"\d+-\d"], description="Filter")
     language: str = "zh"
 
+    @property
+    def token(self):
+        return expandvars(self.token_)
+
 
 class BangumiManage(BaseModel):
     enable: bool = Field(True, description="Enable bangumi manage")
@@ -45,15 +60,31 @@ class Proxy(BaseModel):
     type: str = Field("http", description="Proxy type")
     host: str = Field("", description="Proxy host")
     port: int = Field(0, description="Proxy port")
-    username: str = Field("", description="Proxy username")
-    password: str = Field("", description="Proxy password")
+    username_: str = Field("", alias="username", description="Proxy username")
+    password_: str = Field("", alias="password", description="Proxy password")
+
+    @property
+    def username(self):
+        return expandvars(self.username_)
+
+    @property
+    def password(self):
+        return expandvars(self.password_)
 
 
 class Notification(BaseModel):
     enable: bool = Field(False, description="Enable notification")
     type: str = Field("telegram", description="Notification type")
-    token: str = Field("", description="Notification token")
-    chat_id: str = Field("", description="Notification chat id")
+    token_: str = Field("", alias="token", description="Notification token")
+    chat_id_: str = Field("", alias="chat_id", description="Notification chat id")
+
+    @property
+    def token(self):
+        return expandvars(self.token_)
+
+    @property
+    def chat_id(self):
+        return expandvars(self.chat_id_)
 
 
 class Config(BaseModel):
@@ -64,3 +95,6 @@ class Config(BaseModel):
     log: Log = Log()
     proxy: Proxy = Proxy()
     notification: Notification = Notification()
+
+    def dict(self, *args, by_alias=True, **kwargs):
+        return super().dict(*args, by_alias=by_alias, **kwargs)

backend/src/module/models/user.py

@@ -1,14 +1,24 @@
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
+from typing import Optional
+from sqlmodel import SQLModel, Field
 
 
-class User(BaseModel):
+class User(SQLModel, table=True):
+    id: int = Field(default=None, primary_key=True)
     username: str = Field(
         "admin", min_length=4, max_length=20, regex=r"^[a-zA-Z0-9_]+$"
     )
     password: str = Field("adminadmin", min_length=8)
 
 
-class UserLogin(BaseModel):
+class UserUpdate(SQLModel):
+    username: Optional[str] = Field(
+        None, min_length=4, max_length=20, regex=r"^[a-zA-Z0-9_]+$"
+    )
+    password: Optional[str] = Field(None, min_length=8)
+
+
+class UserLogin(SQLModel):
     username: str
     password: str = Field(..., min_length=8)