PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2025-04-01 00:35:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixing data to accurately represent plays

Browse source
This commit is contained in:
Josef Citrine 2016-05-03 23:20:38 +01:00
parent 7a73e20929
commit 473d1d7b38
1 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
app/Http/Controllers/Api/Web/StatsController.php
View file

@ -30,6 +30,13 @@ use Carbon\Carbon;
class StatsController extends ApiControllerBase class StatsController extends ApiControllerBase
{ {
private function pluralise($count, $singular, $plural = false)
{
if (!$plural) $plural = $singular . 's';
return ($count == 1 ? $singular : $plural) ;
}
public function getTrackStatsHourly($id) public function getTrackStatsHourly($id)
{ {
// I know, raw SQL ugh. I'm not used to laravel's query system // I know, raw SQL ugh. I'm not used to laravel's query system
@ -47,7 +54,7 @@ class StatsController extends ApiControllerBase
foreach($query as $item) { foreach($query as $item) {
$playDate = new Carbon($item->time); $playDate = new Carbon($item->time);
$key = '-' . $playDate->diffInHours($now); $key = $playDate->diffInHours($now);
if (array_key_exists($key, $calcArray)) { if (array_key_exists($key, $calcArray)) {
$calcArray[$key] += $item->plays; $calcArray[$key] += $item->plays;
} else { } else {
@ -55,9 +62,21 @@ class StatsController extends ApiControllerBase
} }
} }
// Get the first key in the array (oldest play)
reset($calcArray);
$lastKey = intval(key($calcArray));
for ($i = 0; $i < $lastKey; $i++) {
if (!isset($calcArray[$i])) {
$calcArray[$i] = 0;
}
}
krsort($calcArray);
// Covert calcArray into output we can understand // Covert calcArray into output we can understand
foreach($calcArray as $hour => $plays) { foreach($calcArray as $hour => $plays) {
$set = array('hour' => $hour . 'hours', 'plays' => $plays); $set = array('hour' => $hour . ' ' . $this->pluralise($hour, 'hour', 'hours'), 'plays' => $plays);
array_push($output, $set); array_push($output, $set);
} }
@ -82,7 +101,7 @@ class StatsController extends ApiControllerBase
foreach($query as $item) { foreach($query as $item) {
$playDate = new Carbon($item->time); $playDate = new Carbon($item->time);
$key = '-' . $playDate->diffInDays($now); $key = $playDate->diffInDays($now);
if (array_key_exists($key, $calcArray)) { if (array_key_exists($key, $calcArray)) {
$calcArray[$key] += $item->plays; $calcArray[$key] += $item->plays;
} else { } else {
@ -90,9 +109,21 @@ class StatsController extends ApiControllerBase
} }
} }
// Get the first key in the array (oldest play)
reset($calcArray);
$lastKey = intval(key($calcArray));
for ($i = 0; $i < $lastKey; $i++) {
if (!isset($calcArray[$i])) {
$calcArray[$i] = 0;
}
}
krsort($calcArray);
// Covert calcArray into output we can understand // Covert calcArray into output we can understand
foreach($calcArray as $days => $plays) { foreach($calcArray as $days => $plays) {
$set = array('days' => $days . ' days', 'plays' => $plays); $set = array('days' => $days . ' ' . $this->pluralise($days, 'day', 'days'), 'plays' => $plays);
array_push($output, $set); array_push($output, $set);
} }