From 24b58dc002be66a65670e05cc0eedc135354ae6f Mon Sep 17 00:00:00 2001 From: zhanglijun <1074176954@qq.com> Date: Sat, 23 Nov 2024 20:13:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DS0=E5=88=AE=E5=89=8A?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E5=89=A7=E9=9B=86=E6=A0=B9=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/media.py | 4 ++-- app/modules/themoviedb/scraper.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/chain/media.py b/app/chain/media.py index 008f09e7..fd6e1642 100644 --- a/app/chain/media.py +++ b/app/chain/media.py @@ -489,7 +489,7 @@ class MediaChain(ChainBase, metaclass=Singleton): if init_folder: # 识别文件夹名称 season_meta = MetaInfo(filepath.name) - if season_meta.begin_season: + if season_meta.begin_season is not None: # 是否已存在 nfo_path = filepath / "season.nfo" if not overwrite and self.storagechain.get_file_item(storage=fileitem.storage, path=nfo_path): @@ -517,7 +517,7 @@ class MediaChain(ChainBase, metaclass=Singleton): if content: __save_file(_fileitem=fileitem, _path=image_path, _content=content) # 判断当前目录是不是剧集根目录 - if season_meta.name: + if not season_meta.season: # 是否已存在 nfo_path = filepath / "tvshow.nfo" if not overwrite and self.storagechain.get_file_item(storage=fileitem.storage, path=nfo_path): diff --git a/app/modules/themoviedb/scraper.py b/app/modules/themoviedb/scraper.py index 27235aff..46733a81 100644 --- a/app/modules/themoviedb/scraper.py +++ b/app/modules/themoviedb/scraper.py @@ -30,7 +30,7 @@ class TmdbScraper: # 电影元数据文件 doc = self.__gen_movie_nfo_file(mediainfo=mediainfo) else: - if season: + if season is not None: # 查询季信息 seasoninfo = self.tmdb.get_tv_season_detail(mediainfo.tmdb_id, meta.begin_season) if episode: @@ -57,7 +57,7 @@ class TmdbScraper: :param episode: 集号 """ images = {} - if season: + if season is not None: # 只需要集的图片 if episode: # 集的图片 From b9c2b9a0440c9280c6d9dba04e7cc8945a709d46 Mon Sep 17 00:00:00 2001 From: zhanglijun <1074176954@qq.com> Date: Sat, 23 Nov 2024 20:15:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E6=94=AF=E6=8C=81S0=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E4=B8=BASpecials,SPs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/media.py | 3 +++ app/core/config.py | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/app/chain/media.py b/app/chain/media.py index fd6e1642..aba3c800 100644 --- a/app/chain/media.py +++ b/app/chain/media.py @@ -489,6 +489,9 @@ class MediaChain(ChainBase, metaclass=Singleton): if init_folder: # 识别文件夹名称 season_meta = MetaInfo(filepath.name) + # 当前文件夹为Specials或者SPs时，设置为S0 + if filepath.name in settings.RENAME_FORMAT_S0_NAMES: + season_meta.begin_season = 0 if season_meta.begin_season is not None: # 是否已存在 nfo_path = filepath / "season.nfo" diff --git a/app/core/config.py b/app/core/config.py index 1921baf7..58e2f890 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -232,6 +232,10 @@ class ConfigModel(BaseModel): SECURITY_IMAGE_SUFFIXES: List[str] = Field( default_factory=lambda: [".jpg", ".jpeg", ".png", ".webp", ".gif", ".svg"] ) + # 重命名时支持的S0别名 + RENAME_FORMAT_S0_NAMES: List[str] = Field( + default_factory=lambda: ["Specials", "SPs"] + ) class Settings(BaseSettings, ConfigModel):