From 5db1d8b49420777972f0604e0b987ec9a464fa51 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Thu, 7 Apr 2016 12:32:32 -0400 Subject: [PATCH] Remove json 'cache' files from anime model --- src/Aviat/AnimeClient/Model.php | 1 - src/Aviat/AnimeClient/Model/Anime.php | 29 ++++++--------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/Aviat/AnimeClient/Model.php b/src/Aviat/AnimeClient/Model.php index 608f314f..6d7150a1 100644 --- a/src/Aviat/AnimeClient/Model.php +++ b/src/Aviat/AnimeClient/Model.php @@ -57,7 +57,6 @@ class Model { */ public function get_cached_image($api_path, $series_slug, $type = "anime") { - $api_path = str_replace("jjpg", "jpg", $api_path); $path_parts = explode('?', basename($api_path)); $path = current($path_parts); $ext_parts = explode('.', $path); diff --git a/src/Aviat/AnimeClient/Model/Anime.php b/src/Aviat/AnimeClient/Model/Anime.php index 3784cb34..b2a3f9a7 100644 --- a/src/Aviat/AnimeClient/Model/Anime.php +++ b/src/Aviat/AnimeClient/Model/Anime.php @@ -223,7 +223,7 @@ class Anime extends API { } $response = $this->get("users/{$username}/library", $config); - $output = $this->_check_cache($status, $response); + $output = $this->transform($status, $response); foreach ($output as &$row) { @@ -234,35 +234,18 @@ class Anime extends API { } /** - * Handle caching of transformed api data + * Handle transforming of api data * - * @codeCoverageIgnore * @param string $status * @param \GuzzleHttp\Message\Response * @return array */ - protected function _check_cache($status, $response) + protected function transform($status, $response) { - $cache_file = _dir($this->config->get('data_cache_path'), "anime-{$status}.json"); - $transformed_cache_file = _dir($this->config->get('data_cache_path'), "anime-{$status}-transformed.json"); - - $cached = (file_exists($cache_file)) - ? Json::decodeFile($cache_file) - : []; $api_data = Json::decode($response->getBody(), TRUE); - - if ($api_data === $cached && file_exists($transformed_cache_file)) - { - return Json::decodeFile($transformed_cache_file); - } - else - { - Json::encodeFile($cache_file, $api_data); - $transformer = new AnimeListTransformer(); - $transformed = $transformer->transform_collection($api_data); - Json::encodeFile($transformed_cache_file, $transformed); - return $transformed; - } + $transformer = new AnimeListTransformer(); + $transformed = $transformer->transform_collection($api_data); + return $transformed; } } // End of AnimeModel.php \ No newline at end of file