Skip to content

A self-hosted media server and file management system

fix: playback information cannot be used for sorting

aminnausinf27df8d802e6
diff --git a/app/Http/Resources/MetadataResource.php b/app/Http/Resources/MetadataResource.php
index 73357218..b513340e 100644
--- a/app/Http/Resources/MetadataResource.php
+++ b/app/Http/Resources/MetadataResource.php
@@ -44,9 +44,6 @@ class MetadataResource extends JsonResource {
'file_modified_at' => $this->first_file_modified_at ?: $this->file_modified_at,
'first_file_modified_at' => $this->first_file_modified_at,
'subtitles_scanned_at' => $this->subtitles_scanned_at,
-
- 'progress_offset' => $this->playbackProgress?->progress_offset ?? 0,
- 'progress_percentage' => $this->playbackProgress?->progress_percentage ?? 0,
];
}
}
diff --git a/app/Http/Resources/VideoResource.php b/app/Http/Resources/VideoResource.php
index ba131b06..9e8a1679 100755
--- a/app/Http/Resources/VideoResource.php
+++ b/app/Http/Resources/VideoResource.php
@@ -48,7 +48,11 @@ class VideoResource extends JsonResource {
'file_modified_at' => $metadata?->first_file_modified_at ?: $metadata?->file_modified_at ?: null, // File Last Modified (Should be date_added)
'edited_at' => $metadata?->edited_at,
- 'metadata' => new MetadataResource($metadata),
+ 'progress_offset' => $metadata?->playbackProgress?->progress_offset ?? 0,
+ 'progress_percentage' => $metadata?->playbackProgress?->progress_percentage ?? 0,
+ 'completion_count' => $metadata?->playbackProgress?->completion_count ?? 0,
+
+ 'metadata' => new MetadataResource($metadata)
];
}
}
diff --git a/resources/js/contracts/media.ts b/resources/js/contracts/media.ts
index 0eb120f6..7380e41a 100644
--- a/resources/js/contracts/media.ts
+++ b/resources/js/contracts/media.ts
@@ -110,9 +110,6 @@ export interface MetadataResource {
file_modified_at?: string;
first_file_modified_at?: string;
subtitles_scanned_at?: string;
-
- progress_offset?: number;
- progress_percentage: number;
}
export interface VideoResource {
@@ -138,6 +135,9 @@ export interface VideoResource {
edited_at?: string;
metadata?: MetadataResource;
subtitles: SubtitleResource[];
+ progress_offset: number;
+ progress_percentage: number;
+ completion_count: number;
}
export interface SubtitleResource {
diff --git a/resources/js/service/sort/baseSort.test.ts b/resources/js/service/sort/baseSort.test.ts
index e47c428c..2f8221d2 100644
--- a/resources/js/service/sort/baseSort.test.ts
+++ b/resources/js/service/sort/baseSort.test.ts
@@ -5,19 +5,29 @@ import { sortObjectNew } from '@/service/sort/baseSort';
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, 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: [] },
+ const baseMedia = {
+ view_count: 0,
+ progress_offset: 0,
+ progress_percentage: 0,
+ completion_count: 0,
+ video_tags: [],
+ subtitles: [],
+ created_at: '',
+ };
+
+ const media: VideoResource[] = [
+ { id: 1, name: '1', path: '/1', season: 2, episode: 2, ...baseMedia },
+ { id: 3, name: '3', path: '/3', season: 2, episode: 1, ...baseMedia },
+ { id: 2, name: '2', path: '/2', season: 1, episode: 1, ...baseMedia },
+ { id: 4, name: '4', path: '/4', season: 1, episode: 2, ...baseMedia },
];
- videos.sort(sortObjectNew([{ compareFn: CompareStrategies.episode }]));
+ media.sort(sortObjectNew([{ compareFn: CompareStrategies.episode }]));
- expect(videos).toEqual([
- { 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: [] },
+ expect(media).toEqual([
+ { id: 2, name: '2', path: '/2', season: 1, episode: 1, ...baseMedia },
+ { id: 4, name: '4', path: '/4', season: 1, episode: 2, ...baseMedia },
+ { id: 3, name: '3', path: '/3', season: 2, episode: 1, ...baseMedia },
+ { id: 1, name: '1', path: '/1', season: 2, episode: 2, ...baseMedia },
]);
});