From fa7651faf95ffeb7642b94a25382c7271336eac5 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Tue, 7 Mar 2017 20:49:31 -0500
Subject: [PATCH] Fix issues with sync-lists command, add more docblocks

---
 src/API/Kitsu/Model.php          | 41 +++++++++++++++++++++++++-------
 src/Command/SyncKitsuWithMal.php |  7 +++---
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/API/Kitsu/Model.php b/src/API/Kitsu/Model.php
index 3d06bd04..97cb5ba8 100644
--- a/src/API/Kitsu/Model.php
+++ b/src/API/Kitsu/Model.php
@@ -19,25 +19,19 @@ namespace Aviat\AnimeClient\API\Kitsu;
 use function Amp\{all, wait};
 
 use Amp\Artax\{Client, Request};
-use Aviat\AnimeClient\API\{
-	CacheTrait,
-	JsonAPI,
-	Kitsu as K,
-	Mapping\AnimeWatchingStatus,
-	Mapping\MangaReadingStatus
-};
+use Aviat\AnimeClient\API\{CacheTrait, JsonAPI, Kitsu as K};
 use Aviat\AnimeClient\API\Enum\{
 	AnimeWatchingStatus\Title,
 	MangaReadingStatus\Kitsu as KitsuReadingStatus
 };
+use Aviat\AnimeClient\API\Mapping\{AnimeWatchingStatus, MangaReadingStatus};
 use Aviat\AnimeClient\API\Kitsu\Transformer\{
 	AnimeTransformer,
 	AnimeListTransformer,
 	MangaTransformer,
 	MangaListTransformer
 };
-use Aviat\Ion\Di\ContainerAware;
-use Aviat\Ion\Json;
+use Aviat\Ion\{Di\ContainerAware, Json};
 
 /**
  * Kitsu API Model
@@ -336,6 +330,11 @@ class Model {
 		return $this->getRequest('library-entries', $options);
 	}
 
+	/**
+	 * Get all the anine entries, that are organized for output to html
+	 *
+	 * @return array
+	 */
 	public function getFullOrganizedAnimeList(): array
 	{
 		$cacheItem = $this->cache->getItem(self::FULL_TRANSFORMED_LIST_CACHE_KEY);
@@ -405,6 +404,11 @@ class Model {
 		return $cacheItem->get();
 	}
 
+	/**
+	 * Get all Manga lists
+	 *
+	 * @return array
+	 */
 	public function getFullOrganizedMangaList(): array
 	{
 		$statuses = KitsuReadingStatus::getConstList();
@@ -556,6 +560,11 @@ class Model {
 		return $this->listItem->delete($id);
 	}
 
+	/**
+	 * Get the kitsu username from config
+	 *
+	 * @return string
+	 */
 	private function getUsername(): string
 	{
 		return $this->getContainer()
@@ -563,6 +572,13 @@ class Model {
 			->get(['kitsu_username']);
 	}
 
+	/**
+	 * Get the raw data for the anime id
+	 *
+	 * @param string $type
+	 * @param string $id
+	 * @return array
+	 */
 	private function getRawMediaDataById(string $type, string $id): array
 	{
 		$options = [
@@ -579,6 +595,13 @@ class Model {
 		return $baseData;
 	}
 
+	/**
+	 * Get media item by slug
+	 *
+	 * @param string $type
+	 * @param string $slug
+	 * @return array
+	 */
 	private function getRawMediaData(string $type, string $slug): array
 	{
 		$options = [
diff --git a/src/Command/SyncKitsuWithMal.php b/src/Command/SyncKitsuWithMal.php
index 1ee485f0..0d2253df 100644
--- a/src/Command/SyncKitsuWithMal.php
+++ b/src/Command/SyncKitsuWithMal.php
@@ -18,9 +18,8 @@ namespace Aviat\AnimeClient\Command;
 
 use function Amp\{all, wait};
 
-use Amp\Artax;
 use Amp\Artax\Client;
-use Aviat\AnimeClient\API\{JsonAPI, Kitsu, MAL};
+use Aviat\AnimeClient\API\{JsonAPI, Mapping\AnimeWatchingStatus};
 use Aviat\AnimeClient\API\MAL\Transformer\AnimeListTransformer as ALT;
 use Aviat\Ion\Json;
 
@@ -81,7 +80,7 @@ class SyncKitsuWithMal extends BaseCommand {
 		$requests = [];
 		
 		// Set up requests
-		for ($i = 0; $i < $count; $i++)
+		for ($i = 0; $i < $pages; $i++)
 		{
 			$offset = $i * $size;
 			$requests[] = $this->kitsuModel->getPagedAnimeList($size, $offset);
@@ -131,7 +130,7 @@ class SyncKitsuWithMal extends BaseCommand {
 			$output[$item['series_animedb_id']] = [
 				'id' => $item['series_animedb_id'],
 				'data' => [
-					'status' => MAL::MAL_KITSU_WATCHING_STATUS_MAP[$item['my_status']],
+					'status' => AnimeWatchingStatus::MAL_TO_KITSU[$item['my_status']],
 					'progress' => $item['my_watched_episodes'],
 					'reconsuming' => (bool) $item['my_rewatching'],
 					'reconsumeCount' => array_key_exists('times_rewatched', $item)