From 39e083d17c0017bc89ad00d14b4331d1691aedd6 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Tue, 14 Mar 2017 14:28:08 -0400
Subject: [PATCH] Minor model refactoring

---
 src/API/Kitsu/Model.php | 54 ++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/API/Kitsu/Model.php b/src/API/Kitsu/Model.php
index ef17ee91..24de9b0c 100644
--- a/src/API/Kitsu/Model.php
+++ b/src/API/Kitsu/Model.php
@@ -254,9 +254,10 @@ class Model {
 	/**
 	 * Get the number of anime list items
 	 *
+	 * @param string $status - Optional status to filter by
 	 * @return int
 	 */
-	public function getAnimeListCount() : int
+	public function getAnimeListCount(string $status = '') : int
 	{
 		$options = [
 			'query' => [
@@ -271,6 +272,11 @@ class Model {
 			]
 		];
 		
+		if ( ! empty($status))
+		{
+			$options['query']['filter']['status'] = $status;
+		}
+		
 		$response = $this->getRequest('library-entries', $options);
 		
 		return $response['meta']['count'];
@@ -282,36 +288,38 @@ class Model {
 	 *
 	 * @param int $limit
 	 * @param int $offset
-	 * @param string $include
+	 * @param array $options
 	 * @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 = [
-			'query' => [
-				'filter' => [
-					'user_id' => $this->getUserIdByUsername($this->getUsername()),
-					'media_type' => 'Anime'
-				],
-				'include' => $include,
-				'page' => [
-					'offset' => $offset,
-					'limit' => $limit
-				],
-				'sort' => '-updated_at'
-			]
+		$defaultOptions = [
+			'filter' => [
+				'user_id' => $this->getUserIdByUsername($this->getUsername()),
+				'media_type' => 'Anime'
+			],
+			'page' => [
+				'offset' => $offset,
+				'limit' => $limit
+			],
+			'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
 	 *
-	 * @param string $include
-	 * @return Request
+	 * @param array $options
+	 * @return array
 	 */
-	public function getFullAnimeList($include = 'anime.mappings')
+	public function getFullAnimeList(array $options = [
+		'include' => 'anime.mappings'
+	]): array
 	{
 		$count = $this->getAnimeListCount();
 		$size = 75;
@@ -323,7 +331,7 @@ class Model {
 		for ($i = 0; $i < $pages; $i++)
 		{
 			$offset = $i * $size;
-			$requests[] = $this->getPagedAnimeList($size, $offset, $include);
+			$requests[] = $this->getPagedAnimeList($size, $offset, $options);
 		}
 		
 		$promiseArray = (new Client())->requestMulti($requests);
@@ -389,7 +397,9 @@ class Model {
 			];
 			$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::inlineIncludedRelationships($included, 'anime');