From ed8e02bb38d0469dd02bfb6a5ad3c53aa69e7075 Mon Sep 17 00:00:00 2001 From: thsrite Date: Sat, 26 Aug 2023 11:20:41 +0800 Subject: [PATCH] fix --- app/plugins/dirmonitor/__init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/plugins/dirmonitor/__init__.py b/app/plugins/dirmonitor/__init__.py index e27dfa24..d71f371e 100644 --- a/app/plugins/dirmonitor/__init__.py +++ b/app/plugins/dirmonitor/__init__.py @@ -442,30 +442,32 @@ class DirMonitor(_PluginBase): # 剧集季集信息 S01 E01-E04 || S01 E01、E02、E04 season_episode = None # 处理文件多,说明是剧集,显示季入库消息 - if mediainfo.type == MediaType.TV and file_count > 1: + if mediainfo.type == MediaType.TV and len(episodes) > 1: # 剧集季 - season = file_meta.begin_season + season = "S%s" % str(file_meta.begin_season).rjust(2, "0") # 剧集按照升序排序 episodes.sort() # 开始、结束index - start = int(episodes[0][-1:]) - end = int(episodes[len(episodes) - 1][-1:]) + start = int(episodes[0]) + end = int(episodes[len(episodes) - 1]) # 开始结束间所有的元素 1,2,3,4 all_ele = [i for i in range(start, end + 1)] # 本次剧集组所有的元素 1,2,4 - episode_ele = [int(e.replace("E", "")) for e in episodes] + episode_ele = [int(e) for e in episodes] # 如果本次剧集组所有元素=开始结束间所有元素,则表示区间内 S01 E01-E04 if all_ele == episode_ele: - season_episode = f"{season} {episodes[start - 1]}-{episodes[end - 1]}" + season_episode = f"{season} E{str(episodes[start - 1]).rjust(2, '0')}-E{str(episodes[end - 1]).rjust(2, '0')}" else: # 否则所有剧集组逗号分隔显示 S01 E01、E02、E04 + episodes = ["E%s" % str(episode).rjust(2, "0") for episode in episodes] season_episode = f"{season} {'、'.join(episodes)}" self.transferchian.send_transfer_message(meta=file_meta, mediainfo=mediainfo, + transferinfo=transferinfo, season_episode=season_episode) # 发送完消息,移出key del self._medias[medis_title_year_season]