mirror of
https://github.com/jikan-me/jikan-rest.git
synced 2025-02-20 11:23:35 +08:00
update SearchController (WIP)
This commit is contained in:
irfan-dahir
parent
986865811e
commit
bfac97762f
@ -3,151 +3,42 @@
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Jikan\Jikan;
|
||||
use Jikan\MyAnimeList\MalClient;
|
||||
use Jikan\Request\Search\AnimeSearchRequest;
|
||||
use Jikan\Request\Search\MangaSearchRequest;
|
||||
use Jikan\Request\Search\CharacterSearchRequest;
|
||||
use Jikan\Request\Search\PersonSearchRequest;
|
||||
use Jikan\Helper\Constants as JikanConstants;
|
||||
use App\Providers\SearchQueryBuilder;
|
||||
use JMS\Serializer\Serializer;
|
||||
|
||||
class TopController extends Controller
|
||||
class SearchController extends Controller
|
||||
{
|
||||
|
||||
private const VALID_SUB_TYPES = [
|
||||
'tv' => JikanConstants::SEARCH_ANIME_TV,
|
||||
'ova' => JikanConstants::SEARCH_ANIME_OVA,
|
||||
'movie' => JikanConstants::SEARCH_ANIME_MOVIE,
|
||||
'special' => JikanConstants::SEARCH_ANIME_SPECIAL,
|
||||
'ona' => JikanConstants::SEARCH_ANIME_ONA,
|
||||
'music' => JikanConstants::SEARCH_ANIME_MUSIC,
|
||||
'manga' => JikanConstants::SEARCH_MANGA_MANGA,
|
||||
'novel' => JikanConstants::SEARCH_MANGA_NOVEL,
|
||||
'oneshot' => JikanConstants::SEARCH_MANGA_ONESHOT,
|
||||
'doujin' => JikanConstants::SEARCH_MANGA_DOUJIN,
|
||||
'manhwa' => JikanConstants::SEARCH_MANGA_MANHWA,
|
||||
'manhua' => JikanConstants::SEARCH_MANGA_MANHUA
|
||||
];
|
||||
|
||||
private const VALID_STATUS = [
|
||||
'airing' => JikanConstants::SEARCH_ANIME_STATUS_AIRING,
|
||||
'completed' => JikanConstants::SEARCH_ANIME_STATUS_COMPLETED,
|
||||
'complete' => JikanConstants::SEARCH_ANIME_STATUS_COMPLETED,
|
||||
'tba' => JikanConstants::SEARCH_ANIME_STATUS_TBA,
|
||||
'upcoming' => JikanConstants::SEARCH_ANIME_STATUS_TBA
|
||||
];
|
||||
private $validRating = [
|
||||
'g' => JikanConstants::SEARCH_ANIME_RATING_G,
|
||||
'pg' => JikanConstants::SEARCH_ANIME_PG,
|
||||
'pg13' => JikanConstants::SEARCH_ANIME_PG13,
|
||||
'r17' => JikanConstants::SEARCH_ANIME_R17,
|
||||
'r' => JikanConstants::SEARCH_ANIME_R,
|
||||
'rx' => JikanConstants::SEARCH_ANIME_RX
|
||||
];
|
||||
|
||||
private const VALID_GENRE_ANIME = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43];
|
||||
private const VALID_GENRE_MANGA = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45];
|
||||
|
||||
|
||||
public function anime(int $page = 1) {
|
||||
$search = $this->jikan->getAnimeSearch(
|
||||
SearchQueryBuilder::create(
|
||||
(new AnimeSearchRequest())->setPage($page)
|
||||
)
|
||||
);
|
||||
|
||||
return response($this->serializer->serialize($search, 'json'));
|
||||
|
||||
}
|
||||
|
||||
public function manga(int $page = 1) {
|
||||
$request = (new MangaSearchRequest())->setPage($page);
|
||||
|
||||
}
|
||||
|
||||
public function people(int $page = 1) {
|
||||
$request = (new PersonSearchRequest())->setPage($page);
|
||||
|
||||
}
|
||||
|
||||
public function character(int $page = 1) {
|
||||
$request = (new CharacterSearchRequest())->setPage($page);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* make factory?
|
||||
private function buildConfig() {
|
||||
$antiXss = new \voku\helper\AntiXSS();
|
||||
|
||||
if (!isset($_GET)) {return;}
|
||||
|
||||
if (isset($_GET['type'])) {
|
||||
$subtype = strtolower($antiXss->xss_clean($_GET['type']));
|
||||
if (array_key_exists($subtype, $this->validSubTypes)) {
|
||||
$this->config['Type'] = $this->validSubTypes[$subtype];
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_GET['score'])) {
|
||||
$this->config['Score'] = (float) $_GET['score'];
|
||||
}
|
||||
|
||||
if (isset($_GET['status'])) {
|
||||
$status = strtolower($antiXss->xss_clean($_GET['status']));
|
||||
if (array_key_exists($status, $this->validStatus)) {
|
||||
$this->config['Status'] = $this->validStatus[$status];
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_GET['rated'])) {
|
||||
$rated = strtolower($antiXss->xss_clean($_GET['rated']));
|
||||
if (array_key_exists($rated, $this->validRating)) {
|
||||
$this->config['Rated'] = $this->validRating[$rated];
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_GET['start_date'])) {
|
||||
$startDate = $antiXss->xss_clean($_GET['start_date']);
|
||||
if (preg_match("~[0-9]{4}-[0-9]{2}-[0-9]{2}~", $startDate)) {
|
||||
$this->config['StartDate'] = explode("-", $startDate);
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_GET['end_date'])) {
|
||||
$endDate = $antiXss->xss_clean($_GET['end_date']);
|
||||
if (preg_match("~[0-9]{4}-[0-9]{2}-[0-9]{2}~", $endDate)) {
|
||||
$this->config['EndDate'] = explode("-", $endDate);
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_GET['genre'])) {
|
||||
|
||||
$this->config['Genre'] = [];
|
||||
|
||||
if (is_array($_GET['genre'])) {
|
||||
foreach ($_GET['genre'] as $genre) {
|
||||
$genre = (int) $genre;
|
||||
|
||||
if (in_array($genre, $this->validGenre)) {
|
||||
$this->config['Genre'][] = $genre;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$genre = (int) $_GET['genre'];
|
||||
if (in_array($genre, $this->validGenre)) {
|
||||
$this->config['Genre'][] = $genre;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_GET['genre_exclude'])) {
|
||||
$this->config['GenreInclude'] = ((int) $_GET['genre_exclude'] == 1) ? false : true;
|
||||
}
|
||||
}
|
||||
|
||||
// this method is just for hashing and differs from the request URL
|
||||
private function configToString() {
|
||||
$url = "?";
|
||||
foreach ($this->config as $key => $value) {
|
||||
if (is_array($value)) {
|
||||
$value = implode(",", $value);
|
||||
}
|
||||
|
||||
$url .= $key . "=" . $value . "&";
|
||||
}
|
||||
|
||||
return $url;
|
||||
}
|
||||
|
||||
*/
|
||||
}
|
||||
141
app/Providers/SearchQueryBuilder.php
Normal file
141
app/Providers/SearchQueryBuilder.php
Normal file
@ -0,0 +1,141 @@
|
||||
<?php
|
||||
|
||||
namespace App\Providers;
|
||||
|
||||
use Jikan\Request\Search\AnimeSearchRequest;
|
||||
use \voku\helper\AntiXSS;
|
||||
use Jikan\Helper\Constants as JikanConstants;
|
||||
|
||||
class SearchQueryBuilder
|
||||
{
|
||||
|
||||
private const VALID_SUB_TYPES = [
|
||||
'tv' => JikanConstants::SEARCH_ANIME_TV,
|
||||
'ova' => JikanConstants::SEARCH_ANIME_OVA,
|
||||
'movie' => JikanConstants::SEARCH_ANIME_MOVIE,
|
||||
'special' => JikanConstants::SEARCH_ANIME_SPECIAL,
|
||||
'ona' => JikanConstants::SEARCH_ANIME_ONA,
|
||||
'music' => JikanConstants::SEARCH_ANIME_MUSIC,
|
||||
'manga' => JikanConstants::SEARCH_MANGA_MANGA,
|
||||
'novel' => JikanConstants::SEARCH_MANGA_NOVEL,
|
||||
'oneshot' => JikanConstants::SEARCH_MANGA_ONESHOT,
|
||||
'doujin' => JikanConstants::SEARCH_MANGA_DOUJIN,
|
||||
'manhwa' => JikanConstants::SEARCH_MANGA_MANHWA,
|
||||
'manhua' => JikanConstants::SEARCH_MANGA_MANHUA
|
||||
];
|
||||
|
||||
private const VALID_STATUS = [
|
||||
'airing' => JikanConstants::SEARCH_ANIME_STATUS_AIRING,
|
||||
'completed' => JikanConstants::SEARCH_ANIME_STATUS_COMPLETED,
|
||||
'complete' => JikanConstants::SEARCH_ANIME_STATUS_COMPLETED,
|
||||
'tba' => JikanConstants::SEARCH_ANIME_STATUS_TBA,
|
||||
'upcoming' => JikanConstants::SEARCH_ANIME_STATUS_TBA
|
||||
];
|
||||
private const VALID_RATING = [
|
||||
'g' => JikanConstants::SEARCH_ANIME_RATING_G,
|
||||
'pg' => JikanConstants::SEARCH_ANIME_RATING_PG,
|
||||
'pg13' => JikanConstants::SEARCH_ANIME_RATING_PG13,
|
||||
'r17' => JikanConstants::SEARCH_ANIME_RATING_R17,
|
||||
'r' => JikanConstants::SEARCH_ANIME_RATING_R,
|
||||
'rx' => JikanConstants::SEARCH_ANIME_RATING_RX
|
||||
];
|
||||
|
||||
private const VALID_GENRE = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45];
|
||||
|
||||
|
||||
public static function create(AnimeSearchRequest $request) : AnimeSearchRequest
|
||||
{
|
||||
$xss = new AntiXSS();
|
||||
|
||||
if (isset($_GET['q'])) {
|
||||
$request->setQuery(
|
||||
$xss->xss_clean($_GET['q'])
|
||||
);
|
||||
}
|
||||
|
||||
if (isset($_GET['page'])) {
|
||||
$page = (int) $page;
|
||||
$request->setPage($page);
|
||||
}
|
||||
|
||||
if (isset($_GET['type'])) {
|
||||
$subtype = strtolower($xss->xss_clean($_GET['type']));
|
||||
if (array_key_exists($subtype, self::VALID_SUB_TYPES)) {
|
||||
$request->setType(self::VALID_SUB_TYPES[$subtype]);
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_GET['score'])) {
|
||||
$score = (float) $xss->xss_clean($_GET['score']);
|
||||
|
||||
if ($score >= 0.0 && $score <= 10.0) {
|
||||
$request->setScore($score);
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_GET['status'])) {
|
||||
$status = strtolower($xss->xss_clean($_GET['status']));
|
||||
if (array_key_exists($status, self::VALID_STATUS)) {
|
||||
$request->setStatus(self::VALID_STATUS[$status]);
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_GET['rated'])) {
|
||||
$rated = strtolower($xss->xss_clean($_GET['rated']));
|
||||
if (array_key_exists($rated, self::VALID_RATING)) {
|
||||
$request->setRated(self::VALID_RATING[$rated]);
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_GET['start_date'])) {
|
||||
$startDate = $xss->xss_clean($_GET['start_date']);
|
||||
if (preg_match("~[0-9]{4}-[0-9]{2}-[0-9]{2}~", $startDate)) {
|
||||
$startDate = explode("-", $startDate);
|
||||
$request->setStartDate(
|
||||
(int) $startDate[2],
|
||||
(int) $startDate[1],
|
||||
(int) $startDate[0]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_GET['end_date'])) {
|
||||
$endDate = $xss->xss_clean($_GET['end_date']);
|
||||
if (preg_match("~[0-9]{4}-[0-9]{2}-[0-9]{2}~", $endDate)) {
|
||||
$endDate = explode("-", $endDate);
|
||||
$request->setEndDate(
|
||||
(int) $endDate[2],
|
||||
(int) $endDate[1],
|
||||
(int) $endDate[0]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_GET['genre'])) {
|
||||
|
||||
if (is_array($_GET['genre'])) {
|
||||
foreach ($_GET['genre'] as $genre) {
|
||||
$genre = (int) $genre;
|
||||
|
||||
if (\in_array($genre, self::VALID_GENRE)) {
|
||||
$request->setGenre($genre);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$genre = (int) $_GET['genre'];
|
||||
if (\in_array($genre, self::VALID_GENRE)) {
|
||||
$request->setGenre($genre);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_GET['genre_exclude'])) {
|
||||
$request->setGenreExclude(
|
||||
((int) $_GET['genre_exclude'] == 1) ? false : true
|
||||
);
|
||||
}
|
||||
|
||||
return $request;
|
||||
}
|
||||
|
||||
}
|
||||
8
composer.lock
generated
8
composer.lock
generated
@ -1694,12 +1694,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/jikan-me/jikan.git",
|
||||
"reference": "5beada6a19ead857e1f5ba213a7165616ad2e59d"
|
||||
"reference": "e92763e8d1bd0b108a4c0b930d3a0a61ccf98848"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/jikan-me/jikan/zipball/5beada6a19ead857e1f5ba213a7165616ad2e59d",
|
||||
"reference": "5beada6a19ead857e1f5ba213a7165616ad2e59d",
|
||||
"url": "https://api.github.com/repos/jikan-me/jikan/zipball/e92763e8d1bd0b108a4c0b930d3a0a61ccf98848",
|
||||
"reference": "e92763e8d1bd0b108a4c0b930d3a0a61ccf98848",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1735,7 +1735,7 @@
|
||||
}
|
||||
],
|
||||
"description": "Jikan is an unofficial MyAnimeList API",
|
||||
"time": "2018-08-12T11:31:25+00:00"
|
||||
"time": "2018-08-13T17:54:51+00:00"
|
||||
},
|
||||
{
|
||||
"name": "jms/metadata",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user