fix: Task with single failed VerifyFiles subtask continues indefinitely

aminnausin · aminnausin · commit 652021eaedf5 · 2026-01-10T20:33:11.000-05:00
Fixes #209
diff --git a/app/Jobs/GeneratePreviewImage.php b/app/Jobs/GeneratePreviewImage.php
@@ -32,7 +32,7 @@ public function __construct(
     }
 
     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.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 @@ public function beginTask(TaskService $taskService, string $summary = ''): void
             $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 @@ public function beginTask(TaskService $taskService, string $summary = ''): void
             $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.php
@@ -28,7 +28,7 @@ public function __construct($taskId) {
      * 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.php
@@ -24,7 +24,7 @@ public function __construct(public $folders, $taskId) {
      * 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.php
@@ -23,7 +23,7 @@ public function __construct(public $videos, $taskId) {
      * 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.php
@@ -55,7 +55,7 @@ public function __construct(public $videos, int $taskId) {
     }
 
     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.php
@@ -27,7 +27,7 @@ public function __construct(public $folders, $taskId) {
      * Execute the job.
      */
     public function handle(TaskService $taskService): void {
-        $this->beginTask($taskService);
+        if (!$this->beginTask($taskService)) return;
 
         try {
             $summary = $this->verifyFolders($taskService);

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public function handle(PreviewGeneratorService $previewGenerator, TaskService $taskService) {`
`35`		`- $this->beginTask($taskService);`
	`35`	`+ if (!$this->beginTask($taskService)) return;`
`36`	`36`
`37`	`37`	`try {`
`38`	`38`	`$result = $previewGenerator->generateImage($this->data, $this->path, true);`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function __construct(public $videos, int $taskId) {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public function handle(TaskService $taskService, SubtitleScanner $subtitleScanner): void {`
`58`		`- $this->beginTask($taskService);`
	`58`	`+ if (!$this->beginTask($taskService)) return;`
`59`	`59`
`60`	`60`	`try {`
`61`	`61`	`$summary = $this->verifyFiles($taskService, $subtitleScanner);`