From ed4f9152d4e042cc837635b9e716a0e9bb7d86fb Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Fri, 7 Apr 2017 13:57:14 -0400 Subject: [PATCH] Replace 0 with - --- src/API/Kitsu/Transformer/AnimeListTransformer.php | 8 +++++--- src/API/Kitsu/Transformer/MangaListTransformer.php | 14 +++++++++----- .../AnimeListTransformerTest__testTransform__1.php | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/API/Kitsu/Transformer/AnimeListTransformer.php b/src/API/Kitsu/Transformer/AnimeListTransformer.php index c6fee55d..45af8f55 100644 --- a/src/API/Kitsu/Transformer/AnimeListTransformer.php +++ b/src/API/Kitsu/Transformer/AnimeListTransformer.php @@ -40,7 +40,9 @@ class AnimeListTransformer extends AbstractTransformer { $genres = array_column($anime['relationships']['genres'], 'name') ?? []; sort($genres); - $rating = (int) 2 * $item['attributes']['rating']; + $rating = (int) $item['attributes']['rating'] !== 0 + ? (int) 2 * $item['attributes']['rating'] + : '-'; $total_episodes = array_key_exists('episodeCount', $anime) && (int) $anime['episodeCount'] !== 0 ? (int) $anime['episodeCount'] @@ -68,7 +70,7 @@ class AnimeListTransformer extends AbstractTransformer { 'id' => $item['id'], 'mal_id' => $MALid, 'episodes' => [ - 'watched' => (int) $item['attributes']['progress'] !== '0' + 'watched' => (int) $item['attributes']['progress'] !== 0 ? (int) $item['attributes']['progress'] : '-', 'total' => $total_episodes, @@ -93,7 +95,7 @@ class AnimeListTransformer extends AbstractTransformer { 'notes' => $item['attributes']['notes'], 'rewatching' => (bool) $item['attributes']['reconsuming'], 'rewatched' => (int) $item['attributes']['reconsumeCount'], - 'user_rating' => ($rating === 0) ? '-' : (int) $rating, + 'user_rating' => $rating, 'private' => (bool) $item['attributes']['private'] ?? FALSE, ]; } diff --git a/src/API/Kitsu/Transformer/MangaListTransformer.php b/src/API/Kitsu/Transformer/MangaListTransformer.php index 209bb1c6..7d2152ce 100644 --- a/src/API/Kitsu/Transformer/MangaListTransformer.php +++ b/src/API/Kitsu/Transformer/MangaListTransformer.php @@ -42,18 +42,22 @@ class MangaListTransformer extends AbstractTransformer { $genres = array_column($manga['relationships']['genres'], 'name') ?? []; sort($genres); - $rating = (is_numeric($item['attributes']['rating'])) - ? intval(2 * $item['attributes']['rating']) + $rating = (int) $item['attributes']['rating'] !== 0 + ? (int) 2 * $item['attributes']['rating'] : '-'; - $totalChapters = ($manga['chapterCount'] > 0) + $totalChapters = ((int) $manga['chapterCount'] !== 0) ? $manga['chapterCount'] : '-'; - $totalVolumes = ($manga['volumeCount'] > 0) + $totalVolumes = ((int) $manga['volumeCount'] !== 0) ? $manga['volumeCount'] : '-'; + $readChapters = ((int) $item['attributes']['progress'] !== 0) + ? $item['attributes']['progress'] + : '-'; + $MALid = NULL; if (array_key_exists('mappings', $manga['relationships'])) @@ -72,7 +76,7 @@ class MangaListTransformer extends AbstractTransformer { 'id' => $item['id'], 'mal_id' => $MALid, 'chapters' => [ - 'read' => $item['attributes']['progress'], + 'read' => $readChapters, 'total' => $totalChapters ], 'volumes' => [ diff --git a/tests/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testTransform__1.php b/tests/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testTransform__1.php index 6796b0a5..e1add9b6 100644 --- a/tests/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testTransform__1.php +++ b/tests/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testTransform__1.php @@ -3,7 +3,7 @@ 'mal_id' => '33206', 'episodes' => array ( - 'watched' => 0, + 'watched' => '-', 'total' => '-', 'length' => NULL, ),