NH_Gooi/api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fallback indien NH niet bereikbaar

Browse Source
This commit is contained in:
Mischa Spelt
2020-07-07 21:37:15 +02:00
parent e8adece8d8
commit b198139428
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/app/Http/Controllers/NewsController.php
View File

@@ -308,11 +308,13 @@ QUERY
'news' => new \Model\NewsItem($item['data'], $item['images'], $item['podcast'])); 'news' => new \Model\NewsItem($item['data'], $item['images'], $item['podcast']));
if($externalId = (int)$item['data']->external_id) { if($externalId = (int)$item['data']->external_id) {
try {
$externalSource = json_decode(file_get_contents($this->EXTERNAL_NEWS_API . 'news?source=api&externalid=' . (int)$externalId)); $externalSource = json_decode(file_get_contents($this->EXTERNAL_NEWS_API . 'news?source=api&externalid=' . (int)$externalId));
if($externalSource) { if($externalSource) {
$data['version'] = 2; $data['version'] = 2;
$data['source'] = $externalSource->news; $data['source'] = $externalSource->news;
} }
} catch(\ErrorException $e) {}
} }
return response()->json($data); return response()->json($data);

13
api/app/Http/Controllers/ProgramController.php
View File

@@ -252,12 +252,13 @@ QUERY;
return new \Model\Track($data[0]); return new \Model\Track($data[0]);
} }
private function isStreamEnabled($schedule_id) { private function isStreamEnabled() {
if(!($stream = env('STUDIO_STREAM'))) { 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; $isStreamDisabled = 1;
$output = []; $output = [];
exec("ffprobe -v quiet -show_streams '$stream'", $output, $isStreamDisabled); exec("ffprobe -v quiet -show_streams '$stream'", $output, $isStreamDisabled);
@@ -289,9 +290,9 @@ QUERY;
$current = $next; $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 { } else {
$canStream = $this->isStreamEnabled($schema['schedule'][0]['id']); $canStream = $this->isStreamEnabled();
return response()->json(['inProgram' => true, 'stream' => $canStream, 'program' => $program]); return response()->json(['inProgram' => true, 'stream' => $canStream, 'program' => $program]);
} }
} }