From 4b4865ff206bbb31c53baf257c1464e05aa00df9 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sat, 20 May 2023 23:24:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Rename=20=E4=BD=BF=E7=94=A8=E9=9D=9E?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E7=9A=84=E6=A8=A1=E5=BC=8F=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E4=BA=A7=E7=94=9F=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pull-request.yml | 2 +- docs/changelog/3.0.md | 5 +++-- src/module/manager/renamer.py | 5 ++++- src/module/rss/__init__.py | 2 +- src/module/rss/{rss_analyser.py => analyser.py} | 0 5 files changed, 9 insertions(+), 5 deletions(-) rename src/module/rss/{rss_analyser.py => analyser.py} (100%) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 224374e3..afc1b051 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -15,7 +15,7 @@ jobs: - name: Generate pull request body id: pr run: | - echo "::set-output name=body::$(git log --format='* %s' $(git describe --tags --abbrev=0)..HEAD)" + echo "docs/changelog/${{ github.ref }}.md" - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: diff --git a/docs/changelog/3.0.md b/docs/changelog/3.0.md index 033a3d53..f1c29d83 100644 --- a/docs/changelog/3.0.md +++ b/docs/changelog/3.0.md @@ -22,8 +22,8 @@ ### 通知模块 -- 新增 `Bark` 通知模块,可以使用 `Bark` 推送通知到手机。 -- 全新的通知方式,现在可以推送海报,番剧名称,更新集数。 +- 新增 `Bark` 通知模块. +- 全新的通知方式,现在可以给 Telegram 推送海报,番剧名称,更新集数。 ### 数据迁移 @@ -42,4 +42,5 @@ - 加速启动关闭时间 - 重构解析器模块 - 重构重命名模块 + - 暂时移除 `normal` 模式 - 增加 `ghcr.io` 镜像 \ No newline at end of file diff --git a/src/module/manager/renamer.py b/src/module/manager/renamer.py index a807488e..44aaa7e4 100644 --- a/src/module/manager/renamer.py +++ b/src/module/manager/renamer.py @@ -33,7 +33,7 @@ class Renamer(DownloadClient): episode = ( f"0{file_info.episode}" if file_info.episode < 10 else file_info.episode ) - if method == "None": + if method == "none" or method == "subtitle_none": return file_info.media_path elif method == "pn": return f"{file_info.title} S{season}E{episode}{file_info.suffix}" @@ -43,6 +43,9 @@ class Renamer(DownloadClient): return f"{file_info.title} S{season}E{episode}.{file_info.language}{file_info.suffix}" elif method == "subtitle_advance": return f"{bangumi_name} S{season}E{episode}.{file_info.language}{file_info.suffix}" + else: + logger.error(f"Unknown rename method: {method}") + return file_info.media_path @staticmethod def send_notification(bangumi_name, ep: EpisodeFile): diff --git a/src/module/rss/__init__.py b/src/module/rss/__init__.py index 93e69605..9ca07787 100644 --- a/src/module/rss/__init__.py +++ b/src/module/rss/__init__.py @@ -1,4 +1,4 @@ -from .rss_analyser import RSSAnalyser +from .analyser import RSSAnalyser from .add_rules import add_rules diff --git a/src/module/rss/rss_analyser.py b/src/module/rss/analyser.py similarity index 100% rename from src/module/rss/rss_analyser.py rename to src/module/rss/analyser.py