Skip to content

A self-hosted media server and file management system

chore: code smells

aminnausin79fa50067d53
diff --git a/app/Helpers/RequestPresets.php b/app/Helpers/RequestPresets.php
new file mode 100644
index 00000000..55aabb33
--- /dev/null
+++ b/app/Helpers/RequestPresets.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Support;
+
+class RequestPresets {
+ public const NON_NEGATIVE_INT = 'nullable|integer|min:0';
+
+ public const PERCENTAGE = 'nullable|integer|min:0|max:100';
+
+ public const LONG_TEXT = 'nullable|max:255';
+
+ public const OPTIONAL_DATE = 'nullable|date|date_format:"F d, Y"';
+}
diff --git a/app/Http/Requests/MetadataStoreRequest.php b/app/Http/Requests/MetadataStoreRequest.php
index c9668ffb..5dd95f45 100644
--- a/app/Http/Requests/MetadataStoreRequest.php
+++ b/app/Http/Requests/MetadataStoreRequest.php
@@ -2,6 +2,7 @@
namespace App\Http\Requests;
+use App\Support\RequestPresets;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
@@ -32,8 +33,8 @@ class MetadataStoreRequest extends FormRequest {
'video_id' => 'required|integer',
'title' => 'required|max:255',
'description' => 'nullable',
- 'episode' => 'nullable|integer|min:0',
- 'season' => 'nullable|integer|min:0',
+ 'episode' => RequestPresets::NON_NEGATIVE_INT,
+ 'season' => RequestPresets::NON_NEGATIVE_INT,
'poster_url' => 'nullable|url',
'date_released' => 'nullable|date|date_format:"F d, Y"',
'tags' => 'nullable|max:128',
diff --git a/app/Http/Requests/MetadataUpdateRequest.php b/app/Http/Requests/MetadataUpdateRequest.php
index c6c79cd2..ad1ae3ac 100644
--- a/app/Http/Requests/MetadataUpdateRequest.php
+++ b/app/Http/Requests/MetadataUpdateRequest.php
@@ -2,6 +2,7 @@
namespace App\Http\Requests;
+use App\Support\RequestPresets;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
@@ -31,8 +32,8 @@ class MetadataUpdateRequest extends FormRequest {
return [
'title' => 'required|max:255',
'description' => 'nullable',
- 'episode' => 'nullable|integer|min:0',
- 'season' => 'nullable|integer|min:0',
+ 'episode' => RequestPresets::NON_NEGATIVE_INT,
+ 'season' => RequestPresets::NON_NEGATIVE_INT,
'poster_url' => 'nullable|url',
'date_released' => 'nullable|date|date_format:"F d, Y"',
'tags' => 'nullable|max:128',
diff --git a/app/Http/Requests/SeriesStoreRequest.php b/app/Http/Requests/SeriesStoreRequest.php
index ce7a3c43..4ed36e00 100644
--- a/app/Http/Requests/SeriesStoreRequest.php
+++ b/app/Http/Requests/SeriesStoreRequest.php
@@ -2,6 +2,7 @@
namespace App\Http\Requests;
+use App\Support\RequestPresets;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
@@ -33,10 +34,10 @@ class SeriesStoreRequest extends FormRequest {
'title' => 'required|max:255',
'description' => 'nullable',
'studio' => 'nullable|max:255',
- 'rating' => 'nullable|integer|min:0|max:100',
- 'seasons' => 'nullable|integer|min:0',
- 'episodes' => 'nullable|integer|min:0',
- 'films' => 'nullable|integer|min:0',
+ 'rating' => RequestPresets::NON_NEGATIVE_INT + '|max:100',
+ 'seasons' => RequestPresets::NON_NEGATIVE_INT,
+ 'episodes' => RequestPresets::NON_NEGATIVE_INT,
+ 'films' => RequestPresets::NON_NEGATIVE_INT,
'date_start' => 'nullable|date|date_format:"F d, Y"',
'date_end' => 'nullable|date|date_format:"F d, Y"',
'thumbnail_url' => 'nullable|url',
diff --git a/app/Http/Requests/SeriesUpdateRequest.php b/app/Http/Requests/SeriesUpdateRequest.php
index bdc875f0..c93c405b 100644
--- a/app/Http/Requests/SeriesUpdateRequest.php
+++ b/app/Http/Requests/SeriesUpdateRequest.php
@@ -2,6 +2,7 @@
namespace App\Http\Requests;
+use App\Support\RequestPresets;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
@@ -32,10 +33,10 @@ class SeriesUpdateRequest extends FormRequest {
'title' => 'required|max:255',
'description' => 'nullable',
'studio' => 'nullable|max:255',
- 'rating' => 'nullable|integer|min:0|max:100',
- 'seasons' => 'nullable|integer|min:0',
- 'episodes' => 'nullable|integer|min:0',
- 'films' => 'nullable|integer|min:0',
+ 'rating' => RequestPresets::NON_NEGATIVE_INT + '|max:100',
+ 'seasons' => RequestPresets::NON_NEGATIVE_INT,
+ 'episodes' => RequestPresets::NON_NEGATIVE_INT,
+ 'films' => RequestPresets::NON_NEGATIVE_INT,
'date_start' => 'nullable|date|date_format:"F d, Y"',
'date_end' => 'nullable|date|date_format:"F d, Y"',
'thumbnail_url' => 'nullable|url',
diff --git a/app/Http/Requests/VideoUpdateRequest.php b/app/Http/Requests/VideoUpdateRequest.php
index 4f96ca45..7a34e7b9 100755
--- a/app/Http/Requests/VideoUpdateRequest.php
+++ b/app/Http/Requests/VideoUpdateRequest.php
@@ -2,6 +2,7 @@
namespace App\Http\Requests;
+use App\Support\RequestPresets;
use Illuminate\Foundation\Http\FormRequest;
class VideoUpdateRequest extends FormRequest {
@@ -21,7 +22,7 @@ class VideoUpdateRequest extends FormRequest {
return [
'title' => 'required|max:255',
'description' => 'nullable',
- 'episode' => 'nullable|integer|min:0',
+ 'episode' => RequestPresets::NON_NEGATIVE_INT,
'season' => 'nullable|integer|min:1',
];
}
diff --git a/resources/js/components/pinesUI/ToastController.vue b/resources/js/components/pinesUI/ToastController.vue
index d75f0762..93eb9d68 100755
--- a/resources/js/components/pinesUI/ToastController.vue
+++ b/resources/js/components/pinesUI/ToastController.vue
@@ -105,10 +105,18 @@ function positionToasts() {
yBuffer += 16;
}
- if (messages.value.length <= props.maxVisibleToasts) {
- return;
- }
+ handleToastsOverflow(toastElements);
+ } catch (error) {
+ console.log(error);
+ }
+}
+function handleToastsOverflow(toastElements: HTMLElement[]) {
+ if (messages.value.length <= props.maxVisibleToasts) {
+ return;
+ }
+
+ try {
let burnToast = document.getElementById(`${messages.value[props.maxVisibleToasts]?.id}`);
if (!burnToast) {
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index 15ec2f93..018d4617 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { FolderResource, UserResource, VideoResource } from '@/types/resources';
import type { ContextMenuItem, PopoverItem } from '@/types/types';
-import type { Metadata, Series } from '@/types/model';
+import type { Series } from '@/types/model';
import { computed, nextTick, onMounted, onUnmounted, ref, useTemplateRef, watch, type ComputedRef, type Ref } from 'vue';
import { handleStorageURL, isInputLikeElement, isMobileDevice, toFormattedDate, toFormattedDuration } from '@/service/util';
@@ -84,7 +84,7 @@ const createPlayback = UseCreatePlayback().mutate;
// V-models for inputs
const timeDuration = computed(() => {
- return stateVideo.value?.metadata?.duration ?? 0;
+ return stateVideo.value?.metadata?.duration ?? 1;
});
const timeElapsed = ref(0);
const timeSeeking = ref('');