Skip to content

A self-hosted media server and file management system

chore: code smells

aminnausinc63d1d1b1941
diff --git a/app/Http/Controllers/Api/V1/MetadataController.php b/app/Http/Controllers/Api/V1/MetadataController.php
index 5bdce765..987e8e32 100644
--- a/app/Http/Controllers/Api/V1/MetadataController.php
+++ b/app/Http/Controllers/Api/V1/MetadataController.php
@@ -75,7 +75,7 @@ class MetadataController extends Controller {
$validated = $request->validated();
if (empty($metadata->video)) {
- throw new \Exception('Media does not exist');
+ throw new MediaDoesNotExistException('Media does not exist');
}
$validated['editor_id'] = Auth::id();
@@ -94,7 +94,7 @@ class MetadataController extends Controller {
$validated = $request->validated();
if (empty($metadata->video)) {
- throw new \Exception('Song does not exist');
+ throw new MediaDoesNotExistException('Song does not exist');
}
unset($validated['track']);
@@ -108,3 +108,6 @@ class MetadataController extends Controller {
}
}
}
+
+class MediaDoesNotExistException extends \Exception {
+}
diff --git a/app/Services/Image/Downloader.php b/app/Services/Image/Downloader.php
index 45a62a71..6bfafae3 100644
--- a/app/Services/Image/Downloader.php
+++ b/app/Services/Image/Downloader.php
@@ -8,7 +8,8 @@ use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
class Downloader {
- public function __construct() {}
+ public function __construct() {
+ }
// TODO: Eventually use this service with DI in verifyFiles and verifyFolders to download thumbnail urls ... currently using static function in verifyFolders
public function importExternalImageAsURL($url, $compositePath) {
@@ -23,7 +24,6 @@ class Downloader {
return VerifyFiles::getPathUrl($path);
}
} catch (\Throwable $th) {
- // throw $th;
Log::warning('Unable to download thumbnail image from ' . $url . ' : ' . $th->getMessage());
}
diff --git a/database/factories/MetadataFactory.php b/database/factories/MetadataFactory.php
index 36e2399d..8ca8b79f 100644
--- a/database/factories/MetadataFactory.php
+++ b/database/factories/MetadataFactory.php
@@ -15,10 +15,8 @@ class MetadataFactory extends Factory {
* @return array<string, mixed>
*/
public function definition(): array {
- // $video = Video::factory()->create();
return [
'composite_id' => "{$this->faker->word}/{$this->faker->word}",
- // 'video_id' => $video->id,
'title' => $this->faker->sentence(3),
'description' => 'Fake Artist - something',
'album' => $this->faker->word,
diff --git a/resources/js/components/cards/LibraryFolderCardMenu.vue b/resources/js/components/cards/LibraryFolderCardMenu.vue
index b271d1aa..46881d78 100644
--- a/resources/js/components/cards/LibraryFolderCardMenu.vue
+++ b/resources/js/components/cards/LibraryFolderCardMenu.vue
@@ -1,6 +1,4 @@
<script setup lang="ts">
-import type { FolderResource } from '@/types/resources';
-
import ButtonText from '@/components/inputs/ButtonText.vue';
import ProiconsDelete from '~icons/proicons/delete';
diff --git a/resources/js/components/forms/EditLyrics.vue b/resources/js/components/forms/EditLyrics.vue
index 86dc9842..4e675a93 100644
--- a/resources/js/components/forms/EditLyrics.vue
+++ b/resources/js/components/forms/EditLyrics.vue
@@ -2,12 +2,10 @@
import type { LyricsUpdateRequest } from '@/types/requests';
import type { VideoResource } from '@/types/resources';
import type { FormField } from '@/types/types';
-import type { Ref } from 'vue';
import { generateLyricsSearchQuery, updateLyrics } from '@/service/lyricsService';
import { onMounted, reactive, watch } from 'vue';
import { toFormattedDuration } from '@/service/util';
-import { useContentStore } from '@/stores/ContentStore';
import { useLyricStore } from '@/stores/LyricStore';
import { storeToRefs } from 'pinia';
import { toast } from '@/service/toaster/toastService';
@@ -27,7 +25,7 @@ const { isLoadingLyrics, stateLyrics, searchResults, hasSearchedForLyrics, dirty
const { handlePreviewLyrics, handleSelectLyrics, handleSearchSyncedLyrics, resetLyrics } = useLyricStore();
const emit = defineEmits(['handleFinish', 'preview']);
-const props = defineProps<{ video: VideoResource }>(); // TODO: Eventually use this instead of stateVideo so that it is decoupled from state and can work alone
+const props = defineProps<{ video: VideoResource }>();
const fields = reactive<FormField[]>([
{
diff --git a/resources/js/components/inputs/FormInputNumber.vue b/resources/js/components/inputs/FormInputNumber.vue
index d1f9547e..d37eaf69 100644
--- a/resources/js/components/inputs/FormInputNumber.vue
+++ b/resources/js/components/inputs/FormInputNumber.vue
@@ -19,7 +19,7 @@ const decrementNumber = () => {
};
const addToNumber = (change: 1 | -1) => {
- if (!model.value || !(typeof model.value == 'number')) {
+ if (!model.value || typeof model.value != 'number') {
model.value = 0;
return;
}
diff --git a/resources/js/components/pinesUI/BaseAccordion.vue b/resources/js/components/pinesUI/BaseAccordion.vue
index efa5e006..4a491e72 100644
--- a/resources/js/components/pinesUI/BaseAccordion.vue
+++ b/resources/js/components/pinesUI/BaseAccordion.vue
@@ -21,7 +21,6 @@ function setActiveAccordion(id: string) {
}
</script>
<template>
- <!-- :class="{ 'rotate-180': activeAccordion == id }" -->
<div class="relative w-full mx-auto overflow-hidden text-sm font-normal bg-white border border-gray-200 divide-y divide-gray-200 rounded-md">
<div v-for="accordion in accordions" :key="accordion.id" class="cursor-pointer group">
<button @click="setActiveAccordion(accordion.id)" class="flex items-center justify-between w-full p-4 text-left select-none group-hover:underline">
diff --git a/resources/js/components/pinesUI/BasePopover.vue b/resources/js/components/pinesUI/BasePopover.vue
index 488a3b78..b16e9739 100644
--- a/resources/js/components/pinesUI/BasePopover.vue
+++ b/resources/js/components/pinesUI/BasePopover.vue
@@ -71,15 +71,11 @@ const adjustPopoverPosition = () => {
const popoverRect = popover.value.$el.getBoundingClientRect();
const viewportWidth = window.innerWidth;
- // console.log(viewportWidth - popoverRect.right - margin);
-
if (viewportWidth > popoverRect.width + margin * 2 && viewportWidth - popoverRect.right - margin < 0) {
adjustment = viewportWidth - popoverRect.right - margin;
} else if (viewportWidth > popoverRect.width + margin * 2 && popoverRect.left <= margin) {
adjustment = margin * 2;
- // console.log(adjustment);
} else {
- // console.log(viewportWidth, popoverRect.width + margin * 2, popoverRect.left);
return;
}
diff --git a/resources/js/components/video/VideoTooltipSlider.vue b/resources/js/components/video/VideoTooltipSlider.vue
index 6e031dfa..58403a75 100644
--- a/resources/js/components/video/VideoTooltipSlider.vue
+++ b/resources/js/components/video/VideoTooltipSlider.vue
@@ -63,8 +63,6 @@ function calculateTooltipPosition(event: MouseEvent) {
const rect = target.getBoundingClientRect();
const width = tooltip.value.offsetWidth;
- // console.log(rect.left, event.clientX, tooltipWidth.value / 2, event.clientX - rect.left, event.clientX - rect.left - tooltipWidth.value / 2);
-
let left = Math.max(event.clientX - rect.left - width / 2 + props.offset, props.offset);
if (left + width - props.offset > rect.width) {
@@ -72,15 +70,6 @@ function calculateTooltipPosition(event: MouseEvent) {
}
tooltip.value.style.transform = `translateX(${left}px)`;
-
- // if (left + tooltipWidth.value / 2 + props.offset > rect.width) {
- // tooltip.value.style.right = `${props.offset}px`;
- // tooltip.value.style.removeProperty('left');
- // return;
- // }
-
- // tooltip.value.style.left = `${left}px`;
- // tooltip.value.style.removeProperty('right');
}
const tooltipToggle = (state: boolean = true) => {
diff --git a/resources/js/service/__test__/lyricsService.test.ts b/resources/js/service/__test__/lyricsService.test.ts
index 2b9f1778..d1efe35c 100644
--- a/resources/js/service/__test__/lyricsService.test.ts
+++ b/resources/js/service/__test__/lyricsService.test.ts
@@ -1,6 +1,6 @@
-import { fetchSyncedLyrics, searchSyncedLyrics, updateLyrics, generateLyricsSearchQuery } from '../lyricsService';
-import { API } from '../api';
+import { fetchSyncedLyrics, searchSyncedLyrics, generateLyricsSearchQuery } from '@/service/lyricsService';
import { describe, expect, it, vi } from 'vitest';
+import { API } from '@/service/api';
vi.mock('../api', () => ({
API: {
diff --git a/tests/Feature/MetadataControllerTest.php b/tests/Feature/MetadataControllerTest.php
index 36932cf7..101e5012 100644
--- a/tests/Feature/MetadataControllerTest.php
+++ b/tests/Feature/MetadataControllerTest.php
@@ -83,9 +83,6 @@ class MetadataControllerTest extends TestCase {
$metadata = Metadata::factory()->create();
$payload = [
'lyrics' => 'Synced lyrics here',
- 'album' => 'Test Album',
- 'artist' => 'Test Artist',
- 'track' => 'Should be ignored',
];
$this->patchJson("/api/metadata/{$metadata->id}/lyrics", $payload)
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 102362e8..9fb068b3 100755
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -5,15 +5,15 @@ namespace Tests;
use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
abstract class TestCase extends BaseTestCase {
- // TODO: use CreatesApplication;
- // TODO: use RefreshDatabase;
-
protected function setUp(): void {
parent::setUp();
// 🚨 Safety check to prevent test from wiping real data
if (env('DB_DATABASE') === config('app.name')) {
- throw new \Exception('🚫 Tests are running on your development database! Check DB_DATABASE in .env or phpunit.xml');
+ throw new InvalidTestEnvironmentException('🚫 Tests are running on your development database! Check DB_DATABASE in .env or phpunit.xml');
}
}
}
+
+class InvalidTestEnvironmentException extends \Exception {
+}
diff --git a/tests/Unit/LrcLibServiceTest.php b/tests/Unit/LrcLibServiceTest.php
index 6ee5710b..78b34c52 100644
--- a/tests/Unit/LrcLibServiceTest.php
+++ b/tests/Unit/LrcLibServiceTest.php
@@ -40,7 +40,6 @@ class LrcLibServiceTest extends TestCase {
]);
$metadata = Metadata::factory()->make([
- 'title' => 'Test Song',
'description' => 'Wrong Artist',
]);
diff --git a/vite.config.ts b/vite.config.ts
index 5ae683c4..764bec90 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,4 +1,3 @@
-// import { fileURLToPath, URL } from 'node:url';
import { defineConfig, loadEnv } from 'vite';
import { fileURLToPath } from 'node:url';