codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 媒体库刮削插件开启强制刮削时忽略SCRAP_METADATA变量

Browse Source
This commit is contained in:
thsrite 2023-09-12 13:29:12 +08:00
parent 1b2f09b95f
commit d8afa339de
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/chain/__init__.py
View File

@ -385,14 +385,15 @@ class ChainBase(metaclass=ABCMeta):
""" """
return self.run_module("post_torrents_message", message=message, torrents=torrents) return self.run_module("post_torrents_message", message=message, torrents=torrents)
def scrape_metadata(self, path: Path, mediainfo: MediaInfo) -> None: def scrape_metadata(self, path: Path, mediainfo: MediaInfo, scrap_metadata: bool = settings.SCRAP_METADATA) -> None:
""" """
刮削元数据 刮削元数据
:param path: 媒体文件路径 :param path: 媒体文件路径
:param mediainfo: 识别的媒体信息 :param mediainfo: 识别的媒体信息
:param scrap_metadata: 是否刮削
:return: 成功或失败 :return: 成功或失败
""" """
if settings.SCRAP_METADATA: if scrap_metadata:
return self.run_module("scrape_metadata", path=path, mediainfo=mediainfo) return self.run_module("scrape_metadata", path=path, mediainfo=mediainfo)
return None return None

6
app/plugins/libraryscraper/__init__.py
View File

@ -321,6 +321,8 @@ class LibraryScraper(_PluginBase):
meta_info = MetaInfo(file.name) meta_info = MetaInfo(file.name)
# 合并 # 合并
meta_info.merge(dir_meta) meta_info.merge(dir_meta)
# 是否刮削
scrap_metadata = settings.SCRAP_METADATA
# 识别媒体信息 # 识别媒体信息
if not mediainfo: if not mediainfo:
@ -359,6 +361,7 @@ class LibraryScraper(_PluginBase):
# 覆盖模式时，提前删除nfo # 覆盖模式时，提前删除nfo
if self._mode in ["force_all", "force_nfo"]: if self._mode in ["force_all", "force_nfo"]:
scrap_metadata = True
nfo_files = SystemUtils.list_files(path, [".nfo"]) nfo_files = SystemUtils.list_files(path, [".nfo"])
for nfo_file in nfo_files: for nfo_file in nfo_files:
try: try:
@ -369,6 +372,7 @@ class LibraryScraper(_PluginBase):
# 覆盖模式时，提前删除图片文件 # 覆盖模式时，提前删除图片文件
if self._mode in ["force_all", "force_image"]: if self._mode in ["force_all", "force_image"]:
scrap_metadata = True
image_files = SystemUtils.list_files(path, [".jpg", ".png"]) image_files = SystemUtils.list_files(path, [".jpg", ".png"])
for image_file in image_files: for image_file in image_files:
if ".actors" in str(image_file): if ".actors" in str(image_file):
@ -380,7 +384,7 @@ class LibraryScraper(_PluginBase):
print(str(err)) print(str(err))
# 刮削单个文件 # 刮削单个文件
self.chain.scrape_metadata(path=file, mediainfo=mediainfo) self.chain.scrape_metadata(path=file, mediainfo=mediainfo, scrap_metadata=scrap_metadata)
@staticmethod @staticmethod
def __get_tmdbid_from_nfo(file_path: Path): def __get_tmdbid_from_nfo(file_path: Path):