mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-09-09 09:26:55 +08:00
fix #3689
This commit is contained in:
+22
-11
@@ -504,14 +504,20 @@ class TransferChain(ChainBase, metaclass=Singleton):
|
|||||||
if not task:
|
if not task:
|
||||||
return
|
return
|
||||||
# 维护整理任务视图
|
# 维护整理任务视图
|
||||||
with task_lock:
|
self.__put_to_jobview(task)
|
||||||
self.jobview.add_task(task)
|
|
||||||
# 添加到队列
|
# 添加到队列
|
||||||
self._queue.put(TransferQueue(
|
self._queue.put(TransferQueue(
|
||||||
task=task,
|
task=task,
|
||||||
callback=callback or self.__default_callback
|
callback=callback or self.__default_callback
|
||||||
))
|
))
|
||||||
|
|
||||||
|
def __put_to_jobview(self, task: TransferTask):
|
||||||
|
"""
|
||||||
|
添加到作业视图
|
||||||
|
"""
|
||||||
|
with task_lock:
|
||||||
|
self.jobview.add_task(task)
|
||||||
|
|
||||||
def remove_from_queue(self, fileitem: FileItem):
|
def remove_from_queue(self, fileitem: FileItem):
|
||||||
"""
|
"""
|
||||||
从待整理队列移除
|
从待整理队列移除
|
||||||
@@ -578,10 +584,6 @@ class TransferChain(ChainBase, metaclass=Singleton):
|
|||||||
self.progress.update(value=processed_num / total_num * 100,
|
self.progress.update(value=processed_num / total_num * 100,
|
||||||
text=__process_msg,
|
text=__process_msg,
|
||||||
key=ProgressKey.FileTransfer)
|
key=ProgressKey.FileTransfer)
|
||||||
# 移除已完成的任务
|
|
||||||
with task_lock:
|
|
||||||
if self.jobview.is_done(task):
|
|
||||||
self.jobview.remove_job(task)
|
|
||||||
except queue.Empty:
|
except queue.Empty:
|
||||||
if not __queue_start:
|
if not __queue_start:
|
||||||
# 结束进度
|
# 结束进度
|
||||||
@@ -608,6 +610,10 @@ class TransferChain(ChainBase, metaclass=Singleton):
|
|||||||
"""
|
"""
|
||||||
处理整理任务
|
处理整理任务
|
||||||
"""
|
"""
|
||||||
|
try:
|
||||||
|
# 维护整理任务视图
|
||||||
|
if task.background:
|
||||||
|
self.__put_to_jobview(task)
|
||||||
# 识别
|
# 识别
|
||||||
if not task.mediainfo:
|
if not task.mediainfo:
|
||||||
mediainfo = None
|
mediainfo = None
|
||||||
@@ -712,6 +718,12 @@ class TransferChain(ChainBase, metaclass=Singleton):
|
|||||||
|
|
||||||
return transferinfo.success, transferinfo.message
|
return transferinfo.success, transferinfo.message
|
||||||
|
|
||||||
|
finally:
|
||||||
|
# 移除已完成的任务
|
||||||
|
with task_lock:
|
||||||
|
if self.jobview.is_done(task):
|
||||||
|
self.jobview.remove_job(task)
|
||||||
|
|
||||||
def get_queue_tasks(self) -> List[TransferJob]:
|
def get_queue_tasks(self) -> List[TransferJob]:
|
||||||
"""
|
"""
|
||||||
获取整理任务列表
|
获取整理任务列表
|
||||||
@@ -792,7 +804,7 @@ class TransferChain(ChainBase, metaclass=Singleton):
|
|||||||
# 非MoviePilot下载的任务,按文件识别
|
# 非MoviePilot下载的任务,按文件识别
|
||||||
mediainfo = None
|
mediainfo = None
|
||||||
|
|
||||||
# 执行整理,匹配源目录
|
# 执行实时整理,匹配源目录
|
||||||
state, errmsg = self.do_transfer(
|
state, errmsg = self.do_transfer(
|
||||||
fileitem=FileItem(
|
fileitem=FileItem(
|
||||||
storage="local",
|
storage="local",
|
||||||
@@ -1095,12 +1107,11 @@ class TransferChain(ChainBase, metaclass=Singleton):
|
|||||||
downloader=downloader,
|
downloader=downloader,
|
||||||
download_hash=download_hash,
|
download_hash=download_hash,
|
||||||
download_history=download_history,
|
download_history=download_history,
|
||||||
manual=manual
|
manual=manual,
|
||||||
|
background=background
|
||||||
)
|
)
|
||||||
if background:
|
if background:
|
||||||
self.put_to_queue(
|
self.put_to_queue(task=transfer_task)
|
||||||
task=transfer_task
|
|
||||||
)
|
|
||||||
logger.info(f"{file_path.name} 已添加到整理队列")
|
logger.info(f"{file_path.name} 已添加到整理队列")
|
||||||
else:
|
else:
|
||||||
state, err_msg = self.__handle_transfer(
|
state, err_msg = self.__handle_transfer(
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ class TransferTask(BaseModel):
|
|||||||
download_hash: Optional[str] = None
|
download_hash: Optional[str] = None
|
||||||
download_history: Optional[DownloadHistory] = None
|
download_history: Optional[DownloadHistory] = None
|
||||||
manual: Optional[bool] = False
|
manual: Optional[bool] = False
|
||||||
|
background: Optional[bool] = True
|
||||||
|
|
||||||
def to_dict(self):
|
def to_dict(self):
|
||||||
"""
|
"""
|
||||||
|
|||||||
Reference in New Issue
Block a user