Skip to content

A self-hosted media server and file management system

finish controllers for metadata?

aminnausinb75a15058d8f
diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.php
index b02d07b5..0be5e4bb 100755
--- a/app/Http/Controllers/Api/V1/CategoryController.php
+++ b/app/Http/Controllers/Api/V1/CategoryController.php
@@ -2,38 +2,15 @@
namespace App\Http\Controllers\Api\V1;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\CategoryRequest;
use App\Http\Resources\CategoryResource;
-use App\Http\Resources\FolderResource;
-use App\Models\Category;
-use App\Models\Folder;
+use App\Http\Controllers\Controller;
use App\Traits\HttpResponses;
-use Illuminate\Http\Request;
+use App\Models\Category;
class CategoryController extends Controller
{
use HttpResponses;
- /**
- * Display a listing of the resource.
- * Get all folders with video counts from category ID
- */
- public function getFrom(CategoryRequest $request)
- {
- $request->validated($request->all());
-
- try {
- return $this->success(
- FolderResource::collection(
- Folder::where('category_id', $request->category_id)->withCount(['videos'])->get()
- )
- );
- } catch (\Throwable $th) {
- return $this->error(null, 'Unable to get folders. Error: ' . $th->getMessage(), 500);
- }
- }
-
/**
* Display the specified resource.
* Get Category with count of folders with the category id
@@ -43,6 +20,6 @@ class CategoryController extends Controller
*/
public function show(Category $category)
{
- return new CategoryResource(Category::withCount(['folders'])->find($category->id));
+ return new CategoryResource($category);
}
}
diff --git a/app/Http/Controllers/Api/V1/FolderController.php b/app/Http/Controllers/Api/V1/FolderController.php
index ead50e73..5680fe97 100755
--- a/app/Http/Controllers/Api/V1/FolderController.php
+++ b/app/Http/Controllers/Api/V1/FolderController.php
@@ -24,7 +24,7 @@ class FolderController extends Controller
try {
return $this->success(
FolderResource::collection(
- Folder::where('category_id', $request->category_id)->withCount(['videos'])->get()
+ Folder::where('category_id', $request->category_id)->get()
)
);
} catch (\Throwable $th) {
@@ -41,6 +41,6 @@ class FolderController extends Controller
*/
public function show(Folder $folder)
{
- return new FolderResource(Folder::withCount(['videos'])->find($folder->id));
+ return new FolderResource($folder);
}
}
diff --git a/app/Http/Controllers/Api/V1/MetadataController.php b/app/Http/Controllers/Api/V1/MetadataController.php
index fae86766..770c926e 100644
--- a/app/Http/Controllers/Api/V1/MetadataController.php
+++ b/app/Http/Controllers/Api/V1/MetadataController.php
@@ -19,24 +19,24 @@ class MetadataController extends Controller
*/
public function store(MetadataStoreRequest $request)
{
-
try {
$validated = $request->validated();
$video = Video::where('id', $request->video_id)->first();
- if(!$video) return $this->error(null, 'Video does not exist', 404);
+ if (!$video) return $this->error(null, 'Video does not exist', 404);
- $videoInUse = Metadata::where('video_id', $request->video_id)->first();
- if($videoInUse) return $this->error($videoInUse, 'Metadata already exists for this video!', 500);
-
- $metadataExists = Metadata::where('composite_id', $video->folder->path . "/" . basename($video->path))->first();
- if($metadataExists) return $this->error($metadataExists, 'Metadata already exists for another video!', 500);
+ $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['composite_id'] = $video->folder->path . "/" . basename($video->path);
- $metadata = Metadata::create($validated);
+ if ($existing) {
+ $existing->update($validated);
+ return $this->success(new VideoResource($existing->video), $validated); // new MetadataResource($metadata)
+ }
+ $metadata = Metadata::create($validated);
return $this->success(new VideoResource($metadata->video), $validated); // new MetadataResource($metadata)
} catch (\Throwable $th) {
return $this->error(null, 'Unable to create metadata. Error: ' . $th->getMessage(), 500);
@@ -55,8 +55,7 @@ class MetadataController extends Controller
return $this->success(new VideoResource($metadata->video), $validated);
} catch (\Throwable $th) {
- return $this->error(null, 'Unable to edit video metadata. Error: ' . $th->getMessage(), 500);
+ return $this->error($request, 'Unable to edit video metadata. Error: ' . $th->getMessage(), 500);
}
-
}
}
diff --git a/app/Http/Controllers/Api/V1/SeriesController.php b/app/Http/Controllers/Api/V1/SeriesController.php
index f5a6d383..38dd09e1 100644
--- a/app/Http/Controllers/Api/V1/SeriesController.php
+++ b/app/Http/Controllers/Api/V1/SeriesController.php
@@ -25,7 +25,7 @@ class SeriesController extends Controller
* - 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)
*/
-
+
/**
* Display a listing of the resource.
*/
@@ -34,13 +34,12 @@ class SeriesController extends Controller
try {
return $this->success(
SeriesResource::collection(
- Series::all()
+ Series::all()
)
);
} catch (\Throwable $th) {
return $this->error(null, 'Unable to get list of series. Error: ' . $th->getMessage(), 500);
}
-
}
/**
@@ -50,20 +49,22 @@ class SeriesController extends Controller
{
try {
$validated = $request->validated();
-
- $folder = Folder::where('id', $request->folder_id)->first();
- if(!$folder) return $this->error(null, 'Folder does not exist', 404);
- $folderInUse = Series::where('folder_id', $request->folder_id)->first();
- if($folderInUse) return $this->error($folderInUse, 'Series already exists for this folder!', 500);
+ $folder = Folder::where('id', $request->folder_id)->first();
+ if (!$folder) return $this->error(null, 'Folder does not exist', 404);
- $seriesExists = Series::where('composite_id', $folder->path)->first();
- if($seriesExists) return $this->error($seriesExists, 'Series already exists for another folder!', 500);
+ $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['composite_id'] = $folder->path;
- $series = Series::create($validated);
+ if ($existing) {
+ $existing->update($validated);
+ return $this->success(new SeriesResource($existing), $validated); // new MetadataResource($metadata)
+ }
+
+ $series = Series::create($validated);
return $this->success(new SeriesResource($series));
} catch (\Throwable $th) {
return $this->error(null, 'Unable to create series. Error: ' . $th->getMessage(), 500);
@@ -81,7 +82,6 @@ class SeriesController extends Controller
$series->update($validated);
return $this->success(new SeriesResource($series));
-
} catch (\Throwable $th) {
return $this->error(null, 'Unable to edit series. Error: ' . $th->getMessage(), 500);
}
diff --git a/resources/js/service/mediaAPI.ts b/resources/js/service/mediaAPI.ts
index 28040a9e..01719389 100644
--- a/resources/js/service/mediaAPI.ts
+++ b/resources/js/service/mediaAPI.ts
@@ -7,9 +7,6 @@
import { API } from './api';
export default {
- getVideos(data: { folder_id: number }) {
- return API.get(`/videos?folder_id=${data.folder_id}`);
- },
viewVideo(id: number) {
return API.patch(`/videos/watch/${id}`);
},
@@ -19,13 +16,13 @@ export default {
createMetadata(data) {
return API.post(`/metadata/`, data);
},
- updateMetadata(id, data) {
+ updateMetadata(id: number, data) {
return API.patch(`/metadata/${id}`, data);
},
createSeries(data) {
return API.post(`/series`, data);
},
- updateSeries(id, data) {
+ updateSeries(id: number, data) {
return API.patch(`/series/${id}`, data);
},
getCategory(query) {
@@ -34,4 +31,7 @@ export default {
getFolder(id: number) {
return API.get(`/folders/${id}?videos=true`);
},
+ getVideos(data: { folder_id: number }) {
+ return API.get(`/videos?folder_id=${data.folder_id}`);
+ },
};