Skip to content

A self-hosted media server and file management system

chore: code smells

aminnausinb71e8846343c
diff --git a/app/Jobs/VerifyFiles.php b/app/Jobs/VerifyFiles.php
index e2cdc30b..b3261f3a 100755
--- a/app/Jobs/VerifyFiles.php
+++ b/app/Jobs/VerifyFiles.php
@@ -7,6 +7,7 @@ use App\Enums\TaskStatus;
use App\Models\Metadata;
use App\Models\Record;
use App\Services\TaskService;
+use App\Traits\HasUpsert;
use Illuminate\Bus\Batchable;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
@@ -23,7 +24,7 @@ use Symfony\Component\Process\Exception\ProcessFailedException;
use Symfony\Component\Process\Process;
class VerifyFiles implements ShouldQueue {
- use Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+ use Batchable, Dispatchable, HasUpsert, InteractsWithQueue, Queueable, SerializesModels;
/**
* Execute the job.
@@ -323,19 +324,7 @@ class VerifyFiles implements ShouldQueue {
$ids = array_column($transactions, 'id');
$error = true;
-
- $message = sprintf(
- 'Cannot verify file metadata: %s | Cancelling %d updates and %d checks with IDs: %s',
- $th->getMessage(),
- count($transactions),
- count($this->videos),
- json_encode($ids)
- );
-
- dump($message);
- Log::error($message);
-
- throw $th;
+ $this->handleError('Cannot verify file metadata', $th, $ids, count($transactions), count($this->videos));
}
try {
@@ -378,18 +367,7 @@ class VerifyFiles implements ShouldQueue {
return $summary;
} catch (\Throwable $th) {
$ids = array_column($transactions, 'id');
-
- $message = sprintf(
- 'Error inserting verified file metadata: %s | Cancelling %d updates with IDs: %s',
- $th->getMessage(),
- count($transactions),
- json_encode($ids)
- );
-
- dump($message);
- Log::error($message);
-
- throw $th;
+ $this->handleError('Error inserting verified file metadata', $th, $ids, count($transactions));
}
}
diff --git a/app/Jobs/VerifyFolders.php b/app/Jobs/VerifyFolders.php
index aa0ca1ca..27c12d2d 100644
--- a/app/Jobs/VerifyFolders.php
+++ b/app/Jobs/VerifyFolders.php
@@ -7,6 +7,7 @@ use App\Exceptions\DataLostException;
use App\Models\Series;
use App\Models\SubTask;
use App\Services\TaskService;
+use App\Traits\HasUpsert;
use Illuminate\Bus\Batchable;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
@@ -19,7 +20,7 @@ use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
class VerifyFolders implements ShouldQueue {
- use Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+ use Batchable, Dispatchable, HasUpsert, InteractsWithQueue, Queueable, SerializesModels;
protected $taskId;
@@ -148,17 +149,7 @@ class VerifyFolders implements ShouldQueue {
} catch (\Throwable $th) {
$error = true;
- $message = sprintf(
- 'Error inserting verified folder series data: %s | Cancelling %d updates and %d checks',
- $th->getMessage(),
- count($transactions),
- count($this->folders)
- );
-
- dump($message);
- Log::error($message);
-
- throw $th;
+ $this->handleError('Error inserting verified folder series data', $th, [], count($transactions), count($this->folders));
}
}
@@ -176,17 +167,7 @@ class VerifyFolders implements ShouldQueue {
} catch (\Throwable $th) {
$ids = array_column($transactions, 'id');
- $message = sprintf(
- 'Error inserting verified folder series data: %s | Cancelling %d updates with IDs: %s',
- $th->getMessage(),
- count($transactions),
- json_encode($ids)
- );
-
- dump($message);
- Log::error($message);
-
- throw $th;
+ $this->handleError('Error inserting verified folder series data', $th, $ids, count($transactions));
}
}
diff --git a/app/Traits/HasUpsert.php b/app/Traits/HasUpsert.php
new file mode 100644
index 00000000..41ab8b63
--- /dev/null
+++ b/app/Traits/HasUpsert.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Traits;
+
+use Illuminate\Support\Facades\Log;
+
+trait HasUpsert {
+ /**
+ * Generates tag relationships for any model
+ *
+ * @param string $context Custom Error Message
+ * @param Throwable $th Original Error
+ * @param array $transactions Upsert Transactions
+ * @param int $updateCount Number of updates attempted
+ * @param int|null $checkCount Number of checks attempted (optional)
+ *
+ * @return never
+ *
+ */
+ public function handleError(string $context, \Throwable $th, array $ids, int $updateCount, ?int $checkCount = null): never {
+ $message = sprintf(
+ '%s: %s | Cancelling %d updates%s',
+ $context,
+ $th->getMessage(),
+ $updateCount,
+ $checkCount !== null ? " and $checkCount checks" : ''
+ );
+
+ if (! empty($ids)) {
+ $message .= ' with IDs: ' . json_encode($ids);
+ }
+
+ dump($message);
+ Log::error($message);
+
+ throw $th;
+ }
+}
diff --git a/resources/js/composables/useMetaData.ts b/resources/js/composables/useMetaData.ts
index a74eacd3..fde3314c 100644
--- a/resources/js/composables/useMetaData.ts
+++ b/resources/js/composables/useMetaData.ts
@@ -15,8 +15,6 @@ export default function useMetaData(data: Ref<VideoResource>, skipBaseURL: boole
const duration = computed(() => toFormattedDuration(data.value.duration) ?? 'N/A');
const views = computed(() => generateViewsTag(data.value.view_count));
const description = computed(() => generateDescription(data.value.description ?? ''));
- const url = computed(() => encodeURI((skipBaseURL ? '' : document.location.origin) + route.path + `?video=${data.value.id}`));
- const fileSize = computed(() => (data.value.file_size ? formatFileSize(data.value.file_size) : ''));
function generateEpisodeTag(episodeData: VideoResource) {
return episodeData.episode && episodeData.metadata?.media_type === MediaType.AUDIO ? `${episodeData.episode}. ` : '';
@@ -62,7 +60,5 @@ export default function useMetaData(data: Ref<VideoResource>, skipBaseURL: boole
duration,
views,
description,
- url,
- fileSize,
};
}