A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
chore: remove redundant PHP code
aminnausine03eb2f00d02
diff --git a/app/Http/Controllers/Api/V1/PlaybackController.php b/app/Http/Controllers/Api/V1/PlaybackController.phpindex 1d8ab1c0..3c9bbbe7 100644--- a/app/Http/Controllers/Api/V1/PlaybackController.php+++ b/app/Http/Controllers/Api/V1/PlaybackController.php@@ -54,7 +54,7 @@ class PlaybackController extends Controller {// $playbackIndex = array_search($existing['id'], array_column($playback, 'id'));// $playbackIndex !== false ? $playback[$playbackIndex] = $existing : $playback[] = $existing;} else {- $result = Playback::create($entry);+ Playback::create($entry);}// $playback[] = $result;$playbackUpdates += 1;diff --git a/app/Http/Controllers/Api/V1/RecordController.php b/app/Http/Controllers/Api/V1/RecordController.phpindex bc1ff60a..7f0eb903 100644--- a/app/Http/Controllers/Api/V1/RecordController.php+++ b/app/Http/Controllers/Api/V1/RecordController.php@@ -38,9 +38,7 @@ class RecordController extends Controller {}try {- $viewCount = Record::where('user_id', Auth::user()->id)->where('metadata_id', $metadata->id)->count();-- return $viewCount;+ return Record::where('user_id', Auth::user()->id)->where('metadata_id', $metadata->id)->count();} catch (\Throwable $th) {return $this->error(null, 'Unable to user view count. Error: ' . $th->getMessage(), 500);}diff --git a/app/Http/Controllers/Api/V1/UserController.php b/app/Http/Controllers/Api/V1/UserController.phpindex fd27cbe4..42510771 100644--- a/app/Http/Controllers/Api/V1/UserController.php+++ b/app/Http/Controllers/Api/V1/UserController.php@@ -56,11 +56,10 @@ class UserController extends Controller {}try {- $count = DB::table('sessions')- ->whereNotNull('user_id')- ->count();-- return $count;+ return+ DB::table('sessions')+ ->whereNotNull('user_id')+ ->count();} catch (\Throwable $th) {return $this->error(null, 'Unable to get count of logged in of users. Error: ' . $th->getMessage(), 500);}diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.phpindex a8dec286..a3f3e8e8 100755--- a/app/Http/Controllers/DirectoryController.php+++ b/app/Http/Controllers/DirectoryController.php@@ -344,7 +344,7 @@ class DirectoryController extends Controller {$task = $this->setupTask($userId, $name, $description);$chain = [];- foreach ($files as $key => $file) {+ foreach ($files as $file) {$chain[] = new EmbedUidInMetadata($file['path'], $file['uuid'], $task->id);}diff --git a/app/Http/Resources/Pulse/ScheduleResource.php b/app/Http/Resources/Pulse/ScheduleResource.phpindex eabc6132..9e6238e4 100644--- a/app/Http/Resources/Pulse/ScheduleResource.php+++ b/app/Http/Resources/Pulse/ScheduleResource.php@@ -25,15 +25,14 @@ class ScheduleResource extends PulseResource {$kernel->bootstrap();$timezone = new DateTimeZone(config('app.timezone')); // @phpstan-ignore-line- $events = collect($schedule->events())++ return collect($schedule->events())->map(fn (Event $event): array => ['command' => $this->getCommand($event),'expression' => $this->getExpression($event),'next_due' => $this->getNextDueDateForEvent($event, $timezone)->diffForHumans(),]);-- return $events;});return [diff --git a/app/Jobs/CleanFolderPaths.php b/app/Jobs/CleanFolderPaths.phpindex 63abc4b9..620f4f8e 100644--- a/app/Jobs/CleanFolderPaths.php+++ b/app/Jobs/CleanFolderPaths.php@@ -93,7 +93,7 @@ class CleanFolderPaths implements ShouldQueue {$changes['path'] = $newPath;}- if (count($changes) > 0) {+ if (! empty($changes)) {array_push($transactions, [...$stored, ...$changes]);}@@ -107,7 +107,7 @@ class CleanFolderPaths implements ShouldQueue {}}- if (count($transactions) == 0 || $error == true) {+ if (empty($transactions) || $error) {return 'No Changes Found';}Folder::upsert($transactions, 'id', ['path']);diff --git a/app/Jobs/CleanVideoPaths.php b/app/Jobs/CleanVideoPaths.phpindex fd495449..4c86c510 100644--- a/app/Jobs/CleanVideoPaths.php+++ b/app/Jobs/CleanVideoPaths.php@@ -93,7 +93,7 @@ class CleanVideoPaths implements ShouldQueue {$changes['path'] = $newPath;}- if (count($changes) > 0) {+ if (! empty($changes)) {array_push($transactions, [...$stored, ...$changes]);}@@ -106,7 +106,7 @@ class CleanVideoPaths implements ShouldQueue {throw new \Exception($errorMessage);}}- if (count($transactions) == 0 || $error == true) {+ if (empty($transactions) || $error) {return 'No Changes Found';}diff --git a/app/Jobs/IndexFiles.php b/app/Jobs/IndexFiles.phpindex b964fb14..16696555 100755--- a/app/Jobs/IndexFiles.php+++ b/app/Jobs/IndexFiles.php@@ -74,7 +74,7 @@ class IndexFiles implements ShouldBeUnique, ShouldQueue {if (count($this->embedChain)) {$this->taskService->updateTaskCounts($this->taskId, ['sub_tasks_complete' => '++', 'sub_tasks_total' => count($this->embedChain), 'sub_tasks_pending' => count($this->embedChain)]);- foreach ($this->embedChain as $key => $embedTask) {+ foreach ($this->embedChain as $embedTask) {Bus::dispatch($embedTask);}// $controller = new DirectoryController($this->taskService);@@ -609,5 +609,4 @@ class IndexFiles implements ShouldBeUnique, ShouldQueue {return 'Generated ' . $count . ' ' . $type . ' Changes';}}-class BatchCancelledException extends \Exception {-}+class BatchCancelledException extends \Exception {}diff --git a/app/Jobs/VerifyFiles.php b/app/Jobs/VerifyFiles.phpindex e8dbd34b..569e0b8a 100755--- a/app/Jobs/VerifyFiles.php+++ b/app/Jobs/VerifyFiles.php@@ -91,7 +91,7 @@ class VerifyFiles implements ShouldQueue {if (count($this->embedChain)) {$this->taskService->updateTaskCounts($this->taskId, ['sub_tasks_complete' => '++', 'sub_tasks_total' => count($this->embedChain), 'sub_tasks_pending' => count($this->embedChain)]);- foreach ($this->embedChain as $key => $embedTask) {+ foreach ($this->embedChain as $embedTask) {Bus::dispatch($embedTask);}// $controller = new DirectoryController($this->taskService);@@ -204,10 +204,10 @@ class VerifyFiles implements ShouldQueue {}}- preg_match('![sS][0-9]+!', $video->name, $seasonRaw);- preg_match('![eE][0-9]+!', $video->name, $episodeRaw);- preg_match('![0-9]+!', $seasonRaw[0] ?? '', $season);- preg_match('![0-9]+!', $episodeRaw[0] ?? '', $episode);+ preg_match('![sS]\d+!', $video->name, $seasonRaw);+ preg_match('![eE]\d+!', $video->name, $episodeRaw);+ preg_match('!\d+!', $seasonRaw[0] ?? '', $season);+ preg_match('!\d+!', $episodeRaw[0] ?? '', $episode);if (is_null($metadata->duration)) {$this->confirmMetadata($filePath);@@ -286,7 +286,7 @@ class VerifyFiles implements ShouldQueue {}is_null($metadata->view_count) ? $changes['view_count'] = Record::where('video_id', $video->id)->whereNull('metadata_id')->count() + ($metadata->id ? Record::where('metadata_id', $metadata->id)->count() : 0) : $stored['view_count'] = $metadata->view_count;- if (count($changes) > 0) {+ if (! empty($changes)) {$changes['date_scanned'] = date('Y-m-d h:i:s A');array_push($transactions, [...$stored, ...$changes]);// dump(count([...$stored, ...$changes]));@@ -312,7 +312,7 @@ class VerifyFiles implements ShouldQueue {}try {- if (count($transactions) == 0 || $error == true) {+ if (empty($transactions) || $error) {return 'No Changes Found';}diff --git a/app/Jobs/VerifyFolders.php b/app/Jobs/VerifyFolders.phpindex ab43221a..5129b55e 100644--- a/app/Jobs/VerifyFolders.php+++ b/app/Jobs/VerifyFolders.php@@ -55,7 +55,7 @@ class VerifyFolders implements ShouldQueue {$this->taskService->updateSubTask($this->subTaskId, ['status' => TaskStatus::PROCESSING, 'started_at' => $this->startedAt]);try {- $summary = $this->VerifyFolders();+ $summary = $this->verifyFolders();$endedAt = now();$duration = (int) $this->startedAt->diffInSeconds($endedAt);$this->taskService->updateTaskCounts($this->taskId, ['sub_tasks_complete' => '++'], false);@@ -75,7 +75,7 @@ class VerifyFolders implements ShouldQueue {}}- private function VerifyFolders() {+ private function verifyFolders() {if (count($this->folders) == 0) {throw new \Exception('Folder Data Lost');}@@ -114,7 +114,7 @@ class VerifyFolders implements ShouldQueue {$changes['total_size'] = $totalSize;}- if (count($changes) > 0) {+ if (! empty($changes)) {array_push($transactions, [...$stored, ...$changes]);// dump([...$stored, ...$changes]);// dump($changes);@@ -136,7 +136,7 @@ class VerifyFolders implements ShouldQueue {}try {- if (count($transactions) == 0 || $error == true) {+ if (empty($transactions) || $error) {return 'No Changes Found';}diff --git a/app/Services/TaskService.php b/app/Services/TaskService.phpindex beb6e95c..1ca63913 100644--- a/app/Services/TaskService.php+++ b/app/Services/TaskService.php@@ -24,9 +24,7 @@ class TaskService {}public function createSubTask(array $attrs): SubTask {- $subTask = SubTask::create($attrs);-- return $subTask;+ return SubTask::create($attrs);}/**