A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
video thumbnail yum for music
aminnausind92fab17b158
diff --git a/app/Http/Requests/MetadataStoreRequest.php b/app/Http/Requests/MetadataStoreRequest.phpindex b0a5e190..d04b63ff 100644--- a/app/Http/Requests/MetadataStoreRequest.php+++ b/app/Http/Requests/MetadataStoreRequest.php@@ -25,6 +25,7 @@ class MetadataStoreRequest extends FormRequest {'description' => 'max:512','episode' => 'nullable|integer|min:0','season' => 'nullable|integer|min:1',+ 'poster_url' => 'nullable|url','date_released' => 'nullable|date|date_format:"F d, Y"','tags' => 'nullable|max:128','video_tags' => 'nullable|array',diff --git a/app/Http/Requests/MetadataUpdateRequest.php b/app/Http/Requests/MetadataUpdateRequest.phpindex d53b1de5..cf838cab 100644--- a/app/Http/Requests/MetadataUpdateRequest.php+++ b/app/Http/Requests/MetadataUpdateRequest.php@@ -24,6 +24,7 @@ class MetadataUpdateRequest extends FormRequest {'description' => 'nullable|max:512','episode' => 'nullable|integer|min:0','season' => 'nullable|integer|min:1',+ 'poster_url' => 'nullable|url','date_released' => 'nullable|date|date_format:"F d, Y"','tags' => 'nullable|max:128','video_tags' => 'nullable|array',diff --git a/app/Models/Metadata.php b/app/Models/Metadata.phpindex 07e1fecc..191c6c5b 100644--- a/app/Models/Metadata.php+++ b/app/Models/Metadata.php@@ -23,6 +23,7 @@ class Metadata extends Model {'season','view_count','file_size',+ 'poster_url','date_released','date_scanned',];diff --git a/database/migrations/2024_12_31_024131_add_poster_u_r_lto_videos.php b/database/migrations/2024_12_31_024131_add_poster_u_r_lto_videos.phpnew file mode 100644index 00000000..b726fbe6--- /dev/null+++ b/database/migrations/2024_12_31_024131_add_poster_u_r_lto_videos.php@@ -0,0 +1,25 @@+<?php++use Illuminate\Database\Migrations\Migration;+use Illuminate\Database\Schema\Blueprint;+use Illuminate\Support\Facades\Schema;++return new class extends Migration {+ /**+ * Run the migrations.+ */+ public function up(): void {+ Schema::table('metadata', function (Blueprint $table) {+ $table->text('poster_url')->nullable();+ });+ }++ /**+ * Reverse the migrations.+ */+ public function down(): void {+ Schema::table('metadata', function (Blueprint $table) {+ $table->dropColumn('poster_url');+ });+ }+};diff --git a/resources/js/components/cards/CategoryCard.vue b/resources/js/components/cards/CategoryCard.vueindex 5e37b736..23e9421a 100644--- a/resources/js/components/cards/CategoryCard.vue+++ b/resources/js/components/cards/CategoryCard.vue@@ -100,7 +100,7 @@ watch(<template #text> Scan </template><template #icon> <ProiconsArrowSync class="h-4 w-4" /></template></ButtonText> -->- <ButtonIcon :title="'Open Library In New Tab'" :to="`/${data?.name}`" :target="'_blank'">+ <ButtonIcon :title="'Open Library In New Tab'" :to="`/${data?.name}`"><template #icon><CircumShare1 class="h-4 w-4" /></template></ButtonIcon><Popover popoverClass="!max-w-56 rounded-lg" :buttonClass="'!p-1 ml-auto'" ref="popover">@@ -108,14 +108,14 @@ watch(<ProiconsMoreVertical class="h-4 w-4" /></template><template #content>- <div class="grid gap-4">+ <div class="space-y-4"><div class="space-y-2"><h4 class="font-medium leading-none">Manage Library</h4><p class="text-sm text-muted-foreground">Set Library Properties.</p></div>- <div class="grid gap-2">- <div class="w-full flex flex-col gap-1">+ <div class="space-y-2 [&>*]:w-full">+ <div class="flex flex-col gap-1"><FormInputLabel :field="{ text: 'Default Folder', name: 'Default Folder' }" class="font-normal" /><InputSelectid="default_folder"@@ -124,7 +124,7 @@ watch(:placeholder="'Select Default Folder'":default-item="data?.folders.findIndex((folder) => folder.id == defaultFolder?.id) ?? 0":disabled="processing"- title="Select Default Folder"+ :title="'Select Default Folder'"@selectItem="handleSetDefaultFolder":options="data?.folders.map((folder) => {diff --git a/resources/js/components/cards/SubTaskCard.vue b/resources/js/components/cards/SubTaskCard.vueindex 840f4105..4038e1ae 100644--- a/resources/js/components/cards/SubTaskCard.vue+++ b/resources/js/components/cards/SubTaskCard.vue@@ -11,7 +11,7 @@ import PulseDoughnutChart from '../charts/PulseDoughnutChart.vue';import ProiconsDelete from '~icons/proicons/delete';import ProiconsArrowReply from '~icons/proicons/arrow-reply';-const props = defineProps<{ data: SubTaskResource }>();+const props = defineProps<{ data: SubTaskResource; isScreenSmall?: boolean }>();</script><template>@@ -66,6 +66,8 @@ const props = defineProps<{ data: SubTaskResource }>();<div class="flex gap-1 items-center"><PulseDoughnutChart+ v-if="isScreenSmall ?? false"+ v-cloakclass="!h-6 !w-6 lg:!hidden":chart-options="{borderWidth: 0,diff --git a/resources/js/components/cards/TaskCard.vue b/resources/js/components/cards/TaskCard.vueindex c677e88a..d1bd4102 100644--- a/resources/js/components/cards/TaskCard.vue+++ b/resources/js/components/cards/TaskCard.vue@@ -3,7 +3,7 @@ import { type SubTaskResource, type TaskResource } from '@/types/resources';import { toFormattedDate, toFormattedDuration, within24Hrs } from '@/service/util';import { getSubTasks } from '@/service/siteAPI';-import { ref } from 'vue';+import { ref, useTemplateRef } from 'vue';import PulseDoughnutChart from '@/components/charts/PulseDoughnutChart.vue';import ButtonCorner from '@/components/inputs/ButtonCorner.vue';@@ -21,7 +21,9 @@ import ProiconsDelete from '~icons/proicons/delete';import TableBase from '../table/TableBase.vue';const props = defineProps<{ data: TaskResource; isScreenSmall?: boolean }>();+const emit = defineEmits(['clickAction']);const subTasks = ref<SubTaskResource[]>([]);+const popover = useTemplateRef('popover');const subTasksFetched = ref(false);const expanded = ref(false);@@ -37,6 +39,11 @@ const loadSubTasks = async () => {subTasksFetched.value = true;};++const handleClick = (cancel: boolean = false) => {+ popover.value?.handleClose();+ emit('clickAction', true);+};</script><template><div@@ -183,6 +190,7 @@ const loadSubTasks = async () => {:label="data.status"/><Popover+ ref="popover"popoverClass="!w-40 rounded-lg ":buttonComponent="ButtonCorner":button-attributes="{@@ -203,21 +211,15 @@ const loadSubTasks = async () => {</div><div class="grid gap-2">- <ButtonText- class="h-8 dark:!bg-neutral-950"- :title="'Scan for Folder Changes'"- :to="'/profile'"- disabled- >+ <ButtonText class="h-8 dark:!bg-neutral-950" :title="'Run Again'" disabled><template #text> Run Again </template><template #icon> <ProiconsArrowSync class="h-4 w-4" /></template></ButtonText><ButtonTextv-if="data.status_key >= 0 && data.status_key <= 1"class="h-8 text-rose-600 dark:!bg-rose-700 disabled:opacity-60"- :title="'Remove User From Server'"- @click.stop.prevent="$emit('clickAction')"- disabled+ @click.stop.prevent="handleClick(true)"+ :title="'Cancel Task'"><template #text> Cancel </template><template #icon> <ProiconsDelete class="h-4 w-4" /></template>@@ -225,9 +227,8 @@ const loadSubTasks = async () => {<ButtonTextv-elseclass="h-8 text-rose-600 dark:!bg-rose-700 disabled:opacity-60"- :title="'Remove Record From Server'"- @click.stop.prevent="$emit('clickAction')"- disabled+ @click.stop.prevent="handleClick"+ :title="'Remove Task\'s Record From Server'"><template #text> Remove </template><template #icon> <ProiconsDelete class="h-4 w-4" /></template>@@ -264,6 +265,7 @@ const loadSubTasks = async () => {v-for="subTask in subTasks.slice(0, Math.min(subTasks.length, 8))":key="subTask.id":data="subTask"+ :is-screen-small="isScreenSmall"/><TableBasev-else@@ -272,6 +274,7 @@ const loadSubTasks = async () => {:use-pagination="true":data="subTasks":row="SubTaskCard"+ :row-attributes="{ isScreenSmall }":loading="false":table-styles="'gap-4 xs:gap-2'":use-toolbar="false"diff --git a/resources/js/components/dashboard/DashboardTasks.vue b/resources/js/components/dashboard/DashboardTasks.vueindex 6552ca99..7b8860ab 100644--- a/resources/js/components/dashboard/DashboardTasks.vue+++ b/resources/js/components/dashboard/DashboardTasks.vue@@ -21,7 +21,8 @@ import LucideFolderTree from '~icons/lucide/folder-tree';import LucideFolderSync from '~icons/lucide/folder-sync';import ProiconsAdd from '~icons/proicons/add';-const confirmModal = useModal({ title: 'Remove User?', submitText: 'Confim' });+const cancelModal = useModal({ title: 'Cancel task?', submitText: 'Confim' });+const deleteModal = useModal({ title: 'Remove task from records?', submitText: 'Confim' });const searchQuery = ref('');const sortingOptions = ref([@@ -62,11 +63,10 @@ const sortingOptions = ref([},]);-const isScreenSmall = ref(false);-const cachedID = ref<number | null>(null);const taskStats = ref<TaskStatsResponse>();const tasks = ref<TaskResource[]>([]);+const isScreenSmall = ref(false);const taskPopover = useTemplateRef('taskPopover');@@ -101,7 +101,6 @@ const handleSort = async (column = 'date', dir = 1) => {return `${valueA}`?.localeCompare(`${valueB}`) * dir;});tasks.value = tempList;- console.log('sort done');return tempList;};@@ -110,17 +109,27 @@ const handleSearch = (query: string) => {searchQuery.value = query;};-const handleDelete = (id: number) => {+const handleDelete = (id: number, cancel: boolean = false) => {cachedID.value = id;- confirmModal.toggleModal(true);+ if (cancel) cancelModal.toggleModal(true);+ else deleteModal.toggleModal(true);+};++const submitCancel = async () => {+ if (cachedID.value) {+ // let request = await deleteRecord(cachedID.value);+ let request = false;+ if (request) toast.add('Success', { type: 'success', description: 'Task cancelled successfully!', life: 3000 });+ else toast.add('Error', { type: 'warning', description: 'Unable to cancel task. Please try again.', life: 3000 });+ }};const submitDelete = async () => {if (cachedID.value) {// let request = await deleteRecord(cachedID.value);let request = false;- if (request) toast.add('Success', { type: 'success', description: 'User deleted successfully!', life: 3000 });- else toast.add('Error', { type: 'warning', description: 'Unable to delete user. Please try again.', life: 3000 });+ if (request) toast.add('Success', { type: 'success', description: 'Task deleted successfully!', life: 3000 });+ else toast.add('Error', { type: 'warning', description: 'Unable to delete task. Please try again.', life: 3000 });}};@@ -132,7 +141,7 @@ const loadData = async () => {tasks.value = rawTasks?.data?.length > 0 ? rawTasks.data : [];};-const handleStartTask = async (job: 'index' | 'sync' | 'verify') => {+const handleStartTask = async (job: 'index' | 'sync' | 'verify' | 'scan') => {try {const result =job === 'index' ? await startIndexFilesTask() : job === 'sync' ? await startSyncFilesTask() : await startVerifyFilesTask();@@ -204,7 +213,7 @@ onUnmounted(() => {<ButtonTextclass="h-8 text-rose-600 dark:!bg-rose-700 disabled:opacity-60":title="'Scan and Index All Files For Metadata'"- @click.stop.prevent="$emit('clickAction')"+ @click.stop.prevent="handleStartTask('scan')"disabled><template #text> Scan All Files </template>@@ -249,11 +258,18 @@ onUnmounted(() => {@search="handleSearch"/></section>- <ModalBase :modalData="confirmModal" :action="submitDelete">+ <ModalBase :modalData="cancelModal" :action="submitCancel"><template #content><div class="relative w-auto pb-8"><p>Are you sure you want to cancel this task and all of its sub tasks?</p></div></template></ModalBase>+ <ModalBase :modalData="deleteModal" :action="submitDelete">+ <template #content>+ <div class="relative w-auto pb-8">+ <p>Are you sure you want to delete this task and all of its sub tasks?</p>+ </div>+ </template>+ </ModalBase></template>diff --git a/resources/js/components/forms/EditVideo.vue b/resources/js/components/forms/EditVideo.vueindex d08108a4..c9fe1520 100755--- a/resources/js/components/forms/EditVideo.vue+++ b/resources/js/components/forms/EditVideo.vue@@ -3,6 +3,7 @@ import { toCalendarFormattedDate } from '@/service/util';import { reactive, ref, watch } from 'vue';import { useGetVideoTags } from '@/service/queries';import { UseCreateTag } from '@/service/mutations';+import { toast } from '@/service/toaster/toastService';import FormInputNumber from '@/components/inputs/FormInputNumber.vue';import InputMultiChip from '@/components/pinesUI/InputMultiChip.vue';@@ -12,7 +13,6 @@ import DatePicker from '@/components/pinesUI/DatePicker.vue';import FormInput from '@/components/inputs/FormInput.vue';import mediaAPI from '@/service/mediaAPI.ts';import useForm from '@/composables/useForm';-import { toast } from '@/service/toaster/toastService';const emit = defineEmits(['handleFinish']);const props = defineProps(['video']);@@ -29,7 +29,7 @@ const fields = reactive([required: true,value: props.video?.title,default: props.video?.name,- subtext: 'The intended title of the episode',+ subtext: 'The intended title of the video',max: 255,},{@@ -55,6 +55,14 @@ const fields = reactive([default: 0,min: 0,},+ {+ name: 'poster_url',+ text: 'Video Thumbnail URL',+ type: 'url',+ value: props.video?.metadata?.poster_url,+ subtext: 'A thumbnail associated with the video',+ default: null,+ },{name: 'date_released',text: 'Date Release',@@ -76,9 +84,10 @@ const fields = reactive([const form = useForm({title: props.video?.title ?? props.video?.name,description: props.video?.description ?? '',- episode: props.video?.episode ?? null,- season: props.video?.season ?? null,- date_released: props.video?.date_released ? toCalendarFormattedDate(props.video?.date_released) : null,+ episode: props.video?.episode?.toString() ?? '',+ season: props.video?.season?.toString() ?? '',+ poster_url: props.video?.metadata.poster_url ?? '',+ date_released: props.video?.date_released ? toCalendarFormattedDate(props.video?.date_released) : '',video_tags: props.video?.video_tags ?? [],deleted_tags: [],});diff --git a/resources/js/components/inputs/ButtonIcon.vue b/resources/js/components/inputs/ButtonIcon.vueindex 94a6535b..3e98ed96 100755--- a/resources/js/components/inputs/ButtonIcon.vue+++ b/resources/js/components/inputs/ButtonIcon.vue@@ -11,7 +11,7 @@ const props = withDefaults(}>(),{variant: 'default',- target: '_blank',+ target: '_self',},);</script>@@ -36,7 +36,7 @@ const props = withDefaults(:type="props.type":title="props.title ?? 'Button'":aria-disabled="disabled"- :target="target ?? '_blank'"+ :target="target"><slot name="text"> </slot><slot name="icon"> </slot>diff --git a/resources/js/components/pinesUI/InputSelect.vue b/resources/js/components/pinesUI/InputSelect.vueindex 2ac0cf81..f9de2609 100755--- a/resources/js/components/pinesUI/InputSelect.vue+++ b/resources/js/components/pinesUI/InputSelect.vue@@ -19,6 +19,7 @@ const props = withDefaults(defaultItem?: number | null;options?: SelectItem[];disabled?: boolean;+ title?: string;}>(),{class: '',@@ -133,6 +134,8 @@ watch(@click="select.toggleSelect()":class="`${select.selectOpen && 'hocus:ring-0'} relative h-10 flex items-center justify-between w-full py-2 pl-3 pr-10 text-left rounded-md shadow-sm cursor-pointer text-sm border-none focus:outline-none ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700 hocus:ring-[0.125rem] hover:ring-violet-400 hover:dark:ring-violet-700 focus:ring-indigo-400 dark:focus:ring-indigo-500 text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-800 ${props.class}`":disabled="disabled"+ type="button"+ :title="title ?? 'Make Selection'"><span class="truncate">{{@@ -143,19 +146,19 @@ watch(<span class="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none"><slot name="selectButtonIcon"><svg- xmlns="http://www.w3.org/2000/svg"- viewBox="0 0 20 20"- fill="currentColor"- aria-hidden="true"- class="w-5 h-5 text-gray-400"- >- <path- fill-rule="evenodd"- d="M10 3a.75.75 0 01.55.24l3.25 3.5a.75.75 0 11-1.1 1.02L10 4.852 7.3 7.76a.75.75 0 01-1.1-1.02l3.25-3.5A.75.75 0 0110 3zm-3.76 9.2a.75.75 0 011.06.04l2.7 2.908 2.7-2.908a.75.75 0 111.1 1.02l-3.25 3.5a.75.75 0 01-1.1 0l-3.25-3.5a.75.75 0 01.04-1.06z"- clip-rule="evenodd"- ></path>- </svg>- </slot>+ xmlns="http://www.w3.org/2000/svg"+ viewBox="0 0 20 20"+ fill="currentColor"+ aria-hidden="true"+ class="w-5 h-5 text-gray-400"+ >+ <path+ fill-rule="evenodd"+ d="M10 3a.75.75 0 01.55.24l3.25 3.5a.75.75 0 11-1.1 1.02L10 4.852 7.3 7.76a.75.75 0 01-1.1-1.02l3.25-3.5A.75.75 0 0110 3zm-3.76 9.2a.75.75 0 011.06.04l2.7 2.908 2.7-2.908a.75.75 0 111.1 1.02l-3.25 3.5a.75.75 0 01-1.1 0l-3.25-3.5a.75.75 0 01.04-1.06z"+ clip-rule="evenodd"+ ></path>+ </svg>+ </slot></span></button>@@ -186,6 +189,7 @@ watch(}"@mousemove="select.selectableItemActive = item"class="relative flex items-center h-full py-2 pl-8 cursor-pointer select-none data-[disabled=true]:opacity-50 data-[disabled=true]:pointer-events-none"+ :title="item.title"><svgv-if="diff --git a/resources/js/components/pinesUI/ModalBase.vue b/resources/js/components/pinesUI/ModalBase.vueindex 53d4bce7..50971a03 100755--- a/resources/js/components/pinesUI/ModalBase.vue+++ b/resources/js/components/pinesUI/ModalBase.vue@@ -43,7 +43,7 @@ watch(<Teleport to="body"><divv-show="modalData.modalOpen || modalData.isAnimating"- class="fixed top-0 left-0 z-[25] flex items-center justify-center w-full h-screen text-neutral-900 dark:text-neutral-200"+ class="fixed top-0 left-0 z-[300] flex items-center justify-center w-full h-screen text-neutral-900 dark:text-neutral-200"v-cloak><Transitiondiff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vueindex 2cddc4a3..965e3331 100755--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@ -1,7 +1,7 @@<!-- eslint-disable no-unused-vars --><script setup lang="ts">-import type { VideoResource } from '@/types/resources';-import type { Metadata } from '@/types/model';+import type { FolderResource, VideoResource } from '@/types/resources';+import type { Metadata, Series } from '@/types/model';import { computed, onMounted, onUnmounted, ref, watch, type Ref } from 'vue';import { UseCreatePlayback } from '@/service/mutations';@@ -35,8 +35,9 @@ const { data: playbackData } = useVideoPlayback(metadata_id);const { createRecord, updateViewCount } = ContentStore;const { playbackHeatmap } = storeToRefs(appStore);-const { stateVideo } = storeToRefs(ContentStore) as {+const { stateVideo, stateFolder } = storeToRefs(ContentStore) as {stateVideo: Ref<VideoResource | { id?: number; metadata?: Metadata; path?: string }>;+ stateFolder: Ref<FolderResource | { id?: number; series?: Series; path?: string }>;};const emit = defineEmits(['loadedData', 'seeked', 'play', 'pause', 'ended']);@@ -169,12 +170,14 @@ const handleProgress = (override = false) => {let progress = player.value.currentTime / player.value.duration;+ if (isNaN(progress) || !progress) return;+progressCache.value = [...progressCache.value,{ metadata_id: stateVideo.value?.metadata?.id, progress: parseFloat(progress.toFixed(2)) * 1000 },];- if (stateVideo.value?.metadata?.id && !isNaN(progress) && (progressCache.value.length >= playbackDataBuffer || override)) {+ if (progressCache.value.length >= playbackDataBuffer || override) {createPlayback({ entries: progressCache.value });progressCache.value = [];}@@ -198,7 +201,6 @@ const onPlayerEnded = (event: any) => {// console.log(event.type);// player.setPlaying(false);emit('ended');- console.log('end', player?.value?.currentTime);// if (player.value?.loop) handlePlayVideo(true);};@@ -241,7 +243,6 @@ const playerStateChanged = (event: any) => {const cacheVolume = () => {if (player.value) {localStorage.setItem('videoVolume', player.value.volume.toString());- console.log('Volume saved:', player.value.volume);}};@@ -278,9 +279,11 @@ onUnmounted(() => {id="vid-source"width="100%"controls+ preload="none"type="video/mp4":src="stateVideo?.path ? `../${stateVideo?.path}` : ''"- :class="`focus:outline-none flex ${stateVideo?.path ? '' : 'aspect-video'}`"+ :class="`focus:outline-none flex object-cover ${stateVideo?.path ? '' : 'aspect-video'}`"+ :poster="stateVideo?.metadata?.poster_url ?? stateFolder.series?.thumbnail_url ?? ''"ref="player"@play="onPlayerPlay"@pause="onPlayerPause"@@ -337,4 +340,9 @@ onUnmounted(() => {opacity: 0;}}++video {+ object-fit: cover; /*to cover all the box*/+ /* background: transparent url('') 50% 50% / cover no-repeat; */+}</style>diff --git a/resources/js/types/model.ts b/resources/js/types/model.tsindex b22c2db0..5f7fd85c 100644--- a/resources/js/types/model.ts+++ b/resources/js/types/model.ts@@ -35,6 +35,7 @@ export interface Metadata {date_released_formatted: any;video?: Video;editor?: User;+ poster_url?: string;playbacks?: Playback[];video_tags?: VideoTag[];}diff --git a/resources/js/types/resources.ts b/resources/js/types/resources.tsindex 5dfd4e6e..37cb1768 100644--- a/resources/js/types/resources.ts+++ b/resources/js/types/resources.ts@@ -35,6 +35,7 @@ export interface MetadataResource {attributes: {title?: string;description?: string;+ poster_url?: string;season?: number;episode?: number;duration?: number;