A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
more optimise
aminnausin3084c8a5b37f
diff --git a/app/Http/Controllers/Api/V1/MetadataController.php b/app/Http/Controllers/Api/V1/MetadataController.phpindex f135c30d..62718333 100644--- a/app/Http/Controllers/Api/V1/MetadataController.php+++ b/app/Http/Controllers/Api/V1/MetadataController.php@@ -13,12 +13,10 @@ use App\Models\VideoTag;use App\Traits\HttpResponses;use Illuminate\Support\Facades\Auth;-class MetadataController extends Controller-{+class MetadataController extends Controller {use HttpResponses;- public function show($id)- {+ public function show($id) {try {return $this->success(new MetadataResource(Metadata::where('id', $id)->first())@@ -32,8 +30,7 @@ class MetadataController extends Controller/*** Store a newly created resource in storage.*/- public function store(MetadataStoreRequest $request)- {+ public function store(MetadataStoreRequest $request) {try {$validated = $request->validated();@@ -43,7 +40,7 @@ class MetadataController extends Controller$existing = Metadata::where('composite_id', $video->folder->path . "/" . basename($video->path))->first();if ($existing && $existing->video_id != $request->video_id) return $this->error($existing, 'Metadata with generated unique id already exists for another video!', 500);- $validated['editor_id'] = Auth::user()->id;+ $validated['editor_id'] = Auth::id();$validated['composite_id'] = $video->folder->path . "/" . basename($video->path);if ($existing) {@@ -66,11 +63,10 @@ class MetadataController extends Controller/*** Update the specified resource in storage.*/- public function update(MetadataUpdateRequest $request, Metadata $metadata)- {+ public function update(MetadataUpdateRequest $request, Metadata $metadata) {try {$validated = $request->validated();- $validated['editor_id'] = Auth::user()->id;+ $validated['editor_id'] = Auth::id();$metadata->update($validated);$this->generateTags($metadata->id, $request->video_tags, $request->deleted_tags);@@ -80,8 +76,7 @@ class MetadataController extends Controller}}- function generateTags($metadata_id, $video_tags, $deleted_tags = [])- {+ function generateTags($metadata_id, $video_tags, $deleted_tags = []) {foreach ($video_tags as $tag) {VideoTag::firstOrCreate(['tag_id' => $tag['id'], 'metadata_id' => $metadata_id]);}diff --git a/app/Http/Controllers/Api/V1/RecordController.php b/app/Http/Controllers/Api/V1/RecordController.phpindex cdc67262..ab67d920 100644--- a/app/Http/Controllers/Api/V1/RecordController.php+++ b/app/Http/Controllers/Api/V1/RecordController.php@@ -11,25 +11,23 @@ use App\Traits\HttpResponses;use Illuminate\Http\Request;use Illuminate\Support\Facades\Auth;-class RecordController extends Controller-{+class RecordController extends Controller {use HttpResponses;/*** Display a listing of the resource.*/- public function index(Request $request)- {+ public function index(Request $request) {if (isset($request->limit) && is_numeric($request->limit)) {return $this->success(RecordResource::collection(- Record::where('user_id', Auth::user()->id)->orderBy('created_at', 'DESC')->limit($request->limit)->get()+ Record::where('user_id', Auth::id())->orderBy('created_at', 'DESC')->limit($request->limit)->get()));} else {return $this->success(RecordResource::collection(- Record::where('user_id', Auth::user()->id)->orderBy('created_at', 'DESC')->get()+ Record::where('user_id', Auth::id())->orderBy('created_at', 'DESC')->get()));}@@ -38,21 +36,22 @@ class RecordController extends Controller/*** Store a newly created resource in storage.*/- public function store(RecordStoreRequest $request)- {+ public function store(RecordStoreRequest $request) {$validated = $request->validated();- $video = Video::where('id', $validated['video_id'])->first();+ $video = Video::with(['metadata:id,video_id,title'])+ ->where('id', $validated['video_id'])+ ->first();if (!$video) return $this->error(null, 'Video does not exist', 404);$record = Record::create([- 'user_id' => Auth::user()->id,+ 'user_id' => Auth::id(),'video_id' => $validated['video_id'],- 'metadata_id' => $video->metadata ? $video->metadata->id : null,- 'name' => $video->metadata ? $video->metadata->name : $video->name // should be like meta data id in a persistent table that doesnt delete that has name episode season if available and displays depending on what data exists+ 'metadata_id' => $video->metadata?->id,+ 'name' => $video->metadata ? $video->metadata->title : $video->name // should be like meta data id in a persistent table that doesnt delete that has name episode season if available and displays depending on what data exists]);- return $this->success(new RecordResource($record));+ return $this->success($record);}/**@@ -61,14 +60,12 @@ class RecordController extends Controller* @param int $id* @return \Illuminate\Http\Response*/- public function destroy(Record $record)- {+ public function destroy(Record $record) {return $this->isNotAuthorised($record) ?? $record->delete() ? $this->success('', 'Success', 200) : $this->error('', 'Not found', 404);}- private function isNotAuthorised(Record $record)- {- if (Auth::user()->id != $record->user_id) {+ private function isNotAuthorised(Record $record) {+ if (Auth::id() != $record->user_id) {return $this->error('', 'Unauthorised request.', 403);}return null;diff --git a/app/Http/Controllers/Api/V1/SeriesController.php b/app/Http/Controllers/Api/V1/SeriesController.phpindex 38dd09e1..b2389780 100644--- a/app/Http/Controllers/Api/V1/SeriesController.php+++ b/app/Http/Controllers/Api/V1/SeriesController.php@@ -11,16 +11,15 @@ use App\Models\Folder;use App\Traits\HttpResponses;use Illuminate\Support\Facades\Auth;-class SeriesController extends Controller-{+class SeriesController extends Controller {use HttpResponses;- /* User can:+ /* User can:** - List all series (to search ? admin page ?)* - Store (Create series if row for folder does not already exist)* - Update (User updates details)- *+ ** User cannot:* - Show (Series data is added to each folder. Theres no reason to get one row on its own)* - Delete (User should not be able to delete series row | maybe admin can but thats later)@@ -29,8 +28,7 @@ class SeriesController extends Controller/*** Display a listing of the resource.*/- public function index()- {+ public function index() {try {return $this->success(SeriesResource::collection(@@ -45,8 +43,7 @@ class SeriesController extends Controller/*** Store a newly created resource in storage.*/- public function store(SeriesStoreRequest $request)- {+ public function store(SeriesStoreRequest $request) {try {$validated = $request->validated();@@ -56,7 +53,7 @@ class SeriesController extends Controller$existing = Series::where('composite_id', $folder->path)->first();if ($existing && $existing->folder_id != $request->folder_id) return $this->error($existing, 'Series already exists for another folder!', 500);- $validated['editor_id'] = Auth::user()->id;+ $validated['editor_id'] = Auth::id();$validated['composite_id'] = $folder->path;if ($existing) {@@ -74,11 +71,10 @@ class SeriesController extends Controller/*** Update the specified resource in storage.*/- public function update(SeriesUpdateRequest $request, Series $series)- {+ public function update(SeriesUpdateRequest $request, Series $series) {try {$validated = $request->validated();- $validated['editor_id'] = Auth::user()->id;+ $validated['editor_id'] = Auth::id();$series->update($validated);return $this->success(new SeriesResource($series));diff --git a/app/Http/Controllers/Api/V1/TagController.php b/app/Http/Controllers/Api/V1/TagController.phpindex 5276bf17..1fe2aaf0 100644--- a/app/Http/Controllers/Api/V1/TagController.php+++ b/app/Http/Controllers/Api/V1/TagController.php@@ -10,8 +10,7 @@ use App\Models\Tag;use App\Traits\HttpResponses;use Illuminate\Support\Facades\Auth;-class TagController extends Controller-{+class TagController extends Controller {use HttpResponses;/* User can:*@@ -27,8 +26,7 @@ class TagController extends Controller/*** Display a listing of the resource.*/- public function index()- {+ public function index() {try {return $this->success(TagResource::collection(@@ -43,8 +41,7 @@ class TagController extends Controller/*** Store a newly created resource in storage.*/- public function store(TagStoreRequest $request)- {+ public function store(TagStoreRequest $request) {try {$validated = $request->validated();@@ -53,7 +50,7 @@ class TagController extends Controller$validated['name'] = strtolower($validated['name']);- $validated['creator_id'] = Auth::user()->id;+ $validated['creator_id'] = Auth::id();$tag = Tag::create($validated);return new TagResource($tag);} catch (\Throwable $th) {