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

Minor model refactoring

This commit is contained in:
Timothy Warren 2017-03-14 14:28:08 -04:00
parent b38d5811a4
commit 39e083d17c
1 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/API/Kitsu/Model.php
View File

@ -254,9 +254,10 @@ class Model {
/** /**
* Get the number of anime list items * Get the number of anime list items
* *
* @param string $status - Optional status to filter by
* @return int * @return int
*/ */
public function getAnimeListCount() : int public function getAnimeListCount(string $status = '') : int
{ {
$options = [ $options = [
'query' => [ 'query' => [
@ -271,6 +272,11 @@ class Model {
] ]
]; ];
if ( ! empty($status))
{
$options['query']['filter']['status'] = $status;
}
$response = $this->getRequest('library-entries', $options); $response = $this->getRequest('library-entries', $options);
return $response['meta']['count']; return $response['meta']['count'];
@ -282,36 +288,38 @@ class Model {
* *
* @param int $limit * @param int $limit
* @param int $offset * @param int $offset
* @param string $include * @param array $options
* @return Request * @return Request
*/ */
public function getPagedAnimeList(int $limit = 100, int $offset = 0, $include='anime.mappings'): Request public function getPagedAnimeList(int $limit = 100, int $offset = 0, array $options = [
'include' => 'anime.mappings'
]): Request
{ {
$options = [ $defaultOptions = [
'query' => [ 'filter' => [
'filter' => [ 'user_id' => $this->getUserIdByUsername($this->getUsername()),
'user_id' => $this->getUserIdByUsername($this->getUsername()), 'media_type' => 'Anime'
'media_type' => 'Anime' ],
], 'page' => [
'include' => $include, 'offset' => $offset,
'page' => [ 'limit' => $limit
'offset' => $offset, ],
'limit' => $limit 'sort' => '-updated_at'
],
'sort' => '-updated_at'
]
]; ];
$options = array_merge($defaultOptions, $options);
return $this->setUpRequest('GET', 'library-entries', $options); return $this->setUpRequest('GET', 'library-entries', ['query' => $options]);
} }
/** /**
* Get the full anime list * Get the full anime list
* *
* @param string $include * @param array $options
* @return Request * @return array
*/ */
public function getFullAnimeList($include = 'anime.mappings') public function getFullAnimeList(array $options = [
'include' => 'anime.mappings'
]): array
{ {
$count = $this->getAnimeListCount(); $count = $this->getAnimeListCount();
$size = 75; $size = 75;
@ -323,7 +331,7 @@ class Model {
for ($i = 0; $i < $pages; $i++) for ($i = 0; $i < $pages; $i++)
{ {
$offset = $i * $size; $offset = $i * $size;
$requests[] = $this->getPagedAnimeList($size, $offset, $include); $requests[] = $this->getPagedAnimeList($size, $offset, $options);
} }
$promiseArray = (new Client())->requestMulti($requests); $promiseArray = (new Client())->requestMulti($requests);
@ -389,7 +397,9 @@ class Model {
]; ];
$statusMap = AnimeWatchingStatus::KITSU_TO_TITLE; $statusMap = AnimeWatchingStatus::KITSU_TO_TITLE;
$data = $this->getFullAnimeList('media,media.genres,media.mappings,anime.streamingLinks'); $data = $this->getFullAnimeList([
'include' => 'media,media.genres,media.mappings,anime.streamingLinks'
]);
$included = JsonAPI::organizeIncludes($data['included']); $included = JsonAPI::organizeIncludes($data['included']);
$included = JsonAPI::inlineIncludedRelationships($included, 'anime'); $included = JsonAPI::inlineIncludedRelationships($included, 'anime');