From 36f22a28df4be1ac7a669d2252303c38e82a0a1a Mon Sep 17 00:00:00 2001 From: jxxghp Date: Wed, 21 Jan 2026 23:23:37 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=AE=8C=E6=88=90=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/transfer.py | 47 +++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/app/chain/transfer.py b/app/chain/transfer.py index b11f5bbe..9f0ecb7f 100755 --- a/app/chain/transfer.py +++ b/app/chain/transfer.py @@ -242,13 +242,10 @@ class JobManager: ) else: meta_done = True - if __mediaid__ != __metaid__: - if __mediaid__ in self._job_view: - media_done = all( - task.state in ["completed", "failed"] for task in self._job_view[__mediaid__].tasks - ) - else: - media_done = False + if __mediaid__ in self._job_view: + media_done = all( + task.state in ["completed", "failed"] for task in self._job_view[__mediaid__].tasks + ) else: media_done = True return meta_done and media_done @@ -265,16 +262,13 @@ class JobManager: ) else: meta_finished = True - if __mediaid__ != __metaid__: - if __mediaid__ in self._job_view: - tasks = self._job_view[__mediaid__].tasks - media_finished = all( - task.state in ["completed", "failed"] for task in tasks - ) and any( - task.state == "completed" for task in tasks - ) - else: - media_finished = False + if __mediaid__ in self._job_view: + tasks = self._job_view[__mediaid__].tasks + media_finished = all( + task.state in ["completed", "failed"] for task in tasks + ) and any( + task.state == "completed" for task in tasks + ) else: media_finished = True return meta_finished and media_finished @@ -291,13 +285,10 @@ class JobManager: ) else: meta_success = True - if __mediaid__ != __metaid__: - if __mediaid__ in self._job_view: - media_success = all( - task.state in ["completed"] for task in self._job_view[__mediaid__].tasks - ) - else: - media_success = False + if __mediaid__ in self._job_view: + media_success = all( + task.state in ["completed"] for task in self._job_view[__mediaid__].tasks + ) else: media_success = True return meta_success and media_success @@ -334,7 +325,7 @@ class JobManager: def count(self, media: MediaInfo, season: Optional[int] = None) -> int: """ - 获取某项任务成功总数 + 获取作业成功总数 """ __mediaid__ = self.__get_media_id(media=media, season=season) if __mediaid__ not in self._job_view: @@ -343,7 +334,7 @@ class JobManager: def size(self, media: MediaInfo, season: Optional[int] = None) -> int: """ - 获取某项任务成功文件总大小 + 获取作业成功文件总大小 """ __mediaid__ = self.__get_media_id(media=media, season=season) if __mediaid__ not in self._job_view: @@ -358,13 +349,13 @@ class JobManager: def total(self) -> int: """ - 获取所有task任务总数 + 获取所有任务总数 """ return sum([len(job.tasks) for job in self._job_view.values()]) def list_jobs(self) -> List[TransferJob]: """ - 获取任务列表 + 获取所有任务列表 """ return list(self._job_view.values())