From 0c2b1b1c3ba0fa13b245e31b8e87679b7f8b56ac Mon Sep 17 00:00:00 2001 From: 2huo Date: Sun, 14 Jan 2024 21:37:01 +0800 Subject: [PATCH 1/3] fix: incorrect password format --- backend/src/module/database/user.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backend/src/module/database/user.py b/backend/src/module/database/user.py index dc01a9b0..336f81f4 100644 --- a/backend/src/module/database/user.py +++ b/backend/src/module/database/user.py @@ -24,6 +24,10 @@ class UserDatabase: def auth_user(self, user: User): statement = select(User).where(User.username == user.username) result = self.session.exec(statement).first() + if not user.password: + return ResponseModel( + status_code=401, status=False, msg_en="Incorrect password format", msg_zh="密码格式不正确" + ) if not result: return ResponseModel( status_code=401, status=False, msg_en="User not found", msg_zh="用户不存在" From 2149182a541b5672a55aaefde101d72a51928a0e Mon Sep 17 00:00:00 2001 From: KotaHv <92137267+KotaHv@users.noreply.github.com> Date: Wed, 24 Jan 2024 21:09:25 +0800 Subject: [PATCH 2/3] fix: rss.parser set to default value when subscribe Bangumi --- backend/src/module/api/rss.py | 4 ++-- backend/src/module/manager/collector.py | 7 +++++-- webui/src/api/download.ts | 8 ++++++-- webui/src/components/ab-add-rss.vue | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/backend/src/module/api/rss.py b/backend/src/module/api/rss.py index d2de16fe..48a17aef 100644 --- a/backend/src/module/api/rss.py +++ b/backend/src/module/api/rss.py @@ -194,7 +194,7 @@ async def download_collection(data: Bangumi): @router.post( "/subscribe", response_model=APIResponse, dependencies=[Depends(get_current_user)] ) -async def subscribe(data: Bangumi): +async def subscribe(data: Bangumi, rss: RSSItem): with SeasonCollector() as collector: - resp = collector.subscribe_season(data) + resp = collector.subscribe_season(data, parser=rss.parser) return u_response(resp) diff --git a/backend/src/module/manager/collector.py b/backend/src/module/manager/collector.py index 282db739..ee14fb41 100644 --- a/backend/src/module/manager/collector.py +++ b/backend/src/module/manager/collector.py @@ -46,12 +46,15 @@ class SeasonCollector(DownloadClient): ) @staticmethod - def subscribe_season(data: Bangumi): + def subscribe_season(data: Bangumi, parser: str = "mikan"): with RSSEngine() as engine: data.added = True data.eps_collect = True engine.add_rss( - rss_link=data.rss_link, name=data.official_title, aggregate=False + rss_link=data.rss_link, + name=data.official_title, + aggregate=False, + parser=parser, ) result = engine.download_bangumi(data) engine.bangumi.add(data) diff --git a/webui/src/api/download.ts b/webui/src/api/download.ts index 909ed0d2..bbf86a82 100644 --- a/webui/src/api/download.ts +++ b/webui/src/api/download.ts @@ -42,12 +42,16 @@ export const apiDownload = { * 新番 * @param bangumiData - Bangumi 数据 */ - async subscribe(bangumiData: BangumiRule) { - const postData: BangumiAPI = { + async subscribe(bangumiData: BangumiRule, rss: RSS) { + const bangumi: BangumiAPI = { ...bangumiData, filter: bangumiData.filter.join(','), rss_link: bangumiData.rss_link.join(','), }; + const postData = { + data: bangumi, + rss, + }; const { data } = await axios.post( 'api/v1/rss/subscribe', postData diff --git a/webui/src/components/ab-add-rss.vue b/webui/src/components/ab-add-rss.vue index ee3b0d37..33003814 100644 --- a/webui/src/components/ab-add-rss.vue +++ b/webui/src/components/ab-add-rss.vue @@ -96,7 +96,7 @@ async function subscribe() { if (rule.value) { try { loading.subscribe = true; - const res = await apiDownload.subscribe(rule.value); + const res = await apiDownload.subscribe(rule.value, rss.value); loading.subscribe = false; if (res) { message.success('Subscribe Success!'); From 690335c4ef9c44ed4b013579792e6a4ebd0889b3 Mon Sep 17 00:00:00 2001 From: KotaHv <92137267+KotaHv@users.noreply.github.com> Date: Thu, 1 Feb 2024 10:33:19 +0800 Subject: [PATCH 3/3] fix: Resolve issue #679 --- backend/src/module/parser/analyser/raw_parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/module/parser/analyser/raw_parser.py b/backend/src/module/parser/analyser/raw_parser.py index 3f28197b..0c8e036f 100644 --- a/backend/src/module/parser/analyser/raw_parser.py +++ b/backend/src/module/parser/analyser/raw_parser.py @@ -131,7 +131,7 @@ def clean_sub(sub: str | None) -> str | None: def process(raw_title: str): - raw_title = raw_title.strip() + raw_title = raw_title.strip().replace("\n", "") content_title = pre_process(raw_title) # 预处理标题 group = get_group(content_title)