feat(transfer): enhance job removal methods for thread safety and strict checks

This commit is contained in:
jxxghp
2026-02-01 16:58:32 +08:00
parent eda306d726
commit 7b8cd37a9b
+41 -3
View File
@@ -224,7 +224,7 @@ class JobManager:
def remove_job(self, task: TransferTask) -> Optional[TransferJob]: def remove_job(self, task: TransferTask) -> Optional[TransferJob]:
""" """
移除任务对应的作业 移除任务对应的作业(强制,线程不安全)
""" """
with job_lock: with job_lock:
__mediaid__ = self.__get_id(task) __mediaid__ = self.__get_id(task)
@@ -235,10 +235,39 @@ class JobManager:
return self._job_view.pop(__mediaid__) return self._job_view.pop(__mediaid__)
return None return None
def try_remove_job(self, task: TransferTask):
"""
尝试移除任务对应的作业(严格检查未完成作业,线程安全)
"""
with job_lock:
__metaid__ = self.__get_meta_id(meta=task.meta, season=task.meta.begin_season)
__mediaid__ = self.__get_media_id(media=task.mediainfo, season=task.meta.begin_season)
meta_done = True
if __metaid__ in self._job_view:
meta_done = all(
t.state in ["completed", "failed"] for t in self._job_view[__metaid__].tasks
)
media_done = True
if __mediaid__ in self._job_view:
media_done = all(
t.state in ["completed", "failed"] for t in self._job_view[__mediaid__].tasks
)
if meta_done and media_done:
__id__ = self.__get_id(task)
if __id__ in self._job_view:
# 移除季集信息
if __id__ in self._season_episodes:
self._season_episodes.pop(__id__)
self._job_view.pop(__id__)
def is_done(self, task: TransferTask) -> bool: def is_done(self, task: TransferTask) -> bool:
""" """
检查任务对应的作业是否整理完成(不管成功还是失败) 检查任务对应的作业是否整理完成(不管成功还是失败)
""" """
with job_lock:
__metaid__ = self.__get_meta_id(meta=task.meta, season=task.meta.begin_season) __metaid__ = self.__get_meta_id(meta=task.meta, season=task.meta.begin_season)
__mediaid__ = self.__get_media_id(media=task.mediainfo, season=task.meta.begin_season) __mediaid__ = self.__get_media_id(media=task.mediainfo, season=task.meta.begin_season)
if __metaid__ in self._job_view: if __metaid__ in self._job_view:
@@ -259,6 +288,7 @@ class JobManager:
""" """
检查任务对应的作业是否已完成且有成功的记录 检查任务对应的作业是否已完成且有成功的记录
""" """
with job_lock:
__metaid__ = self.__get_meta_id(meta=task.meta, season=task.meta.begin_season) __metaid__ = self.__get_meta_id(meta=task.meta, season=task.meta.begin_season)
__mediaid__ = self.__get_media_id(media=task.mediainfo, season=task.meta.begin_season) __mediaid__ = self.__get_media_id(media=task.mediainfo, season=task.meta.begin_season)
if __metaid__ in self._job_view: if __metaid__ in self._job_view:
@@ -282,6 +312,7 @@ class JobManager:
""" """
检查任务对应的作业是否全部成功 检查任务对应的作业是否全部成功
""" """
with job_lock:
__metaid__ = self.__get_meta_id(meta=task.meta, season=task.meta.begin_season) __metaid__ = self.__get_meta_id(meta=task.meta, season=task.meta.begin_season)
__mediaid__ = self.__get_media_id(media=task.mediainfo, season=task.meta.begin_season) __mediaid__ = self.__get_media_id(media=task.mediainfo, season=task.meta.begin_season)
if __metaid__ in self._job_view: if __metaid__ in self._job_view:
@@ -337,6 +368,7 @@ class JobManager:
""" """
判断作业是否还有任务正在处理 判断作业是否还有任务正在处理
""" """
with job_lock:
if mediainfo: if mediainfo:
__mediaid__ = self.__get_media_id(media=mediainfo, season=season) __mediaid__ = self.__get_media_id(media=mediainfo, season=season)
if __mediaid__ in self._job_view: if __mediaid__ in self._job_view:
@@ -349,6 +381,7 @@ class JobManager:
""" """
获取作业中所有成功的任务 获取作业中所有成功的任务
""" """
with job_lock:
__mediaid__ = self.__get_media_id(media=media, season=season) __mediaid__ = self.__get_media_id(media=media, season=season)
if __mediaid__ not in self._job_view: if __mediaid__ not in self._job_view:
return [] return []
@@ -358,6 +391,7 @@ class JobManager:
""" """
获取作业中全部任务 获取作业中全部任务
""" """
with job_lock:
__mediaid__ = self.__get_media_id(media=media, season=season) __mediaid__ = self.__get_media_id(media=media, season=season)
if __mediaid__ not in self._job_view: if __mediaid__ not in self._job_view:
return [] return []
@@ -367,6 +401,7 @@ class JobManager:
""" """
获取作业中成功总数 获取作业中成功总数
""" """
with job_lock:
__mediaid__ = self.__get_media_id(media=media, season=season) __mediaid__ = self.__get_media_id(media=media, season=season)
if __mediaid__ not in self._job_view: if __mediaid__ not in self._job_view:
return 0 return 0
@@ -376,6 +411,7 @@ class JobManager:
""" """
获取作业中所有成功文件总大小 获取作业中所有成功文件总大小
""" """
with job_lock:
__mediaid__ = self.__get_media_id(media=media, season=season) __mediaid__ = self.__get_media_id(media=media, season=season)
if __mediaid__ not in self._job_view: if __mediaid__ not in self._job_view:
return 0 return 0
@@ -391,18 +427,21 @@ class JobManager:
""" """
获取所有任务总数 获取所有任务总数
""" """
with job_lock:
return sum([len(job.tasks) for job in self._job_view.values()]) return sum([len(job.tasks) for job in self._job_view.values()])
def list_jobs(self) -> List[TransferJob]: def list_jobs(self) -> List[TransferJob]:
""" """
获取所有作业的任务列表 获取所有作业的任务列表
""" """
with job_lock:
return list(self._job_view.values()) return list(self._job_view.values())
def season_episodes(self, media: MediaInfo, season: Optional[int] = None) -> List[int]: def season_episodes(self, media: MediaInfo, season: Optional[int] = None) -> List[int]:
""" """
获取作业的季集清单 获取作业的季集清单
""" """
with job_lock:
__mediaid__ = self.__get_media_id(media=media, season=season) __mediaid__ = self.__get_media_id(media=media, season=season)
return self._season_episodes.get(__mediaid__) or [] return self._season_episodes.get(__mediaid__) or []
@@ -1006,8 +1045,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton):
finally: finally:
# 移除已完成的任务 # 移除已完成的任务
if self.jobview.is_done(task): self.jobview.try_remove_job(task)
self.jobview.remove_job(task)
def get_queue_tasks(self) -> List[TransferJob]: def get_queue_tasks(self) -> List[TransferJob]:
""" """