Skip to content

A self-hosted media server and file management system

fix: subtitle default and forced flags are not exposed

aminnausin25f110c27dfe
diff --git a/app/Http/Controllers/Api/V1/FolderController.php b/app/Http/Controllers/Api/V1/FolderController.php
index 0d234649..8348b362 100755
--- a/app/Http/Controllers/Api/V1/FolderController.php
+++ b/app/Http/Controllers/Api/V1/FolderController.php
@@ -7,6 +7,7 @@ use App\Http\Requests\FolderCollectionRequest;
use App\Http\Resources\FolderResource;
use App\Models\Category;
use App\Models\Folder;
+use App\Models\Subtitle;
use App\Traits\HttpResponses;
use Illuminate\Support\Facades\Auth;
@@ -46,7 +47,7 @@ class FolderController extends Controller {
*/
public function show(Folder $folder) {
$folder->load(['videos.metadata.videoTags.tag', 'series.folderTags.tag', 'videos.metadata.subtitles' => function ($q) {
- $q->select('id', 'track_id', 'metadata_uuid', 'language', 'codec');
+ $q->select(Subtitle::getVisibleFields());
}, ]);
return new FolderResource($folder);
diff --git a/app/Http/Controllers/Api/V1/VideoController.php b/app/Http/Controllers/Api/V1/VideoController.php
index b25cfc5e..cd9a0524 100755
--- a/app/Http/Controllers/Api/V1/VideoController.php
+++ b/app/Http/Controllers/Api/V1/VideoController.php
@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
use App\Http\Requests\VideoCollectionRequest;
use App\Http\Resources\VideoResource;
use App\Models\Record;
+use App\Models\Subtitle;
use App\Models\Video;
use App\Traits\HttpResponses;
use Illuminate\Http\Request;
@@ -47,7 +48,7 @@ class VideoController extends Controller {
return $this->success(new VideoResource($video->load([
'metadata.videoTags.tag',
'metadata.subtitles' => function ($q) {
- $q->select('id', 'track_id', 'metadata_uuid', 'language', 'codec');
+ $q->select(Subtitle::getVisibleFields());
},
])));
}
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
index 373d005b..05f74582 100755
--- a/app/Http/Controllers/DirectoryController.php
+++ b/app/Http/Controllers/DirectoryController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use App\Http\Resources\FolderResource;
use App\Models\Category;
use App\Models\Folder;
+use App\Models\Subtitle;
use App\Services\PathResolverService;
use App\Services\TaskService;
use App\Traits\HttpResponses;
@@ -100,7 +101,7 @@ class DirectoryController extends Controller {
'series.folderTags.tag',
'videos.metadata.videoTags.tag',
'videos.metadata.subtitles' => function ($q) {
- $q->select('id', 'track_id', 'metadata_uuid', 'language', 'codec');
+ $q->select(Subtitle::getVisibleFields());
},
]);
diff --git a/app/Http/Resources/SubtitleResource.php b/app/Http/Resources/SubtitleResource.php
index 57d57707..28660711 100644
--- a/app/Http/Resources/SubtitleResource.php
+++ b/app/Http/Resources/SubtitleResource.php
@@ -18,6 +18,8 @@ class SubtitleResource extends JsonResource {
'metadata_uuid' => $this->metadata_uuid,
'language' => $this->language,
'codec' => $this->codec,
+ 'is_default' => $this->is_default,
+ 'is_forced' => $this->is_forced,
];
}
}
diff --git a/app/Models/Subtitle.php b/app/Models/Subtitle.php
index 26a736c2..75d26fd9 100644
--- a/app/Models/Subtitle.php
+++ b/app/Models/Subtitle.php
@@ -16,6 +16,8 @@ class Subtitle extends Model {
'codec',
'format',
'path',
+ 'is_default',
+ 'is_forced',
];
public function metadata(): BelongsTo {
@@ -29,4 +31,8 @@ class Subtitle extends Model {
public function getFilePath(string $format): string {
return SubtitlePath::file($this->metadata_uuid, $this->track_id, $format);
}
+
+ public static function getVisibleFields(): array {
+ return ['id', 'track_id', 'metadata_uuid', 'language', 'codec', 'is_default', 'is_forced'];
+ }
}
diff --git a/resources/js/types/resources.ts b/resources/js/types/resources.ts
index fa7232a9..998ce856 100644
--- a/resources/js/types/resources.ts
+++ b/resources/js/types/resources.ts
@@ -146,6 +146,8 @@ export interface SubtitleResource {
metadata_uuid: string;
language?: string;
codec?: string;
+ is_default: boolean;
+ is_forced: boolean;
}
export interface VideoTagResource {