tilderadio/AzuraCast
4
0
Fork 0
mirror of https://github.com/AzuraCast/AzuraCast.git synced 2024-06-18 06:57:05 +00:00
Code Issues Releases Wiki Activity

Add richer listener user-agent details to the listener report.

Browse Source
This commit is contained in:
Buster "Silver Eagle" Neece 2020-12-18 11:04:57 -06:00
parent 80bf66a337
commit d8470edee0
No known key found for this signature in database
GPG Key ID: 6D9E12FF03411F4E
3 changed files with 57 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/Controller/Api/Stations/ListenersController.php
View File

@ -133,6 +133,40 @@ class ListenersController
$locale = $request->getAttribute('locale');
/** @var Entity\Api\Listener[] $listeners */
$listeners = [];
foreach ($listeners_raw as $listener) {
$userAgent = (string)$listener['listener_user_agent'];
$dd = $this->deviceDetector->parse($userAgent);
if ($dd->isBot()) {
$clientBot = $dd->getBot();
$clientBotName = $clientBot['name'] ?? 'Unknown Crawler';
$clientBotType = $clientBot['category'] ?? 'Generic Crawler';
$client = $clientBotName . ' (' . $clientBotType . ')';
} else {
$clientInfo = $dd->getClient();
$clientBrowser = $clientInfo['name'] ?? 'Unknown Browser';
$clientVersion = $clientInfo['version'] ?? '0.00';
$clientOsInfo = $dd->getOs();
$clientOs = $clientOsInfo['name'] ?? 'Unknown OS';
$client = $clientBrowser . ' ' . $clientVersion . ', ' . $clientOs;
}
$api = new Entity\Api\Listener();
$api->ip = (string)$listener['listener_ip'];
$api->user_agent = $userAgent;
$api->client = $client;
$api->is_mobile = $dd->isMobile();
$api->connected_on = (int)$listener['timestamp_start'];
$api->connected_time = Entity\Listener::getListenerSeconds($listener['intervals']);
$api->location = $this->geoLite->getLocationInfo($listener['listener_ip'], $locale);
$listeners[] = $api;
}
$format = $params['format'] ?? 'json';
if ('csv' === $format) {
@ -141,6 +175,7 @@ class ListenersController
'IP',
'Seconds Connected',
'User Agent',
'Client',
'Is Mobile',
'Location',
'Country',
@ -149,16 +184,16 @@ class ListenersController
],
];
foreach ($listeners_raw as $listener) {
$location = $this->geoLite->getLocationInfo($listener['listener_ip'], $locale);
foreach ($listeners as $listener) {
$export_row = [
(string)$listener['listener_ip'],
Entity\Listener::getListenerSeconds($listener['intervals']),
(string)$listener['listener_user_agent'],
$this->isMobile($listener['listener_user_agent']) ? 'true' : 'false',
$listener->ip,
$listener->connected_time,
$listener->user_agent,
$listener->client,
$listener->is_mobile,
];
$location = $listener->location;
if ('success' === $location['status']) {
$export_row[] = $location['region'] . ', ' . $location['country'];
$export_row[] = $location['country'];
@ -180,25 +215,6 @@ class ListenersController
return $response->renderStringAsFile($csv_file, 'text/csv', $csv_filename);
}
$listeners = [];
foreach ($listeners_raw as $listener) {
$api = new Entity\Api\Listener();
$api->ip = (string)$listener['listener_ip'];
$api->user_agent = (string)$listener['listener_user_agent'];
$api->is_mobile = $this->isMobile($listener['listener_user_agent']);
$api->connected_on = (int)$listener['timestamp_start'];
$api->connected_time = Entity\Listener::getListenerSeconds($listener['intervals']);
$api->location = $this->geoLite->getLocationInfo($listener['listener_ip'], $locale);
$listeners[] = $api;
}
return $response->withJson($listeners);
}
protected function isMobile(string $userAgent): bool
{
$dd = $this->deviceDetector->parse($userAgent);
return $dd->isMobile();
}
}

8
src/Entity/Api/Listener.php
View File

@ -27,6 +27,14 @@ class Listener
*/
public string $user_agent = '';
/**
* The listener's client details (extracted from user-agent)
*
* @OA\Property(example="")
* @var string
*/
public string $client = '';
/**
* Whether the user-agent is likely a mobile browser.
*

10
templates/stations/reports/listeners.phtml
View File

@ -22,8 +22,11 @@ $assets
<?=__('Listeners')?>
</h2>
<div class="flex-shrink">
<a class="btn btn-bg" id="btn-export" href="<?=$router->fromHere('api:listeners:index', [],
['format' => 'csv'])?>" target="_blank" title="<?=__('Download CSV')?>">
<a class="btn btn-bg" id="btn-export" href="<?=$router->fromHere(
'api:listeners:index',
[],
['format' => 'csv']
)?>" target="_blank" title="<?=__('Download CSV')?>">
<i class="material-icons" aria-hidden="true">file_download</i> <?=__('Download CSV')?>
</a>
<a class="btn btn-bg dropdown-toggle" id="reportrange" href="#">
@ -74,7 +77,8 @@ $assets
<i class="material-icons" aria-hidden="true">desktop_windows</i>
<span class="sr-only"><?=__('Desktop Device')?></span>
</span>
{{ listener.user_agent }}
{{ listener.user_agent }} <br>
<small>{{ listener.client }}</small>
</td>
<td>
<span v-if="listener.location.status == 'success'">