A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
before prettier
aminnausin8649bc27144f
diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.phpindex ee59126c..b02d07b5 100755--- a/app/Http/Controllers/Api/V1/CategoryController.php+++ b/app/Http/Controllers/Api/V1/CategoryController.php@@ -4,7 +4,9 @@ namespace App\Http\Controllers\Api\V1;use App\Http\Controllers\Controller;use App\Http\Requests\CategoryRequest;+use App\Http\Resources\CategoryResource;use App\Http\Resources\FolderResource;+use App\Models\Category;use App\Models\Folder;use App\Traits\HttpResponses;use Illuminate\Http\Request;@@ -34,13 +36,13 @@ class CategoryController extends Controller/*** Display the specified resource.- * Get Folder with video count from folder ID+ * Get Category with count of folders with the category id*- * @param int $video_id+ * @param int $category_id* @return \Illuminate\Http\Response*/- public function show(Folder $folder)+ public function show(Category $category){- return new FolderResource(Folder::withCount(['videos'])->find($folder->id));+ return new CategoryResource(Category::withCount(['folders'])->find($category->id));}}diff --git a/app/Http/Resources/CategoryResource.php b/app/Http/Resources/CategoryResource.phpindex 909a24c8..8847aff0 100755--- a/app/Http/Resources/CategoryResource.php+++ b/app/Http/Resources/CategoryResource.php@@ -16,14 +16,9 @@ class CategoryResource extends JsonResource{return ['id' => (string)$this->id,- 'attributes' => [- 'name' => $this->name,- 'path' => $this->path,- 'file_count' => $this->videos_count- ],- 'relationships' => [- 'folder_id' => (string)$this->category->id,- ]+ 'name' => $this->name,+ 'folders_count' => $this->folders->count(),+ 'folders' => FolderResource::collection($this->folders),];}}diff --git a/app/Http/Resources/FolderResource.php b/app/Http/Resources/FolderResource.phpindex 4ffde03b..6000f7a1 100755--- a/app/Http/Resources/FolderResource.php+++ b/app/Http/Resources/FolderResource.php@@ -16,14 +16,10 @@ class FolderResource extends JsonResource{return ['id' => (string)$this->id,- 'attributes' => [- 'name' => $this->name,- 'path' => $this->path,- 'file_count' => $this->videos_count- ],- 'relationships' => [- 'category_id' => (string)$this->category->id,- ],+ 'name' => $this->name,+ 'path' => $this->path,+ 'file_count' => $this->videos->count(),+ 'category_id' => (string)$this->category->id,'series' => $this->series];}diff --git a/resources/js/components/cards/FolderCard.vue b/resources/js/components/cards/FolderCard.vueindex f5781a59..4eafa859 100755--- a/resources/js/components/cards/FolderCard.vue+++ b/resources/js/components/cards/FolderCard.vue@@ -14,7 +14,7 @@ const folderLink = ref(`/${props.categoryName}/${props.folder.attributes.name}`)<RouterLink :to="folderLink"class="text-left relative flex flex-col gap-4 lg:gap-2 sm:flex-row flex-wrap rounded-lg dark:bg-primary-dark-800/70 bg-primary-800 dark:hover:bg-primary-dark-600 hover:bg-gray-200 dark:text-white shadow p-3 w-full group cursor-pointer divide-gray-300 dark:divide-gray-400"><section class="flex justify-between gap-4 w-full">- <h2 class="text-xl w-full truncate">{{ props.folder.attributes.name }}</h2>+ <h2 class="text-xl w-full truncate" :title="props.folder.attributes.name">{{ props.folder.attributes.name }}</h2><div class="flex justify-end gap-1"><ButtonCorner :positionClasses="'w-7 h-7'":textClasses="'hover:text-neutral-900 dark:hover:text-violet-400'"@@ -36,10 +36,10 @@ const folderLink = ref(`/${props.categoryName}/${props.folder.attributes.name}`)</div></section><section class="flex flex-col sm:flex-row sm:justify-between w-full">- <h3 class="text-neutral-500 w-full text-wrap truncate sm:text-nowrap">+ <h3 class="text-neutral-500 w-full text-wrap truncate sm:text-nowrap" :title="`${props.folder.attributes.file_count} Episode${props.folder.attributes.file_count !== 1 ? 's' : ''}`">{{ props.folder.attributes.file_count }} Episode{{ props.folder.attributes.file_count !== 1 ? 's' : '' }}</h3>- <h3 class="truncate text-nowrap sm:text-right text-neutral-500 w-full">+ <h3 class="truncate text-nowrap sm:text-right text-neutral-500 w-fit"><!-- some other folder statistic or data like number of seasons or if its popular or something --></h3></section>diff --git a/resources/js/components/cards/RecordCard.vue b/resources/js/components/cards/RecordCard.vueindex 24abee90..f881f102 100755--- a/resources/js/components/cards/RecordCard.vue+++ b/resources/js/components/cards/RecordCard.vue@@ -22,7 +22,7 @@ const videoLink = computed(() => {<divclass="text-left relative flex flex-col gap-4 lg:gap-2 sm:flex-row flex-wrap rounded-lg dark:bg-primary-dark-800/70 bg-primary-800 dark:hover:bg-primary-dark-600 hover:bg-gray-200 dark:text-white shadow p-3 w-full group cursor-pointer divide-gray-300 dark:divide-gray-400"><section class="flex justify-between gap-4 w-full">- <h2 class="text-xl w-full truncate">{{ props.record.relationships.video_name }}</h2>+ <h2 class="text-xl w-full truncate" :title=(props.record.relationships.video_name)>{{ props.record.relationships.video_name }}</h2><div class="flex justify-end gap-1"><ButtonCorner :positionClasses="'w-7 h-7'":textClasses="'hover:text-neutral-900 dark:hover:text-violet-400'"diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vueindex 063b477b..c8af4a89 100755--- a/resources/js/components/cards/VideoCard.vue+++ b/resources/js/components/cards/VideoCard.vue@@ -21,22 +21,23 @@ watch(props, handlePropsUpdate, { immediate: true });<template><RouterLink :class="{ 'ring-violet-600/70 ring-[0.125rem]': (props?.currentID === props.data?.id) }":to="metaData.fields.url"- class="flex flex-wrap flex-col sm:flex-row sm:flex-nowrap gap-x-8 gap-y-4 p-3 w-full shadow rounded-md ring-inset cursor-pointer dark:bg-primary-dark-800/70 dark:hover:bg-violet-700/70 bg-gray-100 hover:bg-violet-400/30 odd:bg-violet-100 dark:odd:bg-primary-dark-600"+ class="flex flex-wrap flex-col gap-x-8 gap-y-4 p-3 w-full shadow rounded-md ring-inset cursor-pointer dark:bg-primary-dark-800/70 dark:hover:bg-violet-700/70 bg-gray-100 hover:bg-violet-400/30 odd:bg-violet-100 dark:odd:bg-primary-dark-600":data-id="props.data?.id" :data-path="`../${props.data?.attributes.path}`"@click.left.stop.prevent.capture="handlePlay">- <section class="flex justify-between gap-4 w-full items-start sm:items-center">+ <section class="flex justify-between gap-4 w-full items-start"><h3 class="w-full line-clamp-2 sm:line-clamp-1">{{ metaData?.fields?.title }}</h3>- <h3 class="text-sm sm:text-base flex justify-end text-nowrap dark:text-neutral-300 text-neutral-500">- {{ metaData?.fields?.views }}+ <h3 class="text-nowrap text-neutral-500 dark:text-neutral-400">+ {{ metaData?.fields?.duration }}</h3></section><section- class="text-sm sm:text-base flex justify-between sm:w-auto items-center dark:text-neutral-300 text-neutral-500 gap-8">- <h3 class="text-nowrap">- {{ metaData?.fields?.duration }}+ class="text-sm sm:text-base flex justify-between sm:w-auto items-center text-neutral-500 dark:text-neutral-400 gap-8">+ <h3 class="text-sm sm:text-base flex justify-end text-nowrap">+ {{ metaData?.fields?.views }}</h3>+<h3 class="line-clamp-1 sm:min-w-40">{{ props.data?.attributes.date }}</h3>diff --git a/resources/js/components/forms/EditVideo.vue b/resources/js/components/forms/EditVideo.vueindex fc512885..a809ebc6 100755--- a/resources/js/components/forms/EditVideo.vue+++ b/resources/js/components/forms/EditVideo.vue@@ -56,6 +56,15 @@ const fields = reactive([value: props.video?.attributes?.release_date ?? null,default: null,},+ {+ name: 'tags',+ text: 'Tags',+ type: 'text',+ value: props.video?.attributes.tags,+ default: props.video?.attributes.tags,+ subtext: 'Tags that describe the video',+ max: 128+ },]);const form = useForm({@@ -63,7 +72,8 @@ const form = useForm({description: props.video?.attributes.description ?? '',episode: props.video?.attributes.episode ?? null,season: props.video?.attributes.season ?? null,- date_released: props.video?.attributes.date_released ?? null+ date_released: props.video?.attributes.date_released ?? null,+ tags: props.video?.attributes.tags ?? null});const handleSubmit = async () => {@@ -71,12 +81,12 @@ const handleSubmit = async () => {async (fields) => {console.log(props.video);- return mediaAPI.updateMetadata(props.video.relationships.metadata.id, fields);- // if(props.video.relationships.metadata.id){- // return mediaAPI.updateMetadata(props.video.relationships.metadata.id, fields);- // }+ // return mediaAPI.updateMetadata(props.video.relationships.metadata.id, fields);+ if(props.video.relationships?.metadata?.id){+ return mediaAPI.updateMetadata(props.video.relationships.metadata.id, fields);+ }- // else return mediaAPI.createMetadata(props.video.id, fields);+ else return mediaAPI.createMetadata({...fields, video_id: props.video.id});},{onSuccess: (response) => {diff --git a/resources/js/components/table/TableBase.vue b/resources/js/components/table/TableBase.vueindex 2e69ed26..717e7d28 100755--- a/resources/js/components/table/TableBase.vue+++ b/resources/js/components/table/TableBase.vue@@ -1,13 +1,13 @@<script setup>-import useTable from '../../composables/useTable';-import ButtonIcon from '../inputs/ButtonIcon.vue';import TextInputLabelled from '../inputs/TextInputLabelled.vue';+import TablePagination from '../table/TablePagination.vue';import FormInputLabel from '../labels/FormInputLabel.vue';import InputSelect from '../pinesUI/InputSelect.vue';-import TablePagination from '../table/TablePagination.vue';+import ButtonIcon from '../inputs/ButtonIcon.vue';+import useTable from '../../composables/useTable';-import PhSortAscendingLight from '~icons/ph/sort-ascending-light';import PhSortDescendingLight from '~icons/ph/sort-descending-light';+import PhSortAscendingLight from '~icons/ph/sort-ascending-light';import { ref } from 'vue';@@ -26,8 +26,8 @@ const handleSortChange = (sortKey) => {</script><template>- <div v-if="props.loading" class="text-center text-lg text-gray-500 dark:text-gray-400 uppercase tracking-wider w-full">Loading</div>- <table v-else class="w-full flex flex-col gap-4 divide-y first:pt-0 [&>*:not(:first-child)]:pt-4">+ <div v-if="props.loading" class="text-center text-lg text-gray-500 dark:text-gray-400 uppercase tracking-wider w-full py-16">Loading...</div>+ <table v-else class="flex flex-col gap-4 divide-y first:pt-0 [&>*:not(:first-child)]:pt-4"><section v-if="props.useToolbar" class="flex justify-center sm:justify-between py-2 flex-col sm:flex-row gap-2"><TextInputLabelled v-model="tableData.fields.searchQuery" :text="'Search:'" :placeholder="'Enter Search Query...'" :id="'table-search'" class="w-full sm:w-80" @input="$emit('search', tableData.fields.searchQuery)" title="Search Results"/><span class="flex items-end gap-2">diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex 4c2e9380..8f49f08e 100755--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -76,7 +76,7 @@ watch(() => stateVideo.value, handlePropsUpdate, { immediate: true, deep: true }<divclass="p-6 w-full mx-auto dark:bg-primary-dark-800/70 bg-primary-800 rounded-xl shadow-lg flex justify-center sm:justify-between gap-4 flex-wrap sm:flex-nowrap overflow-hidden"><div id="mp4-description" class="flex items-center gap-4 w-full md:w-2/3 ">- <img id="folder-thumbnail" class="h-28 object-contain rounded-md shadow-md"+ <img id="folder-thumbnail" class="h-28 object-cover rounded-md shadow-md aspect-2/3":src="stateFolder?.series?.thumbnail_url ?? 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'"alt="Folder Cover Art"@click="() => {if(userData) editFolderModal.toggleModal()}"diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vueindex f907a07a..87e3490d 100755--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@ -170,7 +170,7 @@ watch(stateVideo, initVideoPlayer)</script><template>- <div class="relative group rounded-md overflow-clip">+ <div class="relative group rounded-xl overflow-clip"><video id="vid-source" width="100%":src="stateVideo?.attributes?.path ? `../${stateVideo?.attributes?.path}` : ''" type="video/mp4" controlsclass="focus:outline-none aspect-video flex"diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.jsindex 7922602a..0a623c02 100755--- a/resources/js/stores/ContentStore.js+++ b/resources/js/stores/ContentStore.js@@ -130,7 +130,7 @@ export const useContentStore = defineStore('Content', () => {async function getFolder(nextFolderName) {const nextFolder = stateDirectory.value.folders?.find((folder) => {return folder.attributes.name === nextFolderName});-+if(!nextFolder?.id){toast.add({ type: 'danger', title:'Invalid folder', description: `The folder '${nextFolderName}' does not exist.`})return;@@ -145,7 +145,7 @@ export const useContentStore = defineStore('Content', () => {return Promise.reject(false);}- console.log(nextFolder);+ // console.log(nextFolder);stateFolder.value = {id: nextFolder.id, name: nextFolder.attributes.name, videos: data.data, series: nextFolder.series ?? null};@@ -217,12 +217,12 @@ export const useContentStore = defineStore('Content', () => {}const playlistFilter = (query) => {- console.log(query);+ // console.log(query);let tempList = query ? statePlaylist.value.filter((video) => {{try {let strRepresentation = [video.attributes.name, video.attributes.date].join(' ').toLowerCase();- console.log(strRepresentation);+ // console.log(strRepresentation);return strRepresentation.includes(query.toLowerCase())} catch (error) {diff --git a/routes/api.php b/routes/api.phpindex eef28e50..c1925db3 100755--- a/routes/api.php+++ b/routes/api.php@@ -1,6 +1,7 @@<?phpuse App\Http\Controllers\Api\V1\AuthController;+use App\Http\Controllers\Api\V1\CategoryController;use App\Http\Controllers\Api\V1\FolderController;use App\Http\Controllers\Api\V1\MetadataController;use App\Http\Controllers\Api\V1\PlaybackController;@@ -38,6 +39,7 @@ Route::post('/folders', [FolderController::class, 'getFrom']);Route::resource('/videos', VideoController::class)->only(['show', 'update']);Route::resource('/folders', FolderController::class)->only(['show']);+Route::resource('/categories', CategoryController::class)->only(['show']);Route::resource('/playback', PlaybackController::class)->only(['store']);Route::get('/{dir}', [DirectoryController::class, 'showDirectoryAPI']);diff --git a/tailwind.config.js b/tailwind.config.jsindex 1c688650..bb0936a3 100755--- a/tailwind.config.js+++ b/tailwind.config.js@@ -67,7 +67,10 @@ export default {aspectRatio: {'video': '16 / 9','square': '1 / 1',- 'portrait': '9 / 16'+ 'portrait': '9 / 16',+ '1/2': '1 / 2',+ '2/3': '2 / 3',+ '3/4': '3 / 4',},},},