timw4mail/HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

Use constants for the API names instead of literals

Browse Source
This commit is contained in:
Timothy Warren 2020-08-17 21:08:53 -04:00
parent c749c7c923
commit 5da0ba87a7
2 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/AnimeClient/API.php Normal file
View File

@ -0,0 +1,22 @@
<?php declare(strict_types=1);
/**
* Hummingbird Anime List Client
*
* An API client for Kitsu to manage anime and manga watch lists
*
* PHP version 7.4
*
* @package HummingbirdAnimeClient
* @author Timothy J. Warren <tim@timshomepage.net>
* @copyright 2015 - 2020 Timothy J. Warren
* @license http://www.opensource.org/licenses/mit-license.html MIT License
* @version 5.1
* @link https://git.timshomepage.net/timw4mail/HummingBirdAnimeClient
*/
namespace Aviat\AnimeClient;
class API {
public const ANILIST = 'anilist';
public const KITSU = 'kitsu';
}

56
src/AnimeClient/Command/SyncLists.php
View File

@ -24,6 +24,7 @@ use Aviat\AnimeClient\API\{
JsonAPI, JsonAPI,
ParallelAPIRequest ParallelAPIRequest
}; };
use Aviat\AnimeClient\API;
use Aviat\AnimeClient\API\Anilist; use Aviat\AnimeClient\API\Anilist;
use Aviat\AnimeClient\API\Kitsu; use Aviat\AnimeClient\API\Kitsu;
use Aviat\AnimeClient\API\Mapping\{AnimeWatchingStatus, MangaReadingStatus}; use Aviat\AnimeClient\API\Mapping\{AnimeWatchingStatus, MangaReadingStatus};
@ -99,7 +100,7 @@ final class SyncLists extends BaseCommand {
$this->setCache($this->container->get('cache')); $this->setCache($this->container->get('cache'));
$config = $this->container->get('config'); $config = $this->container->get('config');
$anilistEnabled = $config->get(['anilist', 'enabled']); $anilistEnabled = $config->get([API::ANILIST, 'enabled']);
// We can't sync kitsu against itself! // We can't sync kitsu against itself!
if ( ! $anilistEnabled) if ( ! $anilistEnabled)
@ -164,8 +165,8 @@ final class SyncLists extends BaseCommand {
$this->clearLine(); $this->clearLine();
return [ return [
'anilist' => $anilist, API::ANILIST => $anilist,
'kitsu' => $kitsu, API::KITSU => $kitsu,
]; ];
} }
@ -181,17 +182,17 @@ final class SyncLists extends BaseCommand {
$this->echo('Normalizing List Data'); $this->echo('Normalizing List Data');
$progress = new Widgets\ProgressBar($this->getConsole(), 2, 50, FALSE); $progress = new Widgets\ProgressBar($this->getConsole(), 2, 50, FALSE);
$kitsu = $this->transformKitsu($type, $data['kitsu']); $kitsu = $this->transformKitsu($type, $data[API::KITSU]);
$progress->incr(); $progress->incr();
$anilist = $this->transformAnilist($type, $data['anilist']); $anilist = $this->transformAnilist($type, $data[API::ANILIST]);
$progress->incr(); $progress->incr();
$this->clearLine(); $this->clearLine();
return [ return [
'anilist' => $anilist, API::ANILIST => $anilist,
'kitsu' => $kitsu, API::KITSU => $kitsu,
]; ];
} }
@ -206,7 +207,7 @@ final class SyncLists extends BaseCommand {
{ {
$this->echo('Comparing List Items'); $this->echo('Comparing List Items');
return $this->compareLists($type, $data['anilist'], $data['kitsu']); return $this->compareLists($type, $data[API::ANILIST], $data[API::KITSU]);
} }
/** /**
@ -435,12 +436,12 @@ final class SyncLists extends BaseCommand {
continue; continue;
} }
if (in_array('kitsu', $item['updateType'], TRUE)) if (in_array(API::KITSU, $item['updateType'], TRUE))
{ {
$kitsuUpdateItems[] = $item['data']; $kitsuUpdateItems[] = $item['data'];
} }
if (in_array('anilist', $item['updateType'], TRUE)) if (in_array(API::ANILIST, $item['updateType'], TRUE))
{ {
$anilistUpdateItems[] = $item['data']; $anilistUpdateItems[] = $item['data'];
} }
@ -529,7 +530,7 @@ final class SyncLists extends BaseCommand {
if ($kitsuItem['data']['status'] === 'completed' && $kitsuItem['data']['reconsuming'] === TRUE) if ($kitsuItem['data']['status'] === 'completed' && $kitsuItem['data']['reconsuming'] === TRUE)
{ {
$update['data']['reconsuming'] = FALSE; $update['data']['reconsuming'] = FALSE;
$return['updateType'][] = 'kitsu'; $return['updateType'][] = API::KITSU;
} }
// If status is the same, and progress count is different, use greater progress // If status is the same, and progress count is different, use greater progress
@ -538,12 +539,12 @@ final class SyncLists extends BaseCommand {
if ($diff['progress'] === 1) if ($diff['progress'] === 1)
{ {
$update['data']['progress'] = $kitsuItem['data']['progress']; $update['data']['progress'] = $kitsuItem['data']['progress'];
$return['updateType'][] = 'anilist'; $return['updateType'][] = API::ANILIST;
} }
else if($diff['progress'] === -1) else if($diff['progress'] === -1)
{ {
$update['data']['progress'] = $anilistItem['data']['progress']; $update['data']['progress'] = $anilistItem['data']['progress'];
$return['updateType'][] = 'kitsu'; $return['updateType'][] = API::KITSU;
} }
} }
@ -553,11 +554,12 @@ final class SyncLists extends BaseCommand {
if ($dateDiff === 1) if ($dateDiff === 1)
{ {
$update['data']['status'] = $kitsuItem['data']['status']; $update['data']['status'] = $kitsuItem['data']['status'];
$return['updateType'][] = 'anilist'; $return['updateType'][] = API::ANILIST;
} else if ($dateDiff === -1) }
else if ($dateDiff === -1)
{ {
$update['data']['status'] = $anilistItem['data']['status']; $update['data']['status'] = $anilistItem['data']['status'];
$return['updateType'][] = 'kitsu'; $return['updateType'][] = API::KITSU;
} }
} }
@ -574,7 +576,7 @@ final class SyncLists extends BaseCommand {
$update['data']['progress'] = $kitsuItem['data']['progress']; $update['data']['progress'] = $kitsuItem['data']['progress'];
} }
$return['updateType'][] = 'anilist'; $return['updateType'][] = API::ANILIST;
} }
else if($dateDiff === -1) else if($dateDiff === -1)
{ {
@ -585,7 +587,7 @@ final class SyncLists extends BaseCommand {
$update['data']['progress'] = $kitsuItem['data']['progress']; $update['data']['progress'] = $kitsuItem['data']['progress'];
} }
$return['updateType'][] = 'kitsu'; $return['updateType'][] = API::KITSU;
} }
} }
@ -599,12 +601,12 @@ final class SyncLists extends BaseCommand {
) )
{ {
$update['data']['ratingTwenty'] = $kitsuItem['data']['ratingTwenty']; $update['data']['ratingTwenty'] = $kitsuItem['data']['ratingTwenty'];
$return['updateType'][] = 'anilist'; $return['updateType'][] = API::ANILIST;
} }
else if($dateDiff === -1 && $anilistItem['data']['rating'] !== 0) else if($dateDiff === -1 && $anilistItem['data']['rating'] !== 0)
{ {
$update['data']['ratingTwenty'] = $anilistItem['data']['rating'] * 2; $update['data']['ratingTwenty'] = $anilistItem['data']['rating'] * 2;
$return['updateType'][] = 'kitsu'; $return['updateType'][] = API::KITSU;
} }
} }
@ -614,12 +616,12 @@ final class SyncLists extends BaseCommand {
if ($kitsuItem['data']['notes'] !== '') if ($kitsuItem['data']['notes'] !== '')
{ {
$update['data']['notes'] = $kitsuItem['data']['notes']; $update['data']['notes'] = $kitsuItem['data']['notes'];
$return['updateType'][] = 'anilist'; $return['updateType'][] = API::ANILIST;
} }
else else
{ {
$update['data']['notes'] = $anilistItem['data']['notes']; $update['data']['notes'] = $anilistItem['data']['notes'];
$return['updateType'][] = 'kitsu'; $return['updateType'][] = API::KITSU;
} }
} }
@ -629,12 +631,12 @@ final class SyncLists extends BaseCommand {
if ($diff['reconsumeCount'] === 1) if ($diff['reconsumeCount'] === 1)
{ {
$update['data']['reconsumeCount'] = $kitsuItem['data']['reconsumeCount']; $update['data']['reconsumeCount'] = $kitsuItem['data']['reconsumeCount'];
$return['updateType'][] = 'anilist'; $return['updateType'][] = API::ANILIST;
} }
else if ($diff['reconsumeCount'] === -1) else if ($diff['reconsumeCount'] === -1)
{ {
$update['data']['reconsumeCount'] = $anilistItem['data']['reconsumeCount']; $update['data']['reconsumeCount'] = $anilistItem['data']['reconsumeCount'];
$return['updateType'][] = 'kitsu'; $return['updateType'][] = API::KITSU;
} }
} }
@ -645,8 +647,8 @@ final class SyncLists extends BaseCommand {
} }
$return['meta'] = [ $return['meta'] = [
'kitsu' => $kitsuItem['data'], API::KITSU => $kitsuItem['data'],
'anilist' => $anilistItem['data'], API::ANILIST => $anilistItem['data'],
'dateDiff' => $dateDiff, 'dateDiff' => $dateDiff,
'diff' => $diff, 'diff' => $diff,
]; ];
@ -656,7 +658,7 @@ final class SyncLists extends BaseCommand {
// Fill in missing data values for update on Anlist // Fill in missing data values for update on Anlist
// so I don't have to create a really complex graphql query // so I don't have to create a really complex graphql query
// to handle each combination of fields // to handle each combination of fields
if ($return['updateType'][0] === 'anilist') if ($return['updateType'][0] === API::ANILIST)
{ {
$prevData = [ $prevData = [
'notes' => $kitsuItem['data']['notes'], 'notes' => $kitsuItem['data']['notes'],