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

4.1 Beta...ish #12

Merged
timw4mail merged 88 commits from develop into master 2018-11-05 13:15:59 -05:00
Conversation 0 Commits 88 Files Changed 260 +54 -45
5 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 12dfb491bc - Show all commits

72
Jenkinsfile vendored
View File

@ -1,37 +1,37 @@
pipeline { pipeline {
agent none agent none
stages { stages {
stage('PHP 7.1') { stage('PHP 7.1') {
agent { agent {
docker { docker {
image 'php:7.1-alpine' image 'php:7.1-alpine'
args '-u root --privileged' args '-u root --privileged'
} }
} }
steps { steps {
sh 'chmod +x ./build/docker_install.sh' sh 'chmod +x ./build/docker_install.sh'
sh 'sh build/docker_install.sh' sh 'sh build/docker_install.sh'
sh 'apk add --no-cache php7-phpdbg' sh 'apk add --no-cache php7-phpdbg'
sh 'curl -sS https://getcomposer.org/installer | php' sh 'curl -sS https://getcomposer.org/installer | php'
sh 'php composer.phar install --ignore-platform-reqs' sh 'php composer.phar install --ignore-platform-reqs'
sh 'phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never' sh 'phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never'
} }
} }
stage('PHP 7.2') { stage('PHP 7.2') {
agent { agent {
docker { docker {
image 'php:7.2-alpine' image 'php:7.2-alpine'
args '-u root --privileged' args '-u root --privileged'
} }
} }
steps { steps {
sh 'chmod +x ./build/docker_install.sh' sh 'chmod +x ./build/docker_install.sh'
sh 'sh build/docker_install.sh' sh 'sh build/docker_install.sh'
sh 'apk add --no-cache php7-phpdbg' sh 'apk add --no-cache php7-phpdbg'
sh 'curl -sS https://getcomposer.org/installer | php' sh 'curl -sS https://getcomposer.org/installer | php'
sh 'php composer.phar install --ignore-platform-reqs' sh 'php composer.phar install --ignore-platform-reqs'
sh 'phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never' sh 'phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never'
} }
} }
} }
} }

4
src/API/Kitsu/Model.php
View File

@ -558,7 +558,7 @@ final class Model {
'media_type' => 'Anime', 'media_type' => 'Anime',
'status' => $status, 'status' => $status,
], ],
'include' => 'media,media.genres,media.mappings,anime.streamingLinks', 'include' => 'media,media.categories,media.mappings,anime.streamingLinks',
'sort' => '-updated_at' 'sort' => '-updated_at'
]; ];
@ -618,7 +618,7 @@ final class Model {
'media_type' => 'Manga', 'media_type' => 'Manga',
'status' => $status, 'status' => $status,
], ],
'include' => 'media,media.genres,media.mappings', 'include' => 'media,media.categories,media.mappings',
'page' => [ 'page' => [
'offset' => $offset, 'offset' => $offset,
'limit' => $limit 'limit' => $limit

8
src/API/Kitsu/Transformer/AnimeListTransformer.php
View File

@ -42,7 +42,13 @@ final class AnimeListTransformer extends AbstractTransformer {
$animeId = $item['relationships']['media']['data']['id']; $animeId = $item['relationships']['media']['data']['id'];
$anime = $included['anime'][$animeId]; $anime = $included['anime'][$animeId];
$genres = array_column($anime['relationships']['genres'], 'name') ?? []; $genres = [];
foreach($anime['relationships']['categories'] as $genre)
{
$genres[] = $genre['title'];
}
sort($genres); sort($genres);
$rating = (int) $item['attributes']['ratingTwenty'] !== 0 $rating = (int) $item['attributes']['ratingTwenty'] !== 0

8
src/API/Kitsu/Transformer/MangaListTransformer.php
View File

@ -43,7 +43,13 @@ final class MangaListTransformer extends AbstractTransformer {
$mangaId = $item['relationships']['media']['data']['id']; $mangaId = $item['relationships']['media']['data']['id'];
$manga = $included['manga'][$mangaId]; $manga = $included['manga'][$mangaId];
$genres = array_column($manga['relationships']['genres'], 'name') ?? []; $genres = [];
foreach ($manga['relationships']['categories'] as $genre)
{
$genres[] = $genre['title'];
}
sort($genres); sort($genres);
$rating = (int) $item['attributes']['ratingTwenty'] !== 0 $rating = (int) $item['attributes']['ratingTwenty'] !== 0

7
src/API/Kitsu/Transformer/MangaTransformer.php
View File

@ -35,12 +35,9 @@ final class MangaTransformer extends AbstractTransformer {
{ {
$genres = []; $genres = [];
foreach($item['included'] as $included) foreach($included['categories'] as $cat)
{ {
if ($included['type'] === 'categories') $genres[] = $cat['title'];
{
$genres[] = $included['attributes']['title'];
}
} }
sort($genres); sort($genres);