Rereading?
diff --git a/app/views/manga/list.php b/app/views/manga/list.php
index dbf00076..7a44d851 100644
--- a/app/views/manga/list.php
+++ b/app/views/manga/list.php
@@ -10,9 +10,9 @@
- is_authenticated()): ?>
+ is_authenticated()): ?>
-
+
Title
Rating
Completed Chapters
@@ -23,16 +23,18 @@
- is_authenticated()): ?>
+ is_authenticated()): ?>
">Edit
-
+
-
+
-
+
+
/ 10
/
diff --git a/index.php b/index.php
index ca589e6f..fff3616a 100644
--- a/index.php
+++ b/index.php
@@ -53,12 +53,11 @@ $whoops = new Run();
$defaultHandler = new PrettyPageHandler();
$whoops->pushHandler($defaultHandler);
-// Set up json handler for ajax errors
-//$jsonHandler = new JsonResponseHandler();
-//$whoops->pushHandler($jsonHandler);
-
// Register as the error handler
-$whoops->register();
+if (array_key_exists('whoops', $_GET))
+{
+ $whoops->register();
+}
// -----------------------------------------------------------------------------
// Dependency Injection setup
diff --git a/public/css/base.css b/public/css/base.css
index cd393a9b..b80a42b1 100644
--- a/public/css/base.css
+++ b/public/css/base.css
@@ -1085,7 +1085,9 @@ a:hover, a:active {
display:block;
}
-.media > .name > a {
+.media > .name a,
+ .media > .name a small
+ {
background:none;
color:#fff;
text-shadow:1px 2px 1px rgba(0, 0, 0, .85);
diff --git a/public/css/base.myth.css b/public/css/base.myth.css
index 5c89e603..b91f8be5 100644
--- a/public/css/base.myth.css
+++ b/public/css/base.myth.css
@@ -354,7 +354,9 @@ a:hover, a:active {
display:block;
}
- .media > .name > a {
+ .media > .name a,
+ .media > .name a small
+ {
background:none;
color:#fff;
text-shadow: var(--shadow);
diff --git a/src/API/Kitsu.php b/src/API/Kitsu.php
index 9753e993..e89357c6 100644
--- a/src/API/Kitsu.php
+++ b/src/API/Kitsu.php
@@ -16,13 +16,20 @@
namespace Aviat\AnimeClient\API;
-use Aviat\AnimeClient\API\Kitsu\Enum\AnimeWatchingStatus;
+use Aviat\AnimeClient\API\Kitsu\Enum\{AnimeAiringStatus, AnimeWatchingStatus};
+use DateTimeImmutable;
/**
* Constants and mappings for the Kitsu API
*/
class Kitsu {
+ const AUTH_URL = 'https://kitsu.io/api/oauth/token';
+ /**
+ * Map of Kitsu status to label for select menus
+ *
+ * @return array
+ */
public static function getStatusToSelectMap()
{
return [
@@ -33,4 +40,147 @@ class Kitsu {
AnimeWatchingStatus::DROPPED => 'Dropped'
];
}
+
+ /**
+ * Determine whether an anime is airing, finished airing, or has not yet aired
+ *
+ * @param string $startDate
+ * @param string $endDate
+ * @return string
+ */
+ public static function getAiringStatus(string $startDate = null, string $endDate = null): string
+ {
+ $startAirDate = new DateTimeImmutable($startDate ?? 'tomorrow');
+ $endAirDate = new DateTimeImmutable($endDate ?? 'tomorrow');
+ $now = new DateTimeImmutable();
+
+ $isDoneAiring = $now > $endAirDate;
+ $isCurrentlyAiring = ($now > $startAirDate) && ! $isDoneAiring;
+
+ switch (true)
+ {
+ case $isCurrentlyAiring:
+ return AnimeAiringStatus::AIRING;
+
+ case $isDoneAiring:
+ return AnimeAiringStatus::FINISHED_AIRING;
+
+ default:
+ return AnimeAiringStatus::NOT_YET_AIRED;
+ }
+ }
+
+ /**
+ * Filter out duplicate and very similar names from
+ *
+ * @param array $data The 'attributes' section of the api data response
+ * @return array List of alternate titles
+ */
+ public static function filterTitles(array $data): array
+ {
+ // The 'canonical' title is always returned
+ $valid = [$data['canonicalTitle']];
+
+ if (array_key_exists('titles', $data))
+ {
+ foreach($data['titles'] as $alternateTitle)
+ {
+ if (self::titleIsUnique($alternateTitle, $valid))
+ {
+ $valid[] = $alternateTitle;
+ }
+ }
+ }
+
+ return $valid;
+ }
+
+ /**
+ * Reorganizes 'included' data to be keyed by
+ * type => [
+ * id => data/attributes,
+ * ]
+ *
+ * @param array $includes
+ * @return array
+ */
+ public static function organizeIncludes(array $includes): array
+ {
+ $organized = [];
+
+ foreach ($includes as $item)
+ {
+ $type = $item['type'];
+ $id = $item['id'];
+ $organized[$type] = $organized[$type] ?? [];
+ $organized[$type][$id] = $item['attributes'];
+
+ if (array_key_exists('relationships', $item))
+ {
+ $organized[$type][$id]['relationships'] = self::organizeRelationships($item['relationships']);
+ }
+ }
+
+ return $organized;
+ }
+
+ /**
+ * Reorganize relationship mappings to make them simpler to use
+ *
+ * Remove verbose structure, and just map:
+ * type => [ idArray ]
+ *
+ * @param array $relationships
+ * @return array
+ */
+ public static function organizeRelationships(array $relationships): array
+ {
+ $organized = [];
+
+ foreach($relationships as $key => $data)
+ {
+ if ( ! array_key_exists('data', $data))
+ {
+ continue;
+ }
+
+ $organized[$key] = $organized[$key] ?? [];
+
+ foreach ($data['data'] as $item)
+ {
+ $organized[$key][] = $item['id'];
+ }
+ }
+
+ return $organized;
+ }
+
+ /**
+ * Determine if an alternate title is unique enough to list
+ *
+ * @param string $title
+ * @param array $existingTitles
+ * @return bool
+ */
+ private static function titleIsUnique(string $title = null, array $existingTitles): bool
+ {
+ if (empty($title))
+ {
+ return false;
+ }
+
+ foreach($existingTitles as $existing)
+ {
+ $isSubset = stripos($existing, $title) !== FALSE;
+ $diff = levenshtein($existing, $title);
+ $onlydifferentCase = (mb_strtolower($existing) === mb_strtolower($title));
+
+ if ($diff < 3 || $isSubset || $onlydifferentCase)
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
}
\ No newline at end of file
diff --git a/src/API/Kitsu/Auth.php b/src/API/Kitsu/Auth.php
index e940d878..113d5fd8 100644
--- a/src/API/Kitsu/Auth.php
+++ b/src/API/Kitsu/Auth.php
@@ -1,108 +1,108 @@
-
- * @copyright 2015 - 2016 Timothy J. Warren
- * @license http://www.opensource.org/licenses/mit-license.html MIT License
- * @version 4.0
- * @link https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\API\Kitsu;
-
-use Aviat\AnimeClient\AnimeClient;
-use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
-
-/**
- * Kitsu API Authentication
- */
-class Auth {
-
- use ContainerAware;
-
- /**
- * Anime API Model
- *
- * @var \Aviat\AnimeClient\API\Kitsu\Model
- */
- protected $model;
-
- /**
- * Session object
- *
- * @var Aura\Session\Segment
- */
- protected $segment;
-
- /**
- * Constructor
- *
- * @param ContainerInterface $container
- */
- public function __construct(ContainerInterface $container)
- {
- $this->setContainer($container);
- $this->segment = $container->get('session')
- ->getSegment(AnimeClient::SESSION_SEGMENT);
- $this->model = $container->get('kitsu-model');
- }
-
- /**
- * Make the appropriate authentication call,
- * and save the resulting auth token if successful
- *
- * @param string $password
- * @return boolean
- */
- public function authenticate($password)
- {
- $config = $this->container->get('config');
- $username = $config->get(['kitsu_username']);
- $auth_token = $this->model->authenticate($username, $password);
-
- if (FALSE !== $auth_token)
- {
- $this->segment->set('auth_token', $auth_token);
- return TRUE;
- }
-
- return FALSE;
- }
-
- /**
- * Check whether the current user is authenticated
- *
- * @return boolean
- */
- public function is_authenticated()
- {
- return ($this->get_auth_token() !== FALSE);
- }
-
- /**
- * Clear authentication values
- *
- * @return void
- */
- public function logout()
- {
- $this->segment->clear();
- }
-
- /**
- * Retrieve the authentication token from the session
- *
- * @return string|false
- */
- public function get_auth_token()
- {
- return $this->segment->get('auth_token', FALSE);
- }
-}
+
+ * @copyright 2015 - 2016 Timothy J. Warren
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @version 4.0
+ * @link https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu;
+
+use Aviat\AnimeClient\AnimeClient;
+use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
+
+/**
+ * Kitsu API Authentication
+ */
+class Auth {
+
+ use ContainerAware;
+
+ /**
+ * Anime API Model
+ *
+ * @var \Aviat\AnimeClient\API\Kitsu\Model
+ */
+ protected $model;
+
+ /**
+ * Session object
+ *
+ * @var Aura\Session\Segment
+ */
+ protected $segment;
+
+ /**
+ * Constructor
+ *
+ * @param ContainerInterface $container
+ */
+ public function __construct(ContainerInterface $container)
+ {
+ $this->setContainer($container);
+ $this->segment = $container->get('session')
+ ->getSegment(AnimeClient::SESSION_SEGMENT);
+ $this->model = $container->get('kitsu-model');
+ }
+
+ /**
+ * Make the appropriate authentication call,
+ * and save the resulting auth token if successful
+ *
+ * @param string $password
+ * @return boolean
+ */
+ public function authenticate($password)
+ {
+ $config = $this->container->get('config');
+ $username = $config->get(['kitsu_username']);
+ $auth_token = $this->model->authenticate($username, $password);
+
+ if (FALSE !== $auth_token)
+ {
+ $this->segment->set('auth_token', $auth_token);
+ return TRUE;
+ }
+
+ return FALSE;
+ }
+
+ /**
+ * Check whether the current user is authenticated
+ *
+ * @return boolean
+ */
+ public function is_authenticated()
+ {
+ return ($this->get_auth_token() !== FALSE);
+ }
+
+ /**
+ * Clear authentication values
+ *
+ * @return void
+ */
+ public function logout()
+ {
+ $this->segment->clear();
+ }
+
+ /**
+ * Retrieve the authentication token from the session
+ *
+ * @return string|false
+ */
+ public function get_auth_token()
+ {
+ return $this->segment->get('auth_token', FALSE);
+ }
+}
// End of KitsuAuth.php
\ No newline at end of file
diff --git a/src/API/Kitsu/KitsuModel.php b/src/API/Kitsu/KitsuModel.php
index f3a9f85f..2d8124f4 100644
--- a/src/API/Kitsu/KitsuModel.php
+++ b/src/API/Kitsu/KitsuModel.php
@@ -17,6 +17,7 @@
namespace Aviat\AnimeClient\API\Kitsu;
use Aviat\AnimeClient\AnimeClient;
+use Aviat\AnimeClient\API\Kitsu as K;
use Aviat\AnimeClient\API\Kitsu\Transformer\{
AnimeTransformer, AnimeListTransformer, MangaTransformer, MangaListTransformer
};
@@ -92,7 +93,7 @@ class KitsuModel {
*/
public function authenticate(string $username, string $password)
{
- $data = $this->postRequest(AnimeClient::KITSU_AUTH_URL, [
+ $data = $this->postRequest(K::AUTH_URL, [
'form_params' => [
'grant_type' => 'password',
'username' => $username,
@@ -164,7 +165,7 @@ class KitsuModel {
'media_type' => 'Anime',
'status' => $status,
],
- 'include' => 'media',
+ 'include' => 'media,media.genres',
'page' => [
'offset' => 0,
'limit' => 200
@@ -174,10 +175,21 @@ class KitsuModel {
];
$data = $this->getRequest('library-entries', $options);
+ $included = K::organizeIncludes($data['included']);
+/*?>