GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-07 08:26:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix：整理记录登记

Browse Source
This commit is contained in:
jxxghp
2025-08-24 12:19:12 +08:00
parent 2ce1c3bef8
commit 9b843c9ed2
2 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/chain/transfer.py
+22 -10
View File
@@ -555,6 +555,8 @@ class TransferChain(ChainBase, metaclass=Singleton):
processed_num = 0 processed_num = 0
# 失败数量 # 失败数量
fail_num = 0 fail_num = 0
# 已完成文件
finished_files = []
progress = ProgressHelper(ProgressKey.FileTransfer) progress = ProgressHelper(ProgressKey.FileTransfer)
@@ -586,7 +588,11 @@ class TransferChain(ChainBase, metaclass=Singleton):
__process_msg = f"正在整理 {fileitem.name} ..." __process_msg = f"正在整理 {fileitem.name} ..."
logger.info(__process_msg) logger.info(__process_msg)
progress.update(value=processed_num / total_num * 100, progress.update(value=processed_num / total_num * 100,
text=__process_msg) text=__process_msg,
data={
"current": Path(fileitem.path).as_posix(),
"finished":finished_files
})
# 整理 # 整理
state, err_msg = self.__handle_transfer(task=task, callback=item.callback) state, err_msg = self.__handle_transfer(task=task, callback=item.callback)
if not state: if not state:
@@ -594,10 +600,12 @@ class TransferChain(ChainBase, metaclass=Singleton):
fail_num += 1 fail_num += 1
# 更新进度 # 更新进度
processed_num += 1 processed_num += 1
finished_files.append(Path(fileitem.path).as_posix())
__process_msg = f"{fileitem.name} 整理完成" __process_msg = f"{fileitem.name} 整理完成"
logger.info(__process_msg) logger.info(__process_msg)
progress.update(value=processed_num / total_num * 100, progress.update(value=processed_num / total_num * 100,
text=__process_msg) text=__process_msg,
data={})
except queue.Empty: except queue.Empty:
if not __queue_start: if not __queue_start:
# 结束进度 # 结束进度
@@ -1161,6 +1169,8 @@ class TransferChain(ChainBase, metaclass=Singleton):
processed_num = 0 processed_num = 0
# 失败数量 # 失败数量
fail_num = 0 fail_num = 0
# 已完成文件
finished_files = []
# 启动进度 # 启动进度
progress = ProgressHelper(ProgressKey.FileTransfer) progress = ProgressHelper(ProgressKey.FileTransfer)
@@ -1179,7 +1189,11 @@ class TransferChain(ChainBase, metaclass=Singleton):
__process_msg = f"正在整理 （{processed_num + fail_num + 1}/{total_num}）{transfer_task.fileitem.name} ..." __process_msg = f"正在整理 （{processed_num + fail_num + 1}/{total_num}）{transfer_task.fileitem.name} ..."
logger.info(__process_msg) logger.info(__process_msg)
progress.update(value=(processed_num + fail_num) / total_num * 100, progress.update(value=(processed_num + fail_num) / total_num * 100,
text=__process_msg) text=__process_msg,
data={
"current": Path(transfer_task.fileitem.path).as_posix(),
"finished": finished_files,
})
state, err_msg = self.__handle_transfer( state, err_msg = self.__handle_transfer(
task=transfer_task, task=transfer_task,
callback=self.__default_callback callback=self.__default_callback
@@ -1191,6 +1205,8 @@ class TransferChain(ChainBase, metaclass=Singleton):
fail_num += 1 fail_num += 1
else: else:
processed_num += 1 processed_num += 1
# 记录已完成
finished_files.append(Path(transfer_task.fileitem.path).as_posix())
finally: finally:
transfer_tasks.clear() transfer_tasks.clear()
del transfer_tasks del transfer_tasks
@@ -1199,7 +1215,8 @@ class TransferChain(ChainBase, metaclass=Singleton):
__end_msg = f"整理队列处理完成，共整理 {total_num} 个文件，失败 {fail_num} 个" __end_msg = f"整理队列处理完成，共整理 {total_num} 个文件，失败 {fail_num} 个"
logger.info(__end_msg) logger.info(__end_msg)
progress.update(value=100, progress.update(value=100,
text=__end_msg) text=__end_msg,
data={})
progress.end() progress.end()
error_msg = "、".join(err_msgs[:2]) + (f"，等{len(err_msgs)}个文件错误！" if len(err_msgs) > 2 else "") error_msg = "、".join(err_msgs[:2]) + (f"，等{len(err_msgs)}个文件错误！" if len(err_msgs) > 2 else "")
@@ -1345,11 +1362,7 @@ class TransferChain(ChainBase, metaclass=Singleton):
else: else:
# 更新媒体图片 # 更新媒体图片
self.obtain_images(mediainfo=mediainfo) self.obtain_images(mediainfo=mediainfo)
# 开始进度
progress = ProgressHelper(ProgressKey.FileTransfer)
progress.start()
progress.update(value=0,
text=f"开始整理 {fileitem.path} ...")
# 开始整理 # 开始整理
state, errmsg = self.do_transfer( state, errmsg = self.do_transfer(
fileitem=fileitem, fileitem=fileitem,
@@ -1370,7 +1383,6 @@ class TransferChain(ChainBase, metaclass=Singleton):
if not state: if not state:
return False, errmsg return False, errmsg
progress.end()
logger.info(f"{fileitem.path} 整理完成") logger.info(f"{fileitem.path} 整理完成")
return True, "" return True, ""
else: else:
app/helper/progress.py
+14 -7
View File
@@ -21,7 +21,8 @@ class ProgressHelper(metaclass=WeakSingleton):
self._progress[self._key] = { self._progress[self._key] = {
"enable": False, "enable": False,
"value": 0, "value": 0,
"text": "请稍候..." "text": "请稍候...",
"data": {}
} }
def start(self): def start(self):
@@ -31,19 +32,25 @@ class ProgressHelper(metaclass=WeakSingleton):
def end(self): def end(self):
if not self._progress.get(self._key): if not self._progress.get(self._key):
return return
self._progress[self._key] = { self._progress[self._key].update(
"enable": False, {
"value": 100, "enable": False,
"text": "正在处理..." "value": 100,
} "text": ""
}
)
def update(self, value: Union[float, int] = None, text: Optional[str] = None): def update(self, value: Union[float, int] = None, text: Optional[str] = None, data: dict = None):
if not self._progress.get(self._key).get('enable'): if not self._progress.get(self._key).get('enable'):
return return
if value: if value:
self._progress[self._key]['value'] = value self._progress[self._key]['value'] = value
if text: if text:
self._progress[self._key]['text'] = text self._progress[self._key]['text'] = text
if data:
if not self._progress[self._key].get('data'):
self._progress[self._key]['data'] = {}
self._progress[self._key]['data'].update(data)
def get(self) -> dict: def get(self) -> dict:
return self._progress.get(self._key) return self._progress.get(self._key)