diff --git a/src/Model/API.php b/src/Model/API.php index a7508255..e13e0ee4 100644 --- a/src/Model/API.php +++ b/src/Model/API.php @@ -21,6 +21,13 @@ namespace Aviat\AnimeClient\Model; */ class API extends AbstractModel { + /** + * Whether to use the MAL api + * + * @var boolean + */ + protected $useMALAPI; + /** * Sort the list entries by their title * diff --git a/src/Model/Anime.php b/src/Model/Anime.php index 060f92c7..5fc2935c 100644 --- a/src/Model/Anime.php +++ b/src/Model/Anime.php @@ -39,13 +39,6 @@ class Anime extends API { */ protected $malModel; - /** - * Whether to use the MAL api - * - * @var boolean - */ - protected $useMALAPI; - /** * Anime constructor. * @@ -53,10 +46,10 @@ class Anime extends API { */ public function __construct(ContainerInterface $container) { - $config = $container->get('config'); $this->kitsuModel = $container->get('kitsu-model'); $this->malModel = $container->get('mal-model'); + $config = $container->get('config'); $this->useMALAPI = $config->get(['use_mal_api']) === TRUE; } diff --git a/src/Model/Manga.php b/src/Model/Manga.php index 627e6542..a772faca 100644 --- a/src/Model/Manga.php +++ b/src/Model/Manga.php @@ -16,8 +16,11 @@ namespace Aviat\AnimeClient\Model; -use Aviat\AnimeClient\API\Enum\MangaReadingStatus\Title; -use Aviat\AnimeClient\API\Mapping\MangaReadingStatus; +use Aviat\AnimeClient\API\{ + Enum\MangaReadingStatus\Title, + Mapping\MangaReadingStatus, + ParallelAPIRequest +}; use Aviat\Ion\Di\ContainerInterface; /** @@ -46,6 +49,9 @@ class Manga extends API { $this->kitsuModel = $container->get('kitsu-model'); $this->malModel = $container->get('mal-model'); + + $config = $container->get('config'); + $this->useMALAPI = $config->get(['use_mal_api']) === TRUE; } /** @@ -60,7 +66,7 @@ class Manga extends API { return $this->kitsuModel->getFullOrganizedMangaList(); } - + $APIstatus = MangaReadingStatus::TITLE_TO_KITSU[$status]; $data = $this->kitsuModel->getMangaList($APIstatus); return $this->mapByStatus($data)[$status];