Skip to content

A self-hosted media server and file management system

restructure controllers and requests

aminnausinc5150feab9fa
diff --git a/app/Http/Controllers/Api/V1/AuthController.php b/app/Http/Controllers/Api/V1/AuthController.php
index 2a5f8964..d9cb4567 100755
--- a/app/Http/Controllers/Api/V1/AuthController.php
+++ b/app/Http/Controllers/Api/V1/AuthController.php
@@ -3,8 +3,8 @@
namespace App\Http\Controllers\Api\V1;
use App\Http\Controllers\Controller;
-use App\Http\Requests\LoginUserRequest;
-use App\Http\Requests\StoreUserRequest;
+use App\Http\Requests\UserLoginRequest;
+use App\Http\Requests\UserStoreRequest;
use App\Models\User;
use App\Traits\HttpResponses;
use Illuminate\Http\RedirectResponse;
@@ -30,7 +30,7 @@ class AuthController extends Controller
/**
* Attempt to authenticate the request's credentials.
*/
- public function login(LoginUserRequest $request)
+ public function login(UserLoginRequest $request)
{
$request->validated($request->all());
if(!Auth::attempt($request->only('email', 'password'),$request->remember_me)){
@@ -53,7 +53,7 @@ class AuthController extends Controller
}
}
- public function register(StoreUserRequest $request)
+ public function register(UserStoreRequest $request)
{
$request->validated($request->all());
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/Api/V1/ProfileController.php
old mode 100755
new mode 100644
similarity index 54%
rename from app/Http/Controllers/ProfileController.php
rename to app/Http/Controllers/Api/V1/ProfileController.php
index 815a14ce..b7a6a115
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/Api/V1/ProfileController.php
@@ -1,7 +1,8 @@
<?php
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Api\V1;
+use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
class ProfileController extends Controller
diff --git a/app/Http/Controllers/RecordController.php b/app/Http/Controllers/Api/V1/RecordController.php
old mode 100755
new mode 100644
similarity index 96%
rename from app/Http/Controllers/RecordController.php
rename to app/Http/Controllers/Api/V1/RecordController.php
index 919503d5..b23b6d59
--- a/app/Http/Controllers/RecordController.php
+++ b/app/Http/Controllers/Api/V1/RecordController.php
@@ -1,7 +1,8 @@
<?php
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Api\V1;
+use App\Http\Controllers\Controller;
use App\Http\Requests\RecordGetRequest;
use App\Http\Requests\RecordStoreRequest;
use App\Http\Resources\RecordResource;
@@ -20,6 +21,7 @@ class RecordController extends Controller
*/
public function index(Request $request)
{
+ return $this->success($request);
if(isset($request->limit) && is_numeric($request->limit)){
return $this->success(
RecordResource::collection(
diff --git a/app/Http/Requests/UpdateMetadataRequest.php b/app/Http/Requests/MetadataStoreRequest.php
similarity index 93%
rename from app/Http/Requests/UpdateMetadataRequest.php
rename to app/Http/Requests/MetadataStoreRequest.php
index d0fc085b..8554b7f0 100644
--- a/app/Http/Requests/UpdateMetadataRequest.php
+++ b/app/Http/Requests/MetadataStoreRequest.php
@@ -4,7 +4,7 @@ namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
-class UpdateMetadataRequest extends FormRequest
+class MetadataStoreRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
diff --git a/app/Http/Requests/MetadataUpdateRequest.php b/app/Http/Requests/MetadataUpdateRequest.php
new file mode 100644
index 00000000..7ef8fda8
--- /dev/null
+++ b/app/Http/Requests/MetadataUpdateRequest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class MetadataUpdateRequest extends FormRequest
+{
+ /**
+ * Determine if the user is authorized to make this request.
+ */
+ public function authorize(): bool
+ {
+ return false;
+ }
+
+ /**
+ * Get the validation rules that apply to the request.
+ *
+ * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+ */
+ public function rules(): array
+ {
+ return [
+ 'title' => 'required|max:255',
+ 'description' => 'max:512',
+ 'episode' => 'nullable|integer|min:0',
+ 'season' => 'nullable|integer|min:1',
+ ];
+ }
+}
diff --git a/app/Http/Requests/StorePlaybackRequest.php b/app/Http/Requests/PlaybackStoreRequest.php
similarity index 77%
rename from app/Http/Requests/StorePlaybackRequest.php
rename to app/Http/Requests/PlaybackStoreRequest.php
index 59a8743a..ef236bcb 100644
--- a/app/Http/Requests/StorePlaybackRequest.php
+++ b/app/Http/Requests/PlaybackStoreRequest.php
@@ -4,7 +4,7 @@ namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
-class StorePlaybackRequest extends FormRequest
+class PlaybackStoreRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
@@ -22,7 +22,8 @@ class StorePlaybackRequest extends FormRequest
public function rules(): array
{
return [
- //
+ 'metadata_id' => ['required'],
+ 'progress' => ['required','min:0','max:100']
];
}
}
diff --git a/app/Http/Requests/UpdateSeriesRequest.php b/app/Http/Requests/SeriesStoreRequest.php
similarity index 93%
rename from app/Http/Requests/UpdateSeriesRequest.php
rename to app/Http/Requests/SeriesStoreRequest.php
index cbe193f0..353905ba 100644
--- a/app/Http/Requests/UpdateSeriesRequest.php
+++ b/app/Http/Requests/SeriesStoreRequest.php
@@ -4,7 +4,7 @@ namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
-class UpdateSeriesRequest extends FormRequest
+class SeriesStoreRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
diff --git a/app/Http/Requests/SeriesUpdateRequest.php b/app/Http/Requests/SeriesUpdateRequest.php
new file mode 100644
index 00000000..f3507626
--- /dev/null
+++ b/app/Http/Requests/SeriesUpdateRequest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class SeriesUpdateRequest extends FormRequest
+{
+ /**
+ * Determine if the user is authorized to make this request.
+ */
+ public function authorize(): bool
+ {
+ return false;
+ }
+
+ /**
+ * Get the validation rules that apply to the request.
+ *
+ * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+ */
+ public function rules(): array
+ {
+ return [
+ 'title' => 'required|max:255',
+ 'description' => 'max:512',
+ 'episode' => 'nullable|integer|min:0',
+ 'season' => 'nullable|integer|min:1',
+ ];
+ }
+}
diff --git a/app/Http/Requests/LoginUserRequest.php b/app/Http/Requests/UserLoginRequest.php
old mode 100755
new mode 100644
similarity index 93%
rename from app/Http/Requests/LoginUserRequest.php
rename to app/Http/Requests/UserLoginRequest.php
index f09a7853..20354243
--- a/app/Http/Requests/LoginUserRequest.php
+++ b/app/Http/Requests/UserLoginRequest.php
@@ -4,7 +4,7 @@ namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
-class LoginUserRequest extends FormRequest
+class UserLoginRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
diff --git a/app/Http/Requests/StoreUserRequest.php b/app/Http/Requests/UserStoreRequest.php
old mode 100755
new mode 100644
similarity index 94%
rename from app/Http/Requests/StoreUserRequest.php
rename to app/Http/Requests/UserStoreRequest.php
index 52c69923..ea332cee
--- a/app/Http/Requests/StoreUserRequest.php
+++ b/app/Http/Requests/UserStoreRequest.php
@@ -5,7 +5,7 @@ namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rules;
-class StoreUserRequest extends FormRequest
+class UserStoreRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
diff --git a/routes/api.php b/routes/api.php
index b6096b6d..7d8c4aea 100755
--- a/routes/api.php
+++ b/routes/api.php
@@ -2,11 +2,14 @@
use App\Http\Controllers\Api\V1\AuthController;
use App\Http\Controllers\Api\V1\FolderController;
+use App\Http\Controllers\Api\V1\MetadataController;
+use App\Http\Controllers\Api\V1\PlaybackController;
use App\Http\Controllers\Api\V1\SeriesController;
use App\Http\Controllers\Api\V1\VideoController;
+use App\Http\Controllers\Api\V1\ProfileController;
+use App\Http\Controllers\Api\V1\RecordController;
use App\Http\Controllers\DirectoryController;
-use App\Http\Controllers\ProfileController;
-use App\Http\Controllers\RecordController;
+
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Route;
@@ -31,6 +34,8 @@ Route::get('/{dir}/{folderName}', [DirectoryController::class, 'showDirectoryAPI
Route::resource('/videos', VideoController::class);
Route::resource('/folders', FolderController::class);
Route::resource('/series', SeriesController::class);
+Route::resource('/metadata', MetadataController::class);
+Route::resource('/playback', PlaybackController::class);
Route::post('/login', [AuthController::class, 'login']); // Deprecate
Route::post('/register', [AuthController::class, 'register']); // Deprecate