timw4mail/HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

Version 5.1 - All the GraphQL #32

Closed
timw4mail wants to merge 1160 commits from develop into master
pull from: develop
merge into: timw4mail:master
Conversation 0 Commits 1160 Files Changed 547 +17 -26
1 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 12be7b8a1e - Show all commits

43
src/AnimeClient/API/Kitsu/Transformer/AnimeHistoryTransformer.php
View File

@ -73,30 +73,26 @@ class AnimeHistoryTransformer {
$count = count($singles); $count = count($singles);
for ($i = 0; $i < $count; $i++) for ($i = 0; $i < $count; $i++)
{ {
$entries = [];
$entry = $singles[$i]; $entry = $singles[$i];
$prevTitle = $entry['title']; $prevTitle = $entry['title'];
$nextId = $i + 1; $nextId = $i;
if ($nextId < $count) $next = $singles[$nextId];
{ while (
$entries = []; $next['kind'] === 'progressed' &&
$next = $singles[$nextId]; $next['title'] === $prevTitle
while ( ) {
$next['kind'] === 'progressed' && $entries[] = $next;
$next['title'] === $prevTitle $prevTitle = $next['title'];
) {
$entries[] = $next;
$prevTitle = $next['title'];
if ($nextId + 1 < $count) if ($nextId + 1 < $count)
{ {
$nextId++; $nextId++;
$next = $singles[$nextId]; $next = $singles[$nextId];
} continue;
else
{
break;
}
} }
break;
} }
if (count($entries) > 1) if (count($entries) > 1)
@ -112,9 +108,6 @@ class AnimeHistoryTransformer {
$title = $entries[0]['title']; $title = $entries[0]['title'];
// Get rid of the single entry added before aggregating
// array_pop($output);
$action = (count($entries) > 3) $action = (count($entries) > 3)
? "Marathoned episodes {$firstEpisode}-{$lastEpisode} of {$title}" ? "Marathoned episodes {$firstEpisode}-{$lastEpisode} of {$title}"
: "Watched episodes {$firstEpisode}-{$lastEpisode} of {$title}"; : "Watched episodes {$firstEpisode}-{$lastEpisode} of {$title}";
@ -128,13 +121,11 @@ class AnimeHistoryTransformer {
]); ]);
// Skip the rest of the aggregate in the main loop // Skip the rest of the aggregate in the main loop
$i += count($entries); $i += count($entries) - 1;
$prevTitle = $title;
continue; continue;
} }
else else
{ {
$prevTitle = $entry['title'];
$output[] = $entry; $output[] = $entry;
} }