A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
Is it done?
aminnausinc61c614dffaf
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.phpindex 43b3eada..185f495e 100755--- a/app/Http/Controllers/DirectoryController.php+++ b/app/Http/Controllers/DirectoryController.php@@ -143,8 +143,9 @@ class DirectoryController extends Controller{try {// SyncFiles::dispatchSync();- IndexFiles::dispatchSync();- dump('success');+ // IndexFiles::dispatchSync();+ IndexFiles::dispatch();+ dump('This job now uses ffprobe so it must be async');} catch (\Throwable $th) {dump('Error cannot index files');dump($th);diff --git a/app/Http/Resources/RecordResource.php b/app/Http/Resources/RecordResource.phpindex 40f216a1..b453884b 100755--- a/app/Http/Resources/RecordResource.php+++ b/app/Http/Resources/RecordResource.php@@ -24,12 +24,13 @@ class RecordResource extends JsonResource'relationships' => ['user_id' => (string)$this->user->id,'user_name' => $this->user->name,- 'video_id' => $this->video ? (string)$this->video->id : null,- 'video_name' => $this->metadata ? $this->metadata->title : ($this->video ? ($this->video->title ?? $this->video->name) : $this->name),+ 'video_id' => $this->video ? (string)$this->video->id : ($this->metadata && $this->metadata->video ? $this->metadata->video->id : null),+ 'video_name' => $this->metadata ? $this->metadata->title : ($this->video ? ($this->video->title ?? $this->video->name) : $this->name) ?? 'Deleted','file_name' => $this->video ? $this->video->name : $this->name,'folder_id' => $this->video ? $this->video->folder_id : null,- 'folder_name' => $this->video ? $this->video->folder->name : 'Deleted',- 'category_name' => $this->video ? $this->video->folder->category->name : null+ 'folder_name' => $this->video ? $this->video->folder->name : ($this->metadata && $this->metadata->video ? $this->metadata->video->folder->name : 'Deleted'),+ 'category_name' => $this->video ? $this->video->folder->category->name : null,+ 'metadata_id' => $this->metadata ? $this->metadata->id : 'None']];}diff --git a/app/Jobs/IndexFiles.php b/app/Jobs/IndexFiles.phpindex 1f0a2c5f..714a2114 100755--- a/app/Jobs/IndexFiles.php+++ b/app/Jobs/IndexFiles.php@@ -190,7 +190,8 @@ class IndexFiles implements ShouldQueue, ShouldBeUnique// TODO: stop adding empty data cache entries if the last entry was also empty. Need to check last one but popping removes it and loses the key so I cannot add it back on if it wasnt empty.Storage::disk('public')->put('dataCache.json', json_encode($dataCache, JSON_UNESCAPED_SLASHES));- dump('Categories | Folders | Videos | Data | SQL | DataCache', $directories, $subDirectories, $files, $data, $dbOut, $dataCache);+ // dump('Categories | Folders | Videos | Data | SQL | DataCache', $directories, $subDirectories, $files, $data, $dbOut, $dataCache);+ dump('Categories | Folders | Videos | Changes | SQL ', $directories, ['count' => count($subDirectories["data"]['folderStructure'])], ['count' => count($files["data"]["videoStructure"])], $data, $dbOut);}private function generateCategories($path)@@ -515,19 +516,19 @@ class IndexFiles implements ShouldQueue, ShouldBeUniquefunction upsertMetadata($data){// Attempt to update by UUID first- $metadata = DB::table('metadata')->where('uuid', $data['uuid'])->first();+ $metadata = Metadata::where('uuid', $data['uuid'])->first();if ($metadata) {- DB::table('metadata')->where('uuid', $data['uuid'])->update($data);+ Metadata::where('uuid', $data['uuid'])->update($data);} else {// If UUID not found, try to update by composite_id- $metadata = DB::table('metadata')->where('composite_id', $data['composite_id'])->first();+ $metadata = Metadata::where('composite_id', $data['composite_id'])->first();if ($metadata) {- DB::table('metadata')->where('composite_id', $data['composite_id'])->update($data);+ Metadata::where('composite_id', $data['composite_id'])->update($data);} else {// If neither found, insert a new record- DB::table('metadata')->insert($data);+ Metadata::insert($data);}}}diff --git a/resources/js/components/labels/ChipTag.vue b/resources/js/components/labels/ChipTag.vueindex a9e0f52d..aedff563 100644--- a/resources/js/components/labels/ChipTag.vue+++ b/resources/js/components/labels/ChipTag.vue@@ -5,7 +5,7 @@ import ButtonCorner from '../inputs/ButtonCorner.vue';const props = defineProps(['label', 'colour', 'URL', 'removeable']);-const styling = `p-1 px-2 text-sm leading-none rounded-xl truncate lowercase text-neutral-100 dark:text-neutral-300 ${props.colour ? `${props.colour}` : 'bg-violet-600 dark:bg-violet-900/90'} shrink-0`;+const styling = `p-1 px-2 text-sm leading-none rounded-xl truncate lowercase text-neutral-100 dark:text-neutral-300 ${props.colour ? `${props.colour}` : 'bg-violet-600 dark:bg-violet-900/90'} shrink-0 transition-colors duration-200 `;</script><template><RouterLink v-if="props.URL" :class="styling" :to="props.URL">diff --git a/resources/js/components/table/TablePaginationButton.vue b/resources/js/components/table/TablePaginationButton.vueindex f4169d1c..7d7ab610 100755--- a/resources/js/components/table/TablePaginationButton.vue+++ b/resources/js/components/table/TablePaginationButton.vue@@ -15,12 +15,17 @@ const props = defineProps(['currentPage', 'pageNumber', 'text', 'underline', 'st<spanv-if="!props.text || props.underline"- class="box-content absolute bottom-0 w-0 h-px -mx-px duration-200 ease-out translate-y-px border-transparent group-hover:left-0 group-hover:w-full group-hover:border-l group-hover:border-r bg-neutral-900 dark:bg-violet-600 group-hover:border-neutral-900 group-hover:dark:border-violet-600"+ class="box-content absolute bottom-0 w-0 h-px -mx-px duration-200 ease-out translate-y-px border-transparent group-hover:left-0 group-hover:w-full group-hover:border-l group-hover:border-r bg-violet-600 group-hover:border-violet-600"+ bg-neutral-900+ dark:bg-violet-600+ group-hover:border-neutral-900+ group-hover:dark:border-violet-600:class="{'left-0 w-full border-l border-r': props.currentPage === props.pageNumber,'left-1/2': props.currentPage !== props.pageNumber,}">+ <!-- bg-neutral-900 dark:bg-violet-600 group-hover:border-neutral-900 group-hover:dark:border-violet-600 --></span></button></li>