A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: change date created and updated to created and updated at on metadata
aminnausin3094c4cd4a37
diff --git a/app/Http/Resources/MetadataResource.php b/app/Http/Resources/MetadataResource.phpindex d0dd19ee..cfebe9d2 100644--- a/app/Http/Resources/MetadataResource.php+++ b/app/Http/Resources/MetadataResource.php@@ -25,7 +25,7 @@ class MetadataResource extends JsonResource {'released_at' => $this->released_at, // user provided metadata'edited_at' => $this->edited_at, // last user edit time'file_modified_at' => $this->file_modified_at, // file_mtime from disk (required)- 'date_updated' => $this->updated_at, // db update time+ 'updated_at' => $this->updated_at, // db update time],'relationships' => ['video_id' => $this->video_id,diff --git a/app/Http/Resources/VideoResource.php b/app/Http/Resources/VideoResource.phpindex d2a7cb5e..9676e263 100755--- a/app/Http/Resources/VideoResource.php+++ b/app/Http/Resources/VideoResource.php@@ -100,8 +100,8 @@ class VideoResource extends JsonResource {'view_count' => $metadata?->view_count ?? 0,'file_size' => $metadata?->file_size ?: null,'video_tags' => VideoTagResource::collection($metadata->videoTags ?? []),- 'date_created' => $this->created_at, // Date Added to Server- 'date_updated' => $metadata?->updated_at ?: null, // Metadata Last Updated+ 'created_at' => $this->created_at, // Date Added to Server+ 'updated_at' => $metadata?->updated_at ?: null, // Metadata Last Updated'released_at' => $metadata?->released_at ?: null, // User Provided Release Date in F d, Y ?'file_modified_at' => $metadata?->file_modified_at ?: null, // File Last Modified (Should be date_added)'edited_at' => $metadata?->edited_at,diff --git a/app/Services/PreviewGeneratorService.php b/app/Services/PreviewGeneratorService.phpindex a0731c33..cf3906b8 100644--- a/app/Services/PreviewGeneratorService.php+++ b/app/Services/PreviewGeneratorService.php@@ -127,7 +127,7 @@ class PreviewGeneratorService {$contentString = $releaseDate . ' • ' . $this->formatDuration($videoResource?->metadata?->duration ?? null);$folderDateUpdated = strtotime($folderResource->series->updated_at);- $videoDateUpdated = strtotime($videoResource->date_updated ?? '') ?: 0;+ $videoDateUpdated = strtotime($videoResource->updated_at ?? '') ?: 0;$latestTimestamp = max($folderDateUpdated, $videoDateUpdated);$data = ['title' => ucfirst($folderResource->series->title) . " · {$video->metadata->title}",diff --git a/resources/js/components/cards/data/VideoCard.vue b/resources/js/components/cards/data/VideoCard.vueindex 4f7a9dd2..d4d1aaf7 100644--- a/resources/js/components/cards/data/VideoCard.vue+++ b/resources/js/components/cards/data/VideoCard.vue@@ -146,7 +146,7 @@ const contextMenuItems = computed(() => {</span></span>- <h4 class="truncate text-end" :title="`Date Uploaded: ${toFormattedDate(videoData.file_modified_at)}\nDate Scanned: ${toFormattedDate(videoData.date_created)}`">+ <h4 class="truncate text-end" :title="`Date Uploaded: ${toFormattedDate(videoData.file_modified_at)}\nDate Scanned: ${toFormattedDate(videoData.created_at)}`">{{ toFormattedDate(videoData.file_modified_at) }}</h4>diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex b435a3df..e20fd164 100755--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -50,8 +50,8 @@ const mediaDateDescription = computed(() => {const lastEditedAt = stateVideo.value.edited_at ? `\nLast Edited: ${toFormattedDate(stateVideo.value.edited_at)}` : '';return (`Date Uploaded: ${toFormattedDate(stateVideo.value.file_modified_at)}` +- `\nDate Added: ${toFormattedDate(stateVideo.value.date_created)}` +- `\nLast Updated: ${toFormattedDate(stateVideo.value.date_updated)}` ++ `\nDate Added: ${toFormattedDate(stateVideo.value.created_at)}` ++ `\nLast Updated: ${toFormattedDate(stateVideo.value.updated_at)}` +lastEditedAt);});diff --git a/resources/js/contracts/media.ts b/resources/js/contracts/media.tsindex 61c86c78..c839bae8 100644--- a/resources/js/contracts/media.ts+++ b/resources/js/contracts/media.ts@@ -17,20 +17,21 @@ export interface CategoryResource {//#region Foldersexport interface FolderResource {id: number;+ category_id: number;name: string;- title: string;path: string;+ created_at?: string;+ last_scan: number;++ title: string;file_count: number;total_size: number;is_majority_audio: boolean;- category_id: number;videos: VideoResource[];series?: SeriesResource;scanned_at?: string;- created_at?: string;updated_at?: string;edited_at?: string;- last_scan: number;}export interface SeriesResource {@@ -44,10 +45,10 @@ export interface SeriesResource {seasons?: number;episodes?: number;films?: number;- folder_tags?: FolderTagResource[];started_at?: string;ended_at?: string;thumbnail_url?: string;+ folder_tags?: FolderTagResource[];created_at?: string;updated_at?: string;edited_at?: string;@@ -70,7 +71,7 @@ export interface MetadataResource {released_at?: string;file_modified_at?: string;edited_at?: string;- date_updated?: string;+ updated_at?: string;};relationships: {video_id?: number;@@ -93,9 +94,9 @@ export interface VideoResource {view_count: number;file_size?: number;video_tags: VideoTagResource[];- date_created: string;+ created_at: string;released_at?: string;- date_updated?: string;+ updated_at?: string;file_modified_at?: string;edited_at?: string;metadata?: Metadata;diff --git a/resources/js/service/sort/baseSort.test.ts b/resources/js/service/sort/baseSort.test.tsindex e72e47d1..e47c428c 100644--- a/resources/js/service/sort/baseSort.test.ts+++ b/resources/js/service/sort/baseSort.test.ts@@ -6,18 +6,18 @@ import { expect, test } from 'vitest';test('CompareStrategies.episode sorts by season and episode', () => {const videos: VideoResource[] = [- { id: 1, name: '1', path: '/1', view_count: 0, video_tags: [], season: 2, episode: 2, date_created: '', subtitles: [] },- { id: 3, name: '3', path: '/3', view_count: 0, video_tags: [], season: 2, episode: 1, date_created: '', subtitles: [] },- { id: 2, name: '2', path: '/2', view_count: 0, video_tags: [], season: 1, episode: 1, date_created: '', subtitles: [] },- { id: 4, name: '4', path: '/4', view_count: 0, video_tags: [], season: 1, episode: 2, date_created: '', subtitles: [] },+ { id: 1, name: '1', path: '/1', view_count: 0, video_tags: [], season: 2, episode: 2, created_at: '', subtitles: [] },+ { id: 3, name: '3', path: '/3', view_count: 0, video_tags: [], season: 2, episode: 1, created_at: '', subtitles: [] },+ { id: 2, name: '2', path: '/2', view_count: 0, video_tags: [], season: 1, episode: 1, created_at: '', subtitles: [] },+ { id: 4, name: '4', path: '/4', view_count: 0, video_tags: [], season: 1, episode: 2, created_at: '', subtitles: [] },];videos.sort(sortObjectNew([{ compareFn: CompareStrategies.episode }]));expect(videos).toEqual([- { id: 2, name: '2', path: '/2', view_count: 0, video_tags: [], season: 1, episode: 1, date_created: '', subtitles: [] },- { id: 4, name: '4', path: '/4', view_count: 0, video_tags: [], season: 1, episode: 2, date_created: '', subtitles: [] },- { id: 3, name: '3', path: '/3', view_count: 0, video_tags: [], season: 2, episode: 1, date_created: '', subtitles: [] },- { id: 1, name: '1', path: '/1', view_count: 0, video_tags: [], season: 2, episode: 2, date_created: '', subtitles: [] },+ { id: 2, name: '2', path: '/2', view_count: 0, video_tags: [], season: 1, episode: 1, created_at: '', subtitles: [] },+ { id: 4, name: '4', path: '/4', view_count: 0, video_tags: [], season: 1, episode: 2, created_at: '', subtitles: [] },+ { id: 3, name: '3', path: '/3', view_count: 0, video_tags: [], season: 2, episode: 1, created_at: '', subtitles: [] },+ { id: 1, name: '1', path: '/1', view_count: 0, video_tags: [], season: 2, episode: 2, created_at: '', subtitles: [] },]);});diff --git a/resources/js/stores/ContentStore.ts b/resources/js/stores/ContentStore.tsindex 6d5fbd83..aa8047c3 100644--- a/resources/js/stores/ContentStore.ts+++ b/resources/js/stores/ContentStore.ts@@ -17,7 +17,7 @@ import mediaAPI from '@/service/mediaAPI.ts';const emptyLibrary: CategoryResource = { id: 0, name: '', folders: [], folders_count: 0, total_size: 0, last_scan: -1 };const emptyFolder: FolderResource = { id: 0, name: '', title: '', path: '', file_count: 0, total_size: 0, is_majority_audio: false, category_id: 0, videos: [], last_scan: -1 };-const emptyMedia: VideoResource = { id: 0, name: '', path: '', view_count: 0, video_tags: [], date_created: '', subtitles: [] };+const emptyMedia: VideoResource = { id: 0, name: '', path: '', view_count: 0, video_tags: [], created_at: '', subtitles: [] };const DEFAULT_SORT = { column: 'name', dir: 1 };