A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: Task with single failed VerifyFiles subtask continues indefinitely Fixes #209
aminnausin652021eaedf5
diff --git a/app/Jobs/GeneratePreviewImage.php b/app/Jobs/GeneratePreviewImage.phpindex a23fd7cc..506fa983 100644--- a/app/Jobs/GeneratePreviewImage.php+++ b/app/Jobs/GeneratePreviewImage.php@@ -32,7 +32,7 @@ class GeneratePreviewImage extends ManagedTask {}public function handle(PreviewGeneratorService $previewGenerator, TaskService $taskService) {- $this->beginTask($taskService);+ if (!$this->beginTask($taskService)) return;try {$result = $previewGenerator->generateImage($this->data, $this->path, true);diff --git a/app/Jobs/ManagedTask.php b/app/Jobs/ManagedTask.phpindex d06f3396..d4c90621 100644--- a/app/Jobs/ManagedTask.php+++ b/app/Jobs/ManagedTask.php@@ -35,7 +35,7 @@ abstract class ManagedTask implements ShouldQueue {* Sets subtask to processing* Sets subtask starting summary*/- public function beginTask(TaskService $taskService, string $summary = ''): void {+ public function beginTask(TaskService $taskService, string $summary = ''): bool {if (! $this->taskId) {throw new LogicException('Task ID missing, cannot begin task');}@@ -49,7 +49,7 @@ abstract class ManagedTask implements ShouldQueue {$taskService->updateSubTask($this->subTaskId, ['status' => TaskStatus::CANCELLED, 'summary' => 'Parent Task was Cancelled']);$this->delete();- return;+ return false;}$this->ensureTaskIsStarted($this->taskId);@@ -59,6 +59,8 @@ abstract class ManagedTask implements ShouldQueue {$taskService->updateTaskCounts($this->taskId, ['sub_tasks_pending' => '--']);$taskService->updateSubTask($this->subTaskId, ['status' => TaskStatus::PROCESSING, 'started_at' => $this->startedAt, 'summary' => $summary]);});++ return true;}public function completeTask(TaskService $taskService, string $summary = '', array $taskCountUpdates = ['sub_tasks_complete' => '++']): ?Task {diff --git a/app/Jobs/SyncFiles.php b/app/Jobs/SyncFiles.phpindex 3ac48a84..5d90c0fc 100755--- a/app/Jobs/SyncFiles.php+++ b/app/Jobs/SyncFiles.php@@ -28,7 +28,7 @@ class SyncFiles extends ManagedTask {* Execute the job.*/public function handle(TaskService $taskService): void {- $this->beginTask($taskService);+ if (!$this->beginTask($taskService)) return;try {$this->syncCache($taskService);diff --git a/app/Jobs/Utility/Paths/CleanFolderPaths.php b/app/Jobs/Utility/Paths/CleanFolderPaths.phpindex 2ed75564..6c8664e9 100644--- a/app/Jobs/Utility/Paths/CleanFolderPaths.php+++ b/app/Jobs/Utility/Paths/CleanFolderPaths.php@@ -24,7 +24,7 @@ class CleanFolderPaths extends ManagedTask {* Execute the job.*/public function handle(TaskService $taskService): void {- $this->beginTask($taskService);+ if (!$this->beginTask($taskService)) return;try {$summary = $this->cleanFolderPaths($taskService);diff --git a/app/Jobs/Utility/Paths/CleanVideoPaths.php b/app/Jobs/Utility/Paths/CleanVideoPaths.phpindex 717e11c2..b019f702 100644--- a/app/Jobs/Utility/Paths/CleanVideoPaths.php+++ b/app/Jobs/Utility/Paths/CleanVideoPaths.php@@ -23,7 +23,7 @@ class CleanVideoPaths extends ManagedTask {* Execute the job.*/public function handle(TaskService $taskService): void {- $this->beginTask($taskService);+ if (!$this->beginTask($taskService)) return;try {$summary = $this->cleanVideoPaths($taskService);diff --git a/app/Jobs/VerifyFiles.php b/app/Jobs/VerifyFiles.phpindex 84976770..80fc963b 100755--- a/app/Jobs/VerifyFiles.php+++ b/app/Jobs/VerifyFiles.php@@ -55,7 +55,7 @@ class VerifyFiles extends ManagedTask {}public function handle(TaskService $taskService, SubtitleScanner $subtitleScanner): void {- $this->beginTask($taskService);+ if (!$this->beginTask($taskService)) return;try {$summary = $this->verifyFiles($taskService, $subtitleScanner);diff --git a/app/Jobs/VerifyFolders.php b/app/Jobs/VerifyFolders.phpindex c34cc50d..f52a96eb 100644--- a/app/Jobs/VerifyFolders.php+++ b/app/Jobs/VerifyFolders.php@@ -27,7 +27,7 @@ class VerifyFolders extends ManagedTask {* Execute the job.*/public function handle(TaskService $taskService): void {- $this->beginTask($taskService);+ if (!$this->beginTask($taskService)) return;try {$summary = $this->verifyFolders($taskService);