From b1981394284ffd509d203c16c0a533e6a050ed1a Mon Sep 17 00:00:00 2001 From: Mischa Spelt Date: Tue, 7 Jul 2020 21:37:15 +0200 Subject: [PATCH] Fallback indien NH niet bereikbaar --- api/app/Http/Controllers/NewsController.php | 12 +++++++----- api/app/Http/Controllers/ProgramController.php | 13 +++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/api/app/Http/Controllers/NewsController.php b/api/app/Http/Controllers/NewsController.php index 4ea2a0b..a10b378 100644 --- a/api/app/Http/Controllers/NewsController.php +++ b/api/app/Http/Controllers/NewsController.php @@ -308,11 +308,13 @@ QUERY 'news' => new \Model\NewsItem($item['data'], $item['images'], $item['podcast'])); if($externalId = (int)$item['data']->external_id) { - $externalSource = json_decode(file_get_contents($this->EXTERNAL_NEWS_API . 'news?source=api&externalid=' . (int)$externalId)); - if($externalSource) { - $data['version'] = 2; - $data['source'] = $externalSource->news; - } + try { + $externalSource = json_decode(file_get_contents($this->EXTERNAL_NEWS_API . 'news?source=api&externalid=' . (int)$externalId)); + if($externalSource) { + $data['version'] = 2; + $data['source'] = $externalSource->news; + } + } catch(\ErrorException $e) {} } return response()->json($data); diff --git a/api/app/Http/Controllers/ProgramController.php b/api/app/Http/Controllers/ProgramController.php index 4ec228c..6d75255 100644 --- a/api/app/Http/Controllers/ProgramController.php +++ b/api/app/Http/Controllers/ProgramController.php @@ -252,12 +252,13 @@ QUERY; return new \Model\Track($data[0]); } - private function isStreamEnabled($schedule_id) { + private function isStreamEnabled() { if(!($stream = env('STUDIO_STREAM'))) { - return true; + return false; } - $enableCameraQuery = app('db')->select("SELECT COUNT(*) AS is_enabled FROM `programs_schedule_webcam` WHERE `programs_schedule` = " . (int)$schedule_id . " AND camera = 'STUDIO1'"); - if($enableCamera = $enableCameraQuery[0]->is_enabled) { + + $enableCameraQuery = app('db')->select("SELECT camera FROM `programs_schedule_webcam` WHERE `active` = 1"); + if(count($enableCameraQuery) && ($enableCamera = $enableCameraQuery[0]->camera)) { $isStreamDisabled = 1; $output = []; exec("ffprobe -v quiet -show_streams '$stream'", $output, $isStreamDisabled); @@ -289,9 +290,9 @@ QUERY; $current = $next; } - return response()->json(['inProgram' => false, 'stream' => false, 'current' => $current, 'program' => $program]); + return response()->json(['inProgram' => false, 'stream' => $this->isStreamEnabled(), 'current' => $current, 'program' => $program]); } else { - $canStream = $this->isStreamEnabled($schema['schedule'][0]['id']); + $canStream = $this->isStreamEnabled(); return response()->json(['inProgram' => true, 'stream' => $canStream, 'program' => $program]); } }