Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: move stream stats status to pref table

Browse source
This commit is contained in:
jo 2022-08-06 23:56:58 +02:00 • committed by Kyle Robbertze
parent 2b533d4724
commit 406d42323a
7 changed files with 57 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
legacy/application/controllers/ApiController.php
View file

@ -1389,8 +1389,8 @@ class ApiController extends Zend_Controller_Action
return;
}
foreach ($data as $k => $v) {
Application_Model_StreamSetting::SetListenerStatError($k, $v);
foreach ($data as $stream_id => $status) {
Application_Model_Preference::SetListenerStatError($stream_id, $status);
}
}

10
legacy/application/controllers/ListenerstatController.php
View file

@ -41,15 +41,15 @@ class ListenerstatController extends Zend_Controller_Action
'his_time_end' => $endsDT->format('H:i'),
]);
$errorStatus = Application_Model_StreamSetting::GetAllListenerStatErrors();
$errorStatus = Application_Model_Preference::GetAllListenerStatErrors();
Logging::info($errorStatus);
$out = [];
foreach ($errorStatus as $v) {
$key = explode('_listener_stat_error', $v['keyname']);
if ($v['value'] != 'OK') {
$v['value'] = _('Please make sure admin user/password is correct on Settings->Streams page.');
$key = explode(':', $v['keystr']);
if ($v['valstr'] != 'OK') {
$v['valstr'] = _('Please make sure admin user/password is correct on Settings->Streams page.');
}
$out[$key[0]] = $v['value'];
$out['stream ' . $key[1]] = $v['valstr'];
}
$this->view->errorStatus = $out;

17
legacy/application/models/Preference.php
View file

@ -1677,4 +1677,21 @@ class Application_Model_Preference
return ($result !== false) ? $result : null;
}
public static function GetAllListenerStatErrors()
{
$sql = <<<'SQL'
SELECT *
FROM cc_pref
WHERE keystr LIKE 'stream_stats_status:%'
SQL;
return Application_Common_Database::prepareAndExecute($sql, []);
}
public static function SetListenerStatError($stream_id, $value)
{
$stream_id = trim($stream_id, 's');
self::setValue("stream_stats_status:{$stream_id}", $value);
}
}

23
legacy/application/models/StreamSetting.php
View file

@ -436,29 +436,6 @@ class Application_Model_StreamSetting
self::setValue($stream . '_admin_pass', $v, 'string');
}
public static function GetAllListenerStatErrors()
{
$sql = 'SELECT * FROM cc_stream_setting WHERE keyname like :p1';
$mounts = Application_Common_Database::prepareAndExecute($sql, [':p1' => '%_mount']);
$mps = [];
foreach ($mounts as $mount) {
$mps[] = "'" . $mount['value'] . "_listener_stat_error'";
}
$in = implode(',', $mps);
$sql = "SELECT * FROM cc_stream_setting WHERE keyname IN ( {$in} )";
return Application_Common_Database::prepareAndExecute($sql, []);
}
public static function SetListenerStatError($key, $v)
{
self::setValue($key, $v, 'string');
}
public static function getIcecastVorbisMetadata()
{
return self::getValue('icecast_vorbis_metadata', '');