kodi/webmanager-mvp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: feedback verbetering 05

Browse Source
This commit is contained in:
kodi
2026-03-15 15:30:55 +01:00
parent 61d0c8de41
commit ae6a9d8c45
13 changed files with 139 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webui/backend/app/tasks_runner.py
+22 -2
View File
@@ -1,5 +1,6 @@
from __future__ import annotations
import errno
import os
import shutil
import threading
@@ -355,7 +356,13 @@ class TaskRunner:
completed_items = self._move_directory_item(task_id, item, completed_items, total_items)
else:
file_entry = self._file_entries(item)[0]
completed_items = self._move_single_planned_file(task_id, file_entry, completed_items, total_items)
completed_items = self._move_single_planned_file(
task_id,
file_entry,
completed_items,
total_items,
same_root=bool(item.get("same_root", True)),
)
if self._is_cancel_requested(task_id):
self._finalize_cancelled(task_id, done_items=completed_items, total_items=total_items)
return
@@ -631,6 +638,8 @@ class TaskRunner:
file_entry: dict[str, str],
completed_items: int,
total_items: int,
*,
same_root: bool,
) -> int:
self._repository.update_progress(
task_id=task_id,
@@ -638,7 +647,18 @@ class TaskRunner:
total_items=total_items,
current_item=file_entry["label"],
)
self._filesystem.move_file(source=file_entry["source"], destination=file_entry["destination"])
try:
if same_root:
self._filesystem.move_file(source=file_entry["source"], destination=file_entry["destination"])
else:
self._filesystem.copy_file(source=file_entry["source"], destination=file_entry["destination"])
self._filesystem.delete_file(Path(file_entry["source"]))
except OSError as exc:
if same_root and exc.errno == errno.EXDEV:
self._filesystem.copy_file(source=file_entry["source"], destination=file_entry["destination"])
self._filesystem.delete_file(Path(file_entry["source"]))
else:
raise
completed_items += 1
self._repository.update_progress(
task_id=task_id,