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

Bug fix on air.txt

Browse Source
This commit is contained in:
Mischa Spelt
2021-01-04 20:55:54 +01:00
parent 444ad56464
commit 9144cc5b06
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,15 +281,16 @@ QUERY;
$activeStudioQuery = app('db')->select("SELECT `studio` FROM `programs_schedule_webcam` WHERE `active` = 1");
if(!count($activeStudioQuery) || !($activeStudio = $activeStudioQuery[0]->studio)) {
$activeStudio = 'nonstop';
}
$current = $this->getTrack($activeStudio);
$next = $this->getTrack($activeStudio, /* next: */ true);
$current->ends($next->start);
if($current->isLayout() /* || $current->secondsRemaining() < 0 */) {
if(!$next->isLayout()) {
$current = $next;
$activeStudio = null;
$current = null;
} else {
$current = $this->getTrack($activeStudio);
$next = $this->getTrack($activeStudio, /* next: */ true);
$current->ends($next->start);
if($current->isLayout() /* || $current->secondsRemaining() < 0 */) {
if(!$next->isLayout()) {
$current = $next;
}
}
}
@@ -314,7 +315,7 @@ QUERY;
$activeStudioQuery = app('db')->select("SELECT `studio` FROM `programs_schedule_webcam` WHERE `active` = 1");
if(!count($activeStudioQuery) || !($activeStudio = $activeStudioQuery[0]->studio)) {
$activeStudio = 'nonstop';
$activeStudio = $program->nonstop ? 'nonstop' : null;
}
$text = [];
@@ -332,7 +333,7 @@ QUERY;
}
}
if(!$request->get('program_only', false) && !($current->isLayout())) {
if($current && !$request->get('program_only', false) && !($current->isLayout())) {
if($current->title) $text[] = $current->title;
if($current->artist) $text[] = $currenet->artist;
}