diff --git a/.gitignore b/.gitignore
index e244eda0..5ede35ba 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
/vendor/
-/.idea/
\ No newline at end of file
+/.idea/
+/composer.lock
+/test.php
+/jikan-fixtures
diff --git a/.travis.yml b/.travis.yml
old mode 100755
new mode 100644
index 1ebde19a..4b4eb63e
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,30 @@
language: php
+
php:
- - '7.0'
- - '7.1'
- - '7.2'
+ - 7.1
+ - 7.2
+ - nightly
+
+env:
+ matrix:
+ -
+# - DEPENDENCIES=--prefer-lowest
+
+cache:
+ directories:
+ - .composer/cache
+
+matrix:
+ fast_finish: true
+ allow_failures:
+ - php: nightly
+
+before_install:
+ - alias composer=composer\ --no-interaction && composer selfupdate
+ - composer global require hirak/prestissimo
+
+install:
+ - travis_retry composer update --no-progress --profile --no-scripts --no-suggest $DEPENDENCIES
-before_script:
- - composer install
-script: php travis.php
\ No newline at end of file
+script:
+ - vendor/bin/grumphp run
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000..23dd9305
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,51 @@
+build: false
+shallow_clone: false
+platform:
+ - x86
+ - x64
+clone_folder: c:\projects\jikan
+
+environment:
+ matrix:
+ - PHP_VERSION: 7.1
+ - PHP_VERSION: 7.2
+
+cache:
+ - '%APPDATA%\Composer'
+ - c:\tools\php -> appveyor.yml
+init:
+ - SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
+ - SET COMPOSER_NO_INTERACTION=1
+ - SET PHP=1
+ - SET ANSICON=121x90 (121x90)
+
+install:
+ - IF EXIST c:\tools\php (SET PHP=0)
+ - ps: Set-Service wuauserv -StartupType Manual
+
+ # Install PHP here
+ - ps: appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:PHP_VERSION | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
+ # - IF %PHP%==1 cinst -y OpenSSL.Light
+ # - IF %PHP%==1 cinst -y php -version %PHP_VERSION%
+ # - cd C:\tools\php71
+ - cd c:\tools\php
+ - IF %PHP%==1 copy php.ini-production php.ini
+ - IF %PHP%==1 echo date.timezone="UTC" >> php.ini
+ - IF %PHP%==1 echo memory_limit=1024M >> php.ini
+ - IF %PHP%==1 echo extension_dir=ext >> php.ini
+ - IF %PHP%==1 echo extension=php_curl.dll >> php.ini
+ - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
+ - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
+ - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
+
+ # Download
+ - cd C:\tools
+ - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
+
+before_test:
+ - cd C:\projects\jikan
+ - php C:\tools\composer.phar update --no-progress --profile --prefer-dist --no-scripts --no-interaction --no-suggest
+
+test_script:
+ - cd c:\projects\jikan
+ - vendor\bin\phpunit --colors=always
diff --git a/composer.json b/composer.json
index 51751385..92d5b019 100755
--- a/composer.json
+++ b/composer.json
@@ -9,8 +9,7 @@
"email": "irfan@jikan.moe"
}
],
- "minimum-stability": "dev",
- "require": {},
+ "minimum-stability": "stable",
"autoload": {
"psr-4": {
"Jikan\\": [
@@ -18,6 +17,25 @@
]
}
},
+ "autoload-dev": {
+ "psr-4": {
+ "Jikan\\": [
+ "test/JikanTest"
+ ]
+ }
+ },
+ "require": {
+ "fabpot/goutte": "^3.2",
+ "php": "^7.1"
+ },
"require-dev": {
+ "phpunit/phpunit": "^6.3",
+ "php-vcr/php-vcr": "~1.3.2",
+ "php-vcr/phpunit-testlistener-vcr": "^3.0",
+ "squizlabs/php_codesniffer": "^3.3",
+ "phpro/grumphp": "^0.14.1",
+ "jakub-onderka/php-parallel-lint": "^1.0",
+ "doctrine/collections": "^1.5",
+ "jikan-me/jikan-fixtures": "dev-master"
}
}
diff --git a/examples/anime.php b/examples/anime.php
deleted file mode 100755
index b71001af..00000000
--- a/examples/anime.php
+++ /dev/null
@@ -1,12 +0,0 @@
-Anime(21);
-//$jikan->Anime(1, [EPISODES, CHARACTERS_STAFF]); // get episodes + characters+staff
-//$jikan->Anime(21, [EPISODES=>2]); // get all the episodes from page 2 of the episode list
-
-var_dump($jikan->response);
-?>
\ No newline at end of file
diff --git a/examples/character.php b/examples/character.php
deleted file mode 100755
index 983a79a2..00000000
--- a/examples/character.php
+++ /dev/null
@@ -1,9 +0,0 @@
-Character(1);
-
-var_dump($jikan->response);
-?>
\ No newline at end of file
diff --git a/examples/manga.php b/examples/manga.php
deleted file mode 100755
index 14a9aa45..00000000
--- a/examples/manga.php
+++ /dev/null
@@ -1,11 +0,0 @@
-Manga(1);
-//$jikan->Manga(1, [CHARACTERS]); // get the characters too
-
-var_dump($jikan->response);
-?>
\ No newline at end of file
diff --git a/examples/person.php b/examples/person.php
deleted file mode 100755
index 7800c559..00000000
--- a/examples/person.php
+++ /dev/null
@@ -1,9 +0,0 @@
-Person(1);
-
-var_dump($jikan->response);
-?>
\ No newline at end of file
diff --git a/examples/schedule.php b/examples/schedule.php
deleted file mode 100755
index 55a24e45..00000000
--- a/examples/schedule.php
+++ /dev/null
@@ -1,15 +0,0 @@
-Schedule();
-
-$jikan->response['monday']; // anime airing on monday
-$jikan->response['tuesday']; // anime airing on tuesday
-//$jikan->response[$day];
-$jikan->response['sunday']; // all the way upto sunday
-
-var_dump($jikan->response);
-?>
\ No newline at end of file
diff --git a/examples/search.php b/examples/search.php
deleted file mode 100755
index ffbe76a9..00000000
--- a/examples/search.php
+++ /dev/null
@@ -1,110 +0,0 @@
-Search(query, type[, page, config])
- *
- * `query` : string (must be atleast 3 characters)
- * `type` : CONSTANT [ANIME, MANGA, PEOPLE, PERSON (alias), CHARACTER]
- * `page` : integer // search result page
- * `config` : Helper\SearchConfig OBJECT
- */
-
-// Basic Search
-$jikan->Search('Code Geass', ANIME);
-var_dump($jikan->response['result']); // Search results for 'Code Geass' that are Anime
-$pages = $jikan->response['result_last_page']; // Number of pages of search results. You can use this for pagination
-
-/*
- * NOTE: Response is stored in `$jikan->response`
- * Search results are in `$jikan->response['result']` (array)
- * No# of pages `$jikan->response['result_last_page']` (integer)
- */
-
-var_dump(
- $jikan->Search('Sword Art Online', MANGA)->response['result']; // All manga search results for 'Sword Art Online'
-);
-
-$jikan->Search('Makise', CHARACTER, 2); // 2nd page of the search results for 'Makise'
-$jikan->Search('Sawano', PEOPLE); // you get it by now
-
-
-/*
- * Advanced Search
- */
-
-// Call the SearchConfig Helper to build the config for the query.
-// Only Argument is the SearchConfig Type. Only Legal values are ANIME and MANGA
-// There are no advanced search options for CHARACTER or PEOPLE
-// ALL CONSTANTS ARE DEFINED IN `src/config.php`
-$config = new Jikan\Helper\SearchConfig(ANIME);
-
-// NOTE: If it isn't obvious, All these flags are optional.
-// NOTE2: These methods can be chained
-
-/* Types
- * CONSTANTS ARE DEFINED IN `src/config.php`
- */
-$config->setType(TYPE_MOVIE);
-
-/* Score (integer) 1-10
- * Minimum Score in results
- */
-$config->setScore(5);
-
-/* Status
- * e.g finished, airing, publishing, etc
- * CONSTANTS ARE DEFINED IN `src/config.php`
- */
-$config->setStatus(FINISHED_AIRING);
-
-/* Rated
- * PG, PG13, R17, etc
- * CONSTANTS ARE DEFINED IN `src/config.php`
- */
-$config->setRated(PG13);
-
-/* Start Date
- * setStartDate(day (int), month (int), year (int))
- */
-$config->setStartDate(5, 10, 2004);
-
-/* End Date
- * setEndDate(day (int), month (int), year (int))
- */
-$config->setStartDate(27, 3, 2012);
-
-/* Genre
- * CONSTANTS ARE DEFINED IN `src/config.php`
- */
-
-// You can set one by one
-$config->setGenre(ACTION);
-$config->setGenre(COMEDY);
-
-// or in bulk
-$config->setGenre([ACTION, COMEDY, SUPER_POWER, SUPERNATURAL, SHOUNEN]);
-// Don't worry about duplicates, they're removed automatically
-
-/* Genre Include Or Exclude
- * The genre that are defined above this
- * You have the option of having the results either
- * - Include anime/manga with them
- * - Exclude anime/manga with them
- *
- * NOTE: THIS IS `TRUE` BY DEFAULT
- */
-
-$config->setGenreInclude(true); // This will Include the results with these genre (default)
-
-$config->setGenreInclude(false); // Exclude
-
-// Pass the object as an argument
-$jikan->Search('Bleach', ANIME, 1, $config);
-
-var_dump($jikan->response);
-?>
\ No newline at end of file
diff --git a/examples/seasonal.php b/examples/seasonal.php
deleted file mode 100755
index d78254d4..00000000
--- a/examples/seasonal.php
+++ /dev/null
@@ -1,13 +0,0 @@
-Seasonal(season (constant), year (string));
-// season : WINTER, SPRING, SUMMER, FALL
-// CONSTANTS ARE DEFINED IN `src/config.php`
-$jikan->Seasonal(WINTER, 2017);
-
-var_dump($jikan->response);
-?>
\ No newline at end of file
diff --git a/examples/test.php b/examples/test.php
deleted file mode 100755
index 4b2b1523..00000000
--- a/examples/test.php
+++ /dev/null
@@ -1,43 +0,0 @@
-setGenre(1, 2);
-
-$jikan->Search(NULL, ANIME, 1, $config);
-
-$time_end = microtime(true);
-$execution_time = ($time_end - $time_start);
-
-//execution time of the script
-echo 'Total Execution Time: '.$execution_time.' s
';
-
-//var_dump();
-foreach ($jikan->response['result'] as $key => $value) {
- var_dump($value);
-}
-
-//$jikan->Anime(21);
-//sleep(5);
-//$jikan->Anime(21, [EPISODES]);
-//sleep(5);
-//$jikan->Anime(21, [EPISODES, CHARACTERS_STAFF]);
-//sleep(5);
-//$jikan->Manga(1);
-//sleep(5);
-//$jikan->Manga(1, [CHARACTERS]);
-//sleep(5);
-//$jikan->Person(1);
-//sleep(5);
-//$jikan->Character(1);
-//
\ No newline at end of file
diff --git a/grumphp.yml b/grumphp.yml
new file mode 100644
index 00000000..4f1bb9ff
--- /dev/null
+++ b/grumphp.yml
@@ -0,0 +1,20 @@
+parameters:
+ git_dir: .
+ bin_dir: ./vendor/bin
+ process_timeout: 180
+ tasks:
+ phpcs:
+ standard: 'PSR2'
+ ignore_patterns:
+ - 'test/*.php'
+ - 'src/Jikan.php'
+ git_blacklist:
+ keywords:
+ - 'var_dump'
+ - 'exit'
+ - 'else'
+ - 'ini_set'
+ - 'error_reporting'
+ - 'die'
+ phpunit: ~
+ phplint: ~
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 00000000..b344bddb
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ ./test/JikanTest
+
+
+ ./test/JikanTest/JikanTest.php
+
+
+
+
+ src
+
+
+
\ No newline at end of file
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 00000000..83cbf5c3
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+ ./test/JikanTest
+
+
+
+
+ src
+
+
+
\ No newline at end of file
diff --git a/readme.md b/readme.md
index bfd07a3e..19d4635f 100755
--- a/readme.md
+++ b/readme.md
@@ -1,38 +1,31 @@
-# Jikan - The Unofficial MyAnimeList.net PHP API
-[](https://travis-ci.org/jikan-me/jikan?branch=master) []() [](https://packagist.org/packages/jikan-me/jikan) [](http://isitmaintained.com/project/jikan-me/jikan "Average time to resolve an issue") [](http://isitmaintained.com/project/jikan-me/jikan "Percentage of issues still open") []()
+# Jikan - Unofficial MyAnimeList.net PHP API
+[](https://travis-ci.org/jikan-me/jikan?branch=master) [](https://ci.appveyor.com/project/irfan-dahir/jikan) [](https://packagist.org/packages/jikan-me/jikan) [](http://isitmaintained.com/project/jikan-me/jikan "Average time to resolve an issue") [](http://isitmaintained.com/project/jikan-me/jikan "Percentage of issues still open") []() [](https://discord.gg/4q8E4Gg)
-Jikan is a **depenency free**, PHP API with easy-to-use syntax that scrapes and parses requests from [MyAnimeList.net](https://myanimelist.net).
+Jikan is a PHP API with scrapes and parses requests from [MyAnimeList.net](https://myanimelist.net).
The raison d'être of Jikan is to help developers easily get the data they need for their apps and projects without having to depend on the lackluster official API, unstable APIs, or sidetracking their projects to develop parsers.
The word _Jikan_ literally translates to _Time_ in Japanese (**時間**). And that's what this API saves you of. ;)
-### Getting Started
+## Getting Started
1. `composer require jikan-me/jikan`
-2. [Documentation](https://jikan.moe/docs)
+2. [Documentation](https://docs.jikan.moe)
+## Jikan REST API
+There's a REST service available, as well as a few wrappers built around it.
-## Jikan REST API [](https://jikan.moe)
-If you don't want to handle PHP, you're in luck! Jikan has it's own RESTful API service (CORS enabled + JSON response) hosted by [Hibiki](https://github.com/assintates)
+- **[REST DOCUMENTATION](https://jikan.docs.apiary.io)**
+- **[See which apps are using JikanREST](https://jikan.moe/showcase)**
+- **[Want to host your own instance of Jikan REST?](https://github.com/jikan-me/jikan-rest)**
-**[REST DOCUMENTATION](https://jikan.docs.apiary.io)**
-
-**[See which apps are using JikanREST](https://jikan.moe/showcase)**
-
-### WARNING: BULK REQUESTS
-If your use of the API is **NOT** for an app/bot/etc that makes consistent amount of requests but **rather** for the sake of making bulk requests, keep in mind to have a **3-4 second delay between EACH request** otherwise **your IP will be blacklisted**.
-
-Remember, you're not the only one using the API. Be responsible.
-
-## Wrappers
+### Wrappers
- **[.NET]** [Jikan.net](https://github.com/Ervie/jikan.net) by Ervie
- **[Python]** [JikanPy](https://github.com/AWConant/jikanpy) by Andrew Conant & Abhinav Kasamsetty
- **[Ruby]** [Jikan.rb](https://github.com/Zerocchi/jikan.rb) by Zerocchi
-
-Contributions to Jikan by making wrappers in programming languages of your choice are much appreciated! Do let me know if you've made one and I'll include it here.
+- **[JavaScript]** [JikanJS](https://github.com/zuritor/jikanjs) by Zuritor
## Features
- Anime Parsing
@@ -55,57 +48,38 @@ Contributions to Jikan by making wrappers in programming languages of your choic
- Pictures
- People Parsing
- Pictures
-- Search (Anime/Manga/Character/Person)
- - Filters (Advanced Search)
+- Search
+ - Anime
+ - Manga
+ - Character
+ - Person
- Pagination Support
- - No.# of pages
+ - Advanced Search (Filters)
- Seasonal Anime (Season + Year)
- Anime Scheduling (for current season)
- Top
- Anime
- Manga
- - Sub Types & Pagination Support
-
-- Modular scraping methods for developers to easily extend the API
-- JSON format! ლ( ͡⎚ ͜ʖ ͡⎚ ლ)
-
-## Roadmap
-- Most Favorited
- Characters
- People
-- User Profile
-- Command Line Usage
-- [PThreads](https://github.com/krakjoe/pthreads) (Multi-threaded) Support (CLI ONLY!)
+ - Sub Types & Pagination Support
+- Genre
+ - Anime
+ - Manga
+- Producers (Anime Listing)
+- Magazines (Manga Listing)
+- User
+ - Profile
+ - Friends
+ - History
## Changelog
-### 1.15.14 stable - May 26, 18
-- **[Anime, Manga, Extended]**
- - Fix Some parsing methods were not parsing correctly [#148](/../../issues/148)
-- **[Person]**
- - Add information about roles [#146](/../../issues/146)
-- **[Seasonal]**
- - Add `season_name` and `season_year` data
-
-**[Read More](https://github.com/jikan-me/jikan/tree/master/changelog.md)**
-## Usage
-- [.NET](https://github.com/Ervie/jikan.net/wiki)
-- [PHP](https://github.com/jikan-me/jikan/tree/master/examples)
-- [Python](https://github.com/jikan-me/jikanpy#jikanpy)
-- [Ruby](https://github.com/jikan-me/jikan.rb#usage)
-## Contributions
-I would like to thank these 3 for graciously hosting Jikan REST for free!
-* [Hibiki](https://twitter.com/Assintates)
-* [Sif](https://myanimelist.net/profile/ArtoriasMoreder)
-* [BroHosting](https://brohosting.eu)
+## Dependencies
+- [Goutte](https://github.com/FriendsOfPHP/Goutte)
+- PHP ^7.1
## DISCLAIMER
-- Jikan is in no way affiliated with MyAnimeList.
-- I am not responsible for what you do with this library, so use it responsibly as per MyAnimeList's [TOS](https://myanimelist.net/about/terms_of_use)
-- Use the REST API responsibly, bulk requesting data for building your own database/datasets is only allowed under conditions. [Read More](https://jikan.docs.apiary.io/#introduction/information/rate-limiting)
-
-## [Donate](https://liberapay.com/Nekomata/donate)
-If you found this useful, please feel free to donate to help with development!
-
-[](https://liberapay.com/Nekomata/donate "Donate using Liberapay")
\ No newline at end of file
+- Jikan is not affiliated with MyAnimeList.net
+- I am not responsible for how you do use this library. Please be respectful towards MyAnimeList's [Terms Of Service](https://myanimelist.net/about/terms_of_use)
diff --git a/src/Exception/ParserException.php b/src/Exception/ParserException.php
new file mode 100644
index 00000000..5d0fd8e4
--- /dev/null
+++ b/src/Exception/ParserException.php
@@ -0,0 +1,26 @@
+getPath());
+
+ return new self($message, $previous->getCode(), $previous);
+ }
+}
diff --git a/src/Get/Anime.php b/src/Get/Anime.php
deleted file mode 100755
index 08ad8908..00000000
--- a/src/Get/Anime.php
+++ /dev/null
@@ -1,151 +0,0 @@
-id = $id;
-
- $this->parser = new AnimeParse;
- $this->parser->setPath(
- (
- is_int($this->id) || ctype_digit($this->id)
- ) ? BASE_URL . ANIME_ENDPOINT . $this->id : $this->id
- );
- $this->parser->loadFile();
-
- $this->response['code'] = $this->parser->status;
- $this->response = array_merge($this->response, $this->parser->parse());
-
- $this->canonical_path = $this->parser->model->get('Anime', 'link_canonical');
-
-
-
- if (!empty($extend)) {
- $this->extend = $extend;
-
- foreach ($this->extend as $key => $extend) {
-
- if (is_string($key)) {
- $this->extend = $key;
- $this->extendArgs = $extend;
-
- if (!in_array($this->extend, $this->validExtends)) {
- throw new \Exception('Unsupported parse request');
- }
-
- $this->{$this->extend}($this->extendArgs);
- } elseif (is_int($key)) {
- $this->extend = $extend;
-
- if (!in_array($this->extend, $this->validExtends)) {
- throw new \Exception('Unsupported parse request');
- }
-
- $this->{$this->extend}();
- }
- }
- }
-
- }
-
- private function episodes($page=1) {
- $page = ($page < 1) ? $page = 1 : $page;
- $this->parser = new AnimeEpisodeParse;
- //echo $this->canonical_path.'?offset='.(($page-1)*100);
-
- $this->parser->setPath($this->canonical_path.'/episode?offset='.(($page-1)*100));
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
-
- }
-
- private function charactersStaff() {
- $this->parser = new AnimeCharacterStaffParse;
-
- $this->parser->setPath($this->canonical_path.'/characters');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
- private function news() {
- $this->parser = new AnimeNewsParse;
-
- $this->parser->setPath($this->canonical_path.'/news');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
- private function videos() {
- $this->parser = new AnimeVideoParse;
-
- $this->parser->setPath($this->canonical_path.'/video');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
- private function stats() {
- $this->parser = new AnimeStatsParse;
-
- $this->parser->setPath($this->canonical_path.'/stats');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
- private function pictures() {
- $this->parser = new AnimePicturesParse;
-
- $this->parser->setPath($this->canonical_path.'/pics');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
- private function forum() {
- $this->parser = new AnimeForumParse;
-
- $this->parser->setPath($this->canonical_path.'/forum');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
- private function moreInfo() {
- $this->parser = new AnimeMoreInfoParse;
-
- $this->parser->setPath($this->canonical_path.'/moreinfo');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
-
-}
\ No newline at end of file
diff --git a/src/Get/Character.php b/src/Get/Character.php
deleted file mode 100755
index 968bccfe..00000000
--- a/src/Get/Character.php
+++ /dev/null
@@ -1,74 +0,0 @@
-id = $id;
-
- $this->parser = new CharacterParse;
- $this->parser->setPath(
- (
- is_int($this->id) || ctype_digit($this->id)
- ) ? BASE_URL . CHARACTER_ENDPOINT . $this->id : $this->id
- );
- $this->parser->loadFile();
-
- $this->response['code'] = $this->parser->status;
- $this->response = array_merge($this->response, $this->parser->parse());
-
- $this->canonical_path = $this->parser->model->get('Character', 'link_canonical');
-
- if (!empty($extend)) {
- $this->extend = $extend;
-
- foreach ($this->extend as $key => $extend) {
-
- if (is_string($key)) {
- $this->extend = $key;
- $this->extendArgs = $extend;
-
- if (!in_array($this->extend, $this->validExtends)) {
- throw new \Exception('Unsupported parse request');
- }
-
- $this->{$this->extend}($this->extendArgs);
- } elseif (is_int($key)) {
- $this->extend = $extend;
-
- if (!in_array($this->extend, $this->validExtends)) {
- throw new \Exception('Unsupported parse request');
- }
-
- $this->{$this->extend}();
- }
- }
- }
-
- }
-
- private function pictures() {
- $this->parser = new CharacterPicturesParse;
-
- $this->parser->setPath($this->canonical_path.'/pictures');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
-}
\ No newline at end of file
diff --git a/src/Get/Get.php b/src/Get/Get.php
deleted file mode 100755
index 0bb5fcd2..00000000
--- a/src/Get/Get.php
+++ /dev/null
@@ -1,17 +0,0 @@
-id = $id;
-
- $this->parser = new MangaParse;
- $this->parser->setPath(
- (
- is_int($this->id) || ctype_digit($this->id)
- ) ? BASE_URL . MANGA_ENDPOINT . $this->id : $this->id
- );
- $this->parser->loadFile();
-
- $this->response['code'] = $this->parser->status;
- $this->response = array_merge($this->response, $this->parser->parse());
-
- $this->canonical_path = $this->parser->model->get('Manga', 'link_canonical');
-
-
- if (!empty($extend)) {
- $this->extend = $extend;
-
- foreach ($this->extend as $key => $extend) {
-
- if (is_string($key)) {
- $this->extend = $key;
- $this->extendArgs = $extend;
-
- if (!in_array($this->extend, $this->validExtends)) {
- throw new \Exception('Unsupported parse request');
- }
-
- $this->{$this->extend}($this->extendArgs);
- } elseif (is_int($key)) {
- $this->extend = $extend;
-
- if (!in_array($this->extend, $this->validExtends)) {
- throw new \Exception('Unsupported parse request');
- }
-
- $this->{$this->extend}();
- }
- }
- }
-
- }
-
- private function characters() {
- $this->parser = new MangaCharacterParse;
-
- $this->parser->setPath($this->canonical_path.'/characters');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
- private function news() {
- $this->parser = new MangaNewsParse;
-
- $this->parser->setPath($this->canonical_path.'/news');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
- private function stats() {
- $this->parser = new MangaStatsParse;
-
- $this->parser->setPath($this->canonical_path.'/stats');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
- private function pictures() {
- $this->parser = new MangaPicturesParse;
-
- $this->parser->setPath($this->canonical_path.'/pics');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
- private function forum() {
- $this->parser = new MangaForumParse;
-
- $this->parser->setPath($this->canonical_path.'/forum');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
- private function moreInfo() {
- $this->parser = new MangaMoreInfoParse;
-
- $this->parser->setPath($this->canonical_path.'/moreinfo');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
-}
\ No newline at end of file
diff --git a/src/Get/Person.php b/src/Get/Person.php
deleted file mode 100755
index b216dfc6..00000000
--- a/src/Get/Person.php
+++ /dev/null
@@ -1,75 +0,0 @@
-id = $id;
-
- $this->parser = new PersonParse;
- $this->parser->setPath(
- (
- is_int($this->id) || ctype_digit($this->id)
- ) ? BASE_URL . PEOPLE_ENDPOINT . $this->id : $this->id
- );
- $this->parser->loadFile();
-
- $this->response['code'] = $this->parser->status;
- $this->response = array_merge($this->response, $this->parser->parse());
-
- $this->canonical_path = $this->parser->model->get('Person', 'link_canonical');
-
-
- if (!empty($extend)) {
- $this->extend = $extend;
-
- foreach ($this->extend as $key => $extend) {
-
- if (is_string($key)) {
- $this->extend = $key;
- $this->extendArgs = $extend;
-
- if (!in_array($this->extend, $this->validExtends)) {
- throw new \Exception('Unsupported parse request');
- }
-
- $this->{$this->extend}($this->extendArgs);
- } elseif (is_int($key)) {
- $this->extend = $extend;
-
- if (!in_array($this->extend, $this->validExtends)) {
- throw new \Exception('Unsupported parse request');
- }
-
- $this->{$this->extend}();
- }
- }
- }
-
- }
-
- private function pictures() {
- $this->parser = new PersonPicturesParse;
-
- $this->parser->setPath($this->canonical_path.'/pictures');
- $this->parser->loadFile();
-
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
-}
\ No newline at end of file
diff --git a/src/Get/Schedule.php b/src/Get/Schedule.php
deleted file mode 100755
index cfcdedb5..00000000
--- a/src/Get/Schedule.php
+++ /dev/null
@@ -1,26 +0,0 @@
-parser = new ScheduleParse;
-
- $link = BASE_URL . 'anime/season/schedule';
-
- $this->parser->setPath($link);
- $this->parser->loadFile();
-
- $this->response['code'] = $this->parser->status;
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
-}
\ No newline at end of file
diff --git a/src/Get/Search.php b/src/Get/Search.php
deleted file mode 100755
index ae2e3970..00000000
--- a/src/Get/Search.php
+++ /dev/null
@@ -1,60 +0,0 @@
-validNullQueries)) {
- if (is_null($query)) {
- throw new \Exception('No Query Given');
- }
- }
-
- $this->query = is_null($query) ? "" : urlencode($query);
-
- $this->parser = new SearchParse;
-
- $link = BASE_URL;
-
- switch ($type) {
- case ANIME:
- $link .= 'anime.php?q=' . $this->query . ($page > 1 ? '&show=' . ($page-1)*50 : '' ) . '&c[]=a&c[]=b&c[]=c&c[]=f';
- break;
- case MANGA:
- $link .= 'manga.php?q=' . $this->query . ($page > 1 ? '&show=' . ($page-1)*50 : '' ) . '&c[]=a&c[]=b&c[]=c&c[]=f';
- break;
- case CHARACTER:
- $link .= 'character.php?q=' . $this->query . ($page > 1 ? '&show=' . ($page-1)*50 : '' );
- break;
- case PERSON:
- $link .= 'people.php?q=' . $this->query . ($page > 1 ? '&show=' . ($page-1)*50 : '' );
- break;
-
- default:
- throw new \Exception('Invalid Search Type');
- break;
- }
-
- if (!is_null($config)) {
- if ($type == ANIME || $type == MANGA) {
- $link .= "&".$config->build();
- }
- }
-
- $this->parser->setPath($link);
- $this->parser->loadFile();
-
- $this->response['code'] = $this->parser->status;
- $this->response = array_merge($this->response, $this->parser->parse($type, $this->parser->status));
- }
-
-}
\ No newline at end of file
diff --git a/src/Get/Seasonal.php b/src/Get/Seasonal.php
deleted file mode 100755
index 61b5456a..00000000
--- a/src/Get/Seasonal.php
+++ /dev/null
@@ -1,31 +0,0 @@
-parser = new SeasonalParse;
-
- $link = BASE_URL . 'anime/season';
-
- if (!is_null($season) && !is_null($year)) {
- $link .= '/' . $year . '/' . $season;
- }
-
-
- $this->parser->setPath($link);
- $this->parser->loadFile();
-
- $this->response['code'] = $this->parser->status;
- $this->response = array_merge($this->response, $this->parser->parse());
- }
-
-}
\ No newline at end of file
diff --git a/src/Get/Top.php b/src/Get/Top.php
deleted file mode 100755
index dbedcdc9..00000000
--- a/src/Get/Top.php
+++ /dev/null
@@ -1,43 +0,0 @@
-parser = new TopParse;
-
- $link = BASE_URL . 'top'.$type.'.php?limit=' . ($page-1)*50;
-
- if (!is_null($subtype)) {
- $link .= '&type=' . $subtype;
- }
-
-
- $this->parser->setPath($link);
-
- $this->parser->loadFile();
-
- $this->response['code'] = $this->parser->status;
- $this->response = array_merge($this->response, $this->parser->parse($type));
- }
-
-}
\ No newline at end of file
diff --git a/src/Get/UserList.php b/src/Get/UserList.php
deleted file mode 100644
index 965ba4a0..00000000
--- a/src/Get/UserList.php
+++ /dev/null
@@ -1,41 +0,0 @@
-parser = new UserListParse;
-
- $link = BASE_URL . $type.'list/' . $username;
-
-
-
-
- // $this->parser->setPath($link);
-
- // $this->parser->loadFile();
-
- // $this->response['code'] = $this->parser->status;
- // $this->response = array_merge($this->response, $this->parser->parse($type));
- }
-
-}
\ No newline at end of file
diff --git a/src/Helper/Constants.php b/src/Helper/Constants.php
new file mode 100644
index 00000000..a601f99c
--- /dev/null
+++ b/src/Helper/Constants.php
@@ -0,0 +1,49 @@
+', '
', '
'], '\n', $string)
+ ),
+ ENT_QUOTES
+ )
+ );
+ }
+
+ /**
+ * @param string $string
+ *
+ * @return string
+ */
+ public static function UTF8NbspTrim(string $string): string
+ {
+ return trim($string, \chr(0xC2).\chr(0xA0));
+ }
+}
diff --git a/src/Helper/MalUrlExtractor.php b/src/Helper/MalUrlExtractor.php
new file mode 100644
index 00000000..e0fa74e1
--- /dev/null
+++ b/src/Helper/MalUrlExtractor.php
@@ -0,0 +1,75 @@
+crawler = clone $crawler;
+ $this->type = $type;
+ $this->imageLinks = $imageLinks;
+ }
+
+ /**
+ * Extract all mal urls that begin with BASE_URL/$type
+ *
+ * @return \Jikan\Model\Common\MalUrl[]
+ * @throws \InvalidArgumentException
+ */
+ public function getMalUrls(): array
+ {
+ if (!$this->imageLinks) {
+ $this->crawler->filterXPath('//a/img')->each(
+ function (Crawler $c) {
+ $node = $c->parents()->first()->getNode(0);
+ /** @noinspection NullPointerExceptionInspection */
+ $node->parentNode->removeChild($node);
+ }
+ );
+ }
+
+ $xpath = sprintf('//a[contains(@href, "%s/%s")]', Constants::BASE_URL, $this->type);
+
+ return $this->crawler
+ ->filterXPath($xpath)
+ ->each(
+ function (Crawler $c) {
+ return (new MalUrlParser($c))->getModel();
+ }
+ );
+ }
+}
diff --git a/src/Helper/Parser.php b/src/Helper/Parser.php
new file mode 100644
index 00000000..0d2ac4e0
--- /dev/null
+++ b/src/Helper/Parser.php
@@ -0,0 +1,138 @@
+count()) {
+ return $crawler;
+ }
+ $crawler->children()->each(
+ function (Crawler $crawler) {
+ $node = $crawler->getNode(0);
+ if ($node === null || $node->nodeType === 3 || \in_array($node->nodeName, self::ALLOWED_NODES, true)) {
+ return;
+ }
+ $node->parentNode->removeChild($node);
+ }
+ );
+
+ return $crawler;
+ }
+
+ /**
+ * Extract the id from a mal url
+ *
+ * @param string $url
+ *
+ * @return int
+ */
+ public static function idFromUrl(string $url): int
+ {
+ return (int)preg_replace('#https://myanimelist.net(/\w+/)(\d+).*#', '$2', $url);
+ }
+
+ /**
+ * @param string $date
+ *
+ * @return \DateTimeImmutable|null
+ */
+ public static function parseForumDate(string $date): ?\DateTimeImmutable
+ {
+ if (!preg_match('/\d{4}/', $date)) {
+ $date .= ', '.date('Y');
+ }
+
+ return self::parseDate($date);
+ }
+
+ /**
+ * @param string $date
+ *
+ * @return \DateTimeImmutable|null
+ */
+ public static function parseDate(string $date): ?\DateTimeImmutable
+ {
+ if (preg_match('/^\d{4}$/', $date)) {
+ return \DateTimeImmutable::createFromFormat('Y-m-d', $date.'-01-01', new \DateTimeZone('UTC'));
+ }
+ try {
+ return new \DateTimeImmutable($date, new \DateTimeZone('UTC'));
+ } catch (\Exception $e) {
+ return null;
+ }
+ }
+
+ /**
+ * @param string $date
+ *
+ * @return \DateTimeImmutable|null
+ */
+ public static function parseDateMDY(string $date): ?\DateTimeImmutable
+ {
+ if ($date === '-') {
+ return null;
+ }
+
+ $dateArray = explode('-', $date);
+
+ if ($dateArray[0] === '??' && $dateArray[1] === '??' && $dateArray[2] === date('y')) {
+ return null;
+ }
+
+ $date = str_replace('??', '01', $date);
+
+ return \DateTimeImmutable::createFromFormat('!m-d-y', $date, new \DateTimeZone('UTC')) ?: null;
+ }
+
+ /**
+ * @param string $date
+ *
+ * @return \DateTimeImmutable|null
+ * @throws \Exception
+ */
+ public static function parseDateMDYReadable(string $date): ?\DateTimeImmutable
+ {
+ $date = str_replace(' ', ' ', $date);
+
+ if (preg_match('~[a-zA-z]+ \d+, \d{4}~', $date)) {
+ return new \DateTimeImmutable($date, new \DateTimeZone('UTC'));
+ }
+
+ return null;
+ }
+
+ /**
+ * @param Crawler $crawler
+ *
+ * @return null|string
+ * @throws \InvalidArgumentException
+ */
+ public static function textOrNull(Crawler $crawler): ?string
+ {
+ if (!$crawler->count()) {
+ return null;
+ }
+
+ return $crawler->text();
+ }
+}
diff --git a/src/Helper/SearchConfig.php b/src/Helper/SearchConfig.php
deleted file mode 100755
index 208bacf3..00000000
--- a/src/Helper/SearchConfig.php
+++ /dev/null
@@ -1,123 +0,0 @@
-type = $type;
-
- return $this;
- }
-
- public function build() {
- $query = "";
- // Type
- $query .= "type=".$this->subType;
- // Score
- $query .= "&score=".$this->score;
- // Status
- $query .= "&status=".$this->status;
- // Rated
- $query .= "&r=".$this->rated;
- // Start Date ISO8601
- $query .= "&sd=".$this->startDate[0];
- $query .= "&sm=".$this->startDate[1];
- $query .= "&sy=".$this->startDate[2];
- // End Date ISO8601
- $query .= "&ed=".$this->endDate[0];
- $query .= "&em=".$this->endDate[1];
- $query .= "&ey=".$this->endDate[2];
- // Genre Include
- $query .= "&gx=".($this->genreInclude ? "0" : "1");
- // Genre
- if (!empty($this->genre)) {
- foreach ($this->genre as $key => $genre) {
- $query .= "&genre[]=".$genre;
- }
- }
-
- return $query;
- }
-
- public function setType($subType) {
- $this->subType = in_array($subType, self::VALID_SUB_TYPES) ? $subType : 0;
-
- return $this;
- }
-
- public function setScore($score) {
- $this->score = $score;
-
- return $this;
- }
-
- public function setStatus($status) {
- $this->status = in_array($status, self::VALID_STATUS) ? $status : 0;
-
- return $this;
- }
-
- public function setRated($rated) {
- $this->rated = in_array($rated, self::VALID_RATING) ? $rated : 0;
-
- return $this;
- }
-
- public function setStartDate($day, $month, $year) {
- $this->startDate = [
- ltrim((string)$year, '0'),
- ltrim((string)$month, '0'),
- ltrim((string)$day, '0')
- ];
-
- return $this;
- }
-
- public function setEndDate($day, $month, $year) {
- $this->endDate = [
- ltrim((string)$year, '0'),
- ltrim((string)$month, '0'),
- ltrim((string)$day, '0')
- ];
-
- return $this;
- }
-
- public function setGenreInclude(Bool $bool) {
- $this->genreInclude = $bool;
-
- return $this;
- }
-
- public function setGenre(...$genre) {
- if (is_array($genre)) {
- $this->genre = !empty($genre) ? array_unique(array_merge($this->genre, $genre)) : [];
- } else {
- $this->genre[] = $genre;
- $this->genre = array_unique($this->genre);
- }
-
- return $this;
- }
-
-}
\ No newline at end of file
diff --git a/src/Helper/Utils.php b/src/Helper/Utils.php
deleted file mode 100755
index 491d52ab..00000000
--- a/src/Helper/Utils.php
+++ /dev/null
@@ -1,24 +0,0 @@
-filePath, FILTER_VALIDATE_URL) ? true : false);
- return preg_match('`^http(s)?://`', $url) ? true : false;
- }
-
- static public function existsURL($status) {
- return ($status == 200 || $status == 303) ? true : false;
- }
-
- static public function getStatus($url) {
- return substr(get_headers($url)[0], 9, 3);
- }
-
- static public function trim(&$item, $key) { $item = trim($item); }
-
-}
diff --git a/src/Jikan.php b/src/Jikan.php
index a76296fc..d2051c6a 100755
--- a/src/Jikan.php
+++ b/src/Jikan.php
@@ -1,128 +1,581 @@
myanimelist = new MalClient($guzzle);
+ }
+
+ /**
+ * @param int $id
+ *
+ * @return \Jikan\Model\Anime\Anime
+ * @throws ParserException
+ */
+ public function Anime(int $id): Model\Anime\Anime
+ {
+ return $this->myanimelist->getAnime(
+ new Request\Anime\AnimeRequest($id)
+ );
+ }
+
+ /**
+ * @param int $id
+ *
+ * @return \Jikan\Model\Anime\AnimeCharactersAndStaff
+ * @throws ParserException
+ */
+ public function AnimeCharactersAndStaff(int $id): Model\Anime\AnimeCharactersAndStaff
+ {
+ return $this->myanimelist->getAnimeCharactersAndStaff(
+ new Request\Anime\AnimeCharactersAndStaffRequest($id)
+ );
+ }
+
+ /**
+ * @param int $id
+ * @param int $page
+ *
+ * @return \Jikan\Model\Anime\Episodes
+ * @throws ParserException
+ */
+ public function AnimeEpisodes(int $id, int $page = 1): Model\Anime\Episodes
+ {
+ return $this->myanimelist->getAnimeEpisodes(
+ new Request\Anime\AnimeEpisodesRequest($id, $page)
+ );
+ }
+
+ /**
+ * @param int $id
+ *
+ * @return \Jikan\Model\Anime\AnimeVideos
+ * @throws ParserException
+ */
+ public function AnimeVideos(int $id): Model\Anime\AnimeVideos
+ {
+ return $this->myanimelist->getAnimeVideos(
+ new Request\Anime\AnimeVideosRequest($id)
+ );
+ }
+
+ /**
+ * @param int $id
+ *
+ * @return \Jikan\Model\Common\Picture[]
+ * @throws ParserException
+ */
+ public function AnimePictures(int $id): array
+ {
+ return $this->myanimelist->getAnimePictures(
+ new Request\Anime\AnimePicturesRequest($id)
+ );
+ }
- public function __construct() {
- return $this;
- }
- private function setStatus() {
- $this->status = $this->response['code'];
- unset($this->response['code']);
+ /**
+ * @param int $id
+ *
+ * @return Model\News\NewsListItem[]
+ * @throws ParserException
+ */
+ public function AnimeNews(int $id): array
+ {
+ return $this->myanimelist->getNewsList(
+ new Request\Anime\AnimeNewsRequest($id)
+ );
}
- /*
- * Anime
- */
- public function Anime($id = null, Array $extend = []) {
- $this->response = (array) (new Get\Anime($id, $extend))->response;
- $this->setStatus();
+ /**
+ * @param int $id
+ *
+ * @return Model\Forum\ForumTopic[]
+ * @throws ParserException
+ */
+ public function AnimeForum(int $id): array
+ {
+ return $this->myanimelist->getAnimeForum(
+ new Request\Anime\AnimeForumRequest($id)
+ );
+ }
- return $this;
+ /**
+ * @param int $id
+ *
+ * @return Model\Anime\AnimeStats
+ * @throws ParserException
+ */
+ public function AnimeStats(int $id): Model\Anime\AnimeStats
+ {
+ return $this->myanimelist->getAnimeStats(
+ new Request\Anime\AnimeStatsRequest($id)
+ );
}
- /*
- * Manga
+ /**
+ * @param int $id
+ *
+ * @return string|null
+ * @throws ParserException
*/
- public function Manga($id = null, Array $extend = []) {
- $this->response = (array) (new Get\Manga($id, $extend))->response;
- $this->setStatus();
+ public function AnimeMoreInfo(int $id): ?string
+ {
+ return $this->myanimelist->getAnimeMoreInfo(
+ new Request\Anime\AnimeMoreInfoRequest($id)
+ );
+ }
- return $this;
+ /**
+ * @param int $id
+ *
+ * @return \Jikan\Model\Manga\Manga
+ * @throws ParserException
+ */
+ public function Manga(int $id): Model\Manga\Manga
+ {
+ return $this->myanimelist->getManga(
+ new Request\Manga\MangaRequest($id)
+ );
}
- /*
- * Character
+ /**
+ * @param int $id
+ *
+ * @return Model\Manga\CharacterListItem[]
+ * @throws ParserException
*/
- public function Character($id = null, Array $extend = []) {
- $this->response = (array) (new Get\Character($id, $extend))->response;
- $this->setStatus();
+ public function MangaCharacters(int $id): array
+ {
+ return $this->myanimelist->getMangaCharacters(
+ new Request\Manga\MangaCharactersRequest($id)
+ );
+ }
- return $this;
+ /**
+ * @param int $id
+ *
+ * @return \Jikan\Model\Common\Picture[]
+ * @throws ParserException
+ */
+ public function MangaPictures(int $id): array
+ {
+ return $this->myanimelist->getMangaPictures(
+ new Request\Manga\MangaPicturesRequest($id)
+ );
}
- /*
- * Person
+ /**
+ * @param int $id
+ *
+ * @return Model\News\NewsListItem[]
+ * @throws ParserException
*/
- public function Person($id = null, Array $extend = []) {
- $this->response = (array) (new Get\Person($id, $extend))->response;
- $this->setStatus();
+ public function MangaNews(int $id): array
+ {
+ return $this->myanimelist->getNewsList(
+ new Request\Manga\MangaNewsRequest($id)
+ );
+ }
- return $this;
+ /**
+ * @param int $id
+ *
+ * @return Model\Forum\ForumTopic[]
+ * @throws ParserException
+ */
+ public function MangaForum(int $id): array
+ {
+ return $this->myanimelist->getMangaForum(
+ new Request\Manga\MangaForumRequest($id)
+ );
}
- /*
- * Search
+ /**
+ * @param int $id
+ *
+ * @return Model\Manga\MangaStats
+ * @throws ParserException
*/
- public function Search(string $query = null, string $type = ANIME, int $page = 1, SearchConfig $config = null) {
- $this->response = (array) (new Get\Search($query, $type, $page, $config))->response;
- $this->setStatus();
+ public function MangaStats(int $id): Model\Manga\MangaStats
+ {
+ return $this->myanimelist->getMangaStats(
+ new Request\Manga\MangaStatsRequest($id)
+ );
+ }
- return $this;
+ /**
+ * @param int $id
+ *
+ * @return string|null
+ * @throws ParserException
+ */
+ public function MangaMoreInfo(int $id): ?string
+ {
+ return $this->myanimelist->getMangaMoreInfo(
+ new Request\Manga\MangaMoreInfoRequest($id)
+ );
}
- /*
- * Seasonal Anime
+ /**
+ * @param int $id
+ *
+ * @return \Jikan\Model\Character\Character
+ * @throws ParserException
*/
- public function Seasonal(string $season = null, int $year = null) {
- $this->response = (array) (new Get\Seasonal($season, $year))->response;
- $this->setStatus();
+ public function Character(int $id): Model\Character\Character
+ {
+ return $this->myanimelist->getCharacter(
+ new Request\Character\CharacterRequest($id)
+ );
+ }
- return $this;
+ /**
+ * @param int $id
+ *
+ * @return \Jikan\Model\Common\Picture[]
+ * @throws ParserException
+ */
+ public function CharacterPictures(int $id): array
+ {
+ return $this->myanimelist->getCharacterPictures(
+ new Request\Character\CharacterPicturesRequest($id)
+ );
}
- /*
- * Anime Schedule For Current Season
+ /**
+ * @param int $id
+ *
+ * @return \Jikan\Model\Person\Person
+ * @throws ParserException
*/
- public function Schedule() {
- $this->response = (array) (new Get\Schedule())->response;
- $this->setStatus();
+ public function Person(int $id): Model\Person\Person
+ {
+ return $this->myanimelist->getPerson(
+ new Request\Person\PersonRequest($id)
+ );
+ }
- return $this;
+ /**
+ * @param int $id
+ *
+ * @return \Jikan\Model\Common\Picture[]
+ * @throws ParserException
+ */
+ public function PersonPictures(int $id): array
+ {
+ return $this->myanimelist->getPersonPictures(
+ new Request\Person\PersonPicturesRequest($id)
+ );
}
- /*
- * Top Anime/Manga
+ /**
+ * @param int $year
+ * @param string $season
+ *
+ * @return \Jikan\Model\Seasonal\Seasonal
+ * @throws ParserException
*/
- public function Top(string $type, int $page, string $subtype = null) {
- $this->response = (array) (new Get\Top($type, $page, $subtype))->response;
- $this->setStatus();
+ public function Seasonal(int $year, string $season): Model\Seasonal\Seasonal
+ {
+ return $this->myanimelist->getSeasonal(
+ new Request\Seasonal\SeasonalRequest($year, $season)
+ );
+ }
- return $this;
+ /**
+ *
+ * @return array
+ * @throws ParserException
+ */
+ public function SeasonList(): array
+ {
+ return $this->myanimelist->getSeasonList(
+ new Request\SeasonList\SeasonListRequest()
+ );
}
- /*
- * User List
- *
+ /**
+ *
+ * @return \Jikan\Model\Shedule\Schedule
+ * @throws ParserException
*/
-/* public function UserList(string $username, string $type, int $status = null) {
- $this->response = (array) (new Get\User($username, $type, $status))->response;
- $this->setStatus();
+ public function Schedule(): Model\Shedule\Schedule
+ {
+ return $this->myanimelist->getSchedule(
+ new Request\Schedule\ScheduleRequest()
+ );
+ }
- return $this;
- }*/
+ /**
+ * @param int $id
+ * @param int $page
+ *
+ * @return \Jikan\Model\Producer\Producer
+ * @throws ParserException
+ */
+ public function Producer(int $id, int $page): Model\Producer\Producer
+ {
+ return $this->myanimelist->getProducer(
+ new Request\Producer\ProducerRequest($id, $page)
+ );
+ }
-}
\ No newline at end of file
+ /**
+ * @param int $id
+ * @param int $page
+ *
+ * @return \Jikan\Model\Magazine\Magazine
+ * @throws ParserException
+ */
+ public function Magazine(int $id, int $page): Model\Magazine\Magazine
+ {
+ return $this->myanimelist->getMagazine(
+ new Request\Magazine\MagazineRequest($id, $page)
+ );
+ }
+
+ /**
+ * @param int $id
+ * @param int $page
+ *
+ * @return \Jikan\Model\Genre\AnimeGenre
+ * @throws ParserException
+ */
+ public function AnimeGenre(int $id, int $page): Model\Genre\AnimeGenre
+ {
+ return $this->myanimelist->getAnimeGenre(
+ new Request\Genre\AnimeGenreRequest($id, $page)
+ );
+ }
+
+ /**
+ * @param int $id
+ * @param int $page
+ *
+ * @return \Jikan\Model\Genre\MangaGenre
+ * @throws ParserException
+ */
+ public function MangaGenre(int $id, int $page): Model\Genre\MangaGenre
+ {
+ return $this->myanimelist->getMangaGenre(
+ new Request\Genre\MangaGenreRequest($id, $page)
+ );
+ }
+
+ /**
+ * @param int $page
+ * @param string|null $type
+ *
+ * @return Model\Top\TopAnime[]
+ * @throws ParserException
+ */
+ public function TopAnime(int $page, ?string $type = null): array
+ {
+ return $this->myanimelist->getTopAnime(
+ new Request\Top\TopAnimeRequest($page, $type)
+ );
+ }
+
+ /**
+ * @param int $page
+ * @param string|null $type
+ *
+ * @return Model\Top\TopManga[]
+ * @throws ParserException
+ */
+ public function TopManga(int $page, ?string $type = null): array
+ {
+ return $this->myanimelist->getTopManga(
+ new Request\Top\TopMangaRequest($page, $type)
+ );
+ }
+
+ /**
+ * @param int $page
+ *
+ * @return Model\Top\TopCharacter[]
+ * @throws ParserException
+ */
+ public function TopCharacters(int $page = 1): array
+ {
+ return $this->myanimelist->getTopCharacters(
+ new Request\Top\TopCharactersRequest($page)
+ );
+ }
+
+ /**
+ * @param int $page
+ *
+ * @return Model\Top\TopPerson[]
+ * @throws ParserException
+ */
+ public function TopPeople(int $page = 1): array
+ {
+ return $this->myanimelist->getTopPeople(
+ new Request\Top\TopPeopleRequest($page)
+ );
+ }
+
+ /**
+ * @param string|null $query
+ * @param int $page
+ * @param null|Request\Search\AnimeSearchRequest $request
+ *
+ * @return Model\Search\AnimeSearch
+ * @throws ParserException
+ */
+ public function AnimeSearch(
+ ?string $query,
+ int $page = 1,
+ ?Request\Search\AnimeSearchRequest $request = null
+ ): Model\Search\AnimeSearch {
+ return $this->myanimelist->getAnimeSearch(
+ null !== $request
+ ? $request
+ ->setQuery($query)
+ ->setPage($page)
+ : new Request\Search\AnimeSearchRequest($query, $page)
+ );
+ }
+
+ /**
+ * @param string|null $query
+ * @param int $page
+ * @param null|Request\Search\MangaSearchRequest $request
+ *
+ * @return Model\Search\MangaSearch
+ * @throws ParserException
+ */
+ public function MangaSearch(
+ ?string $query,
+ int $page = 1,
+ ?Request\Search\MangaSearchRequest $request = null
+ ): Model\Search\MangaSearch {
+ return $this->myanimelist->getMangaSearch(
+ null !== $request
+ ? $request
+ ->setQuery($query)
+ ->setPage($page)
+ : new Request\Search\MangaSearchRequest($query, $page)
+ );
+ }
+
+ /**
+ * @param string|null $query
+ * @param int $page
+ * @param null|Request\Search\CharacterSearchRequest $request
+ *
+ * @return Model\Search\CharacterSearch
+ * @throws ParserException
+ */
+ public function CharacterSearch(
+ ?string $query,
+ int $page = 1,
+ ?Request\Search\CharacterSearchRequest $request = null
+ ): Model\Search\CharacterSearch {
+ return $this->myanimelist->getCharacterSearch(
+ null !== $request
+ ? $request
+ ->setQuery($query)
+ ->setPage($page)
+ : new Request\Search\CharacterSearchRequest($query, $page)
+ );
+ }
+
+ /**
+ * @param string|null $query
+ * @param int $page
+ * @param Request\Search\CharacterSearchRequest|Request\Search\PersonSearchRequest|null $request
+ *
+ * @return Model\Search\PersonSearch
+ */
+ public function PersonSearch(
+ ?string $query,
+ int $page = 1,
+ ?Request\Search\CharacterSearchRequest $request = null
+ ): Model\Search\PersonSearch {
+ return $this->myanimelist->getPersonSearch(
+ null !== $request
+ ? $request
+ ->setQuery($query)
+ ->setPage($page)
+ : new Request\Search\PersonSearchRequest($query, $page)
+ );
+ }
+
+ /**
+ * @param string $username
+ *
+ * @return \Jikan\Model\User\Profile
+ * @throws ParserException
+ */
+ public function UserProfile(string $username): Model\User\Profile
+ {
+ return $this->myanimelist->getUserProfile(
+ new Request\User\UserProfileRequest($username)
+ );
+ }
+
+ /**
+ * @param string $username
+ * @param int $page
+ *
+ * @return Model\User\Friend[]
+ * @throws ParserException
+ */
+ public function UserFriends(string $username, int $page = 1): array
+ {
+ return $this->myanimelist->getUserFriends(
+ new Request\User\UserFriendsRequest($username, $page)
+ );
+ }
+
+ /**
+ * @param string $username
+ * @param null|string $type
+ *
+ * @return array
+ * @throws ParserException
+ */
+ public function UserHistory(string $username, ?string $type = null): array
+ {
+ return $this->myanimelist->getUserHistory(
+ new Request\User\UserHistoryRequest($username, $type)
+ );
+ }
+}
diff --git a/src/Lib/Parser/AnimeCharacterStaffParse.php b/src/Lib/Parser/AnimeCharacterStaffParse.php
deleted file mode 100755
index 266a4a86..00000000
--- a/src/Lib/Parser/AnimeCharacterStaffParse.php
+++ /dev/null
@@ -1,147 +0,0 @@
-match as TemplateParse provides that option now
-
-namespace Jikan\Lib\Parser;
-
-use Jikan\Model\AnimeCharacterStaff as AnimeCharacterStaffModel;
-
-class AnimeCharacterStaffParse extends TemplateParse
-{
-
- private $return = [];
-
- public function parse() : Array
- {
-
-
-
- $this->model = new AnimeCharacterStaffModel();
-
- /*
- * Rules
- */
-
- $this->addRule('character', '~Characters & Voice Actors~', function() {
- $running = true;
- $i = 0;
- $characters = [];
- while ($running) {
- if (preg_match('~~', $this->file[$this->lineNo + $i])) {
- $running = false;
- }
-
- $character = [];
-
- if (preg_match('~~', $this->file[$this->lineNo + $i])) {
- $i += 3;
- $image = array();
- preg_match('~![(.*)]() ~', $this->file[$this->lineNo + $i], $image);
- $character['image_url'] = trim(substr(explode(",", $image[3])[1], 0, -3));
-
- $i += 5;
- $name = array();
- preg_match('~(.*)~', $this->file[$this->lineNo + $i], $name);
- preg_match('~myanimelist.net/(.+)/(.*)/~', $name[1], $this->matches);
- $character['mal_id'] = (int) $this->matches[2];
- $character['url'] = $name[1];
- $character['name'] = $name[2];
-
- $i += 2;
- $role = array();
- preg_match('~(.*)~', $this->file[$this->lineNo + $i], $role);
- $character['role'] = $role[1];
-
-
-
- $running2 = true;
- $character['voice_actor'] = array();
- while ($running2) {
- if (preg_match('~~', $this->file[$this->lineNo + $i])) {
- $running2 = false;
- }
-
- if (preg_match('~ | ~', $this->file[$this->lineNo + $i])) {
- $i++;
- $name = array();
- preg_match('~(.*)~', $this->file[$this->lineNo + $i], $name);
- $i++;
- $role = array();
- preg_match('~(.*)~', $this->file[$this->lineNo + $i], $role);
- $i += 5;
- $image = array();
- preg_match('~![(.*)]() ~', $this->file[$this->lineNo + $i], $image);
-
- preg_match('~myanimelist.net/(.+)/(.*)/~', $name[1], $this->matches);
-
- $character['voice_actor'][] = array(
- 'mal_id' => (int) $this->matches[2],
- 'name' => $name[2],
- 'url' => $name[1],
- 'language' => $role[1],
- 'image_url' => trim(substr(explode(",", $image[3])[1], 0, -3))
- );
- }
-
- $i++;
- }
- $characters[] = $character;
- }
-
- $i++;
- }
-
- $this->model->set('AnimeCharacterStaff', 'character', $characters);
- });
-
-
- $this->addRule('staff', '~~', function() {
- $running = true;
- $i = 0;
- $staff = array();
- while ($running) {
- $person = array();
- if (preg_match('~~', $this->file[$this->lineNo + $i])) {
- $running = false;
- }
-
- if (preg_match('~~', $this->file[$this->lineNo + $i])) {
- $i += 5;
- $match = array();
- preg_match('~![(.*)]() ~', $this->file[$this->lineNo + $i], $match);
- $person['image_url'] = trim(substr(explode(",", $match[3])[1], 0, -3));
- $i += 5;
- $match = array();
- preg_match('~(.*)~', $this->file[$this->lineNo + $i], $match);
- preg_match('~myanimelist.net/(.+)/(.*)/~', $match[1], $this->matches);
- $person['mal_id'] = (int) $this->matches[2];
- $person['url'] = $match[1];
- $person['name'] = $match[2];
- $i += 2;
- $match = array();
- preg_match('~(.*)~', $this->file[$this->lineNo + $i], $match);
- $person['role'] = $match[1];
-
- $staff[] = $person;
- }
-
- $i++;
- }
-
- $this->model->set('AnimeCharacterStaff', 'staff', $staff);
- });
-
- /*
- * Parsing
- */
-
- foreach ($this->file as $lineNo => $line) {
- $this->line = $line;
- $this->lineNo = $lineNo;
-
- $this->find();
- }
-
- return (array) $this->model;
- }
-}
diff --git a/src/Lib/Parser/AnimeEpisodeParse.php b/src/Lib/Parser/AnimeEpisodeParse.php
deleted file mode 100755
index 7cf61179..00000000
--- a/src/Lib/Parser/AnimeEpisodeParse.php
+++ /dev/null
@@ -1,103 +0,0 @@
-model = new AnimeEpisodeModel;
-
- /*
- * Rules
- */
-
-
- $this->addRule('last_page', '~~', function() {
- preg_match_all('~(.*?)~', $this->line, $this->matches);
-
- $this->model->set('AnimeEpisode', 'episode_last_page', ((int)substr(end($this->matches[2]), -3))/100);
- });
-
-
- $this->addRule('episode', '~~', function() {
- $running = true;
- $i = 1;
-
- while ($running) {
- $line = $this->file[$this->lineNo + $i];
- if (preg_match('~ ~', $line)) {
- $running = false;
- }
-
- if (preg_match('~~', $line)) {
- $i++;
- $epMeta = [];
-
- preg_match('~| (.*) | ~', $this->file[$this->lineNo + $i], $this->matches);
- $epMeta['id'] = (int) $this->matches[1];
- $i++;
-
- preg_match('~) | ~', $this->file[$this->lineNo + $i], $this->matches);
- $epMeta['video_url'] = (!empty($this->matches)) ? $this->matches[1] : null;
- $i++;
-
- preg_match('~(Filler|Recap|)(.*)~', $this->file[$this->lineNo + $i], $this->matches);
- $epMeta['title'] = $this->matches[3];
-
- $epMeta['filler'] = preg_match('~Filler~', $this->file[$this->lineNo + $i]) ? true : false;
- $epMeta['recap'] = preg_match('~Recap~', $this->file[$this->lineNo + $i]) ? true : false;
- $i++;
-
- preg_match('~
(.*) (.*)~', $this->file[$this->lineNo + $i], $this->matches);
- $epMeta['title_japanese'] = !empty($this->matches) ? $this->matches[2] : null;
- $epMeta['title_romanji'] = !empty($this->matches) ? $this->matches[1] : null;
- $i += 2;
-
- preg_match('~ | (.*) | ~', $this->file[$this->lineNo + $i], $this->matches);
- $epMeta['aired'] = $this->matches[1] != 'N/A' ? $this->matches[1] : false;
- $i += 2;
-
- preg_match('~Forum~', $this->file[$this->lineNo + $i], $this->matches);
- $epMeta['forum_url'] = !empty($this->matches) ? $this->matches[1] : null;
-
- $this->return[] = [
- 'id' => (int) $epMeta['id'],
- 'title' => htmlspecialchars_decode($epMeta['title']),
- 'title_japanese' => $epMeta['title_japanese'],
- 'title_romanji' => $epMeta['title_romanji'],
- 'aired' => $epMeta['aired'],
- 'filler' => (bool) $epMeta['filler'],
- 'recap' => (bool) $epMeta['recap'],
- 'video_url' => $epMeta['video_url'],
- 'forum_url' => $epMeta['forum_url']
- ];
- }
-
- $i++;
- }
-
- $this->model->set('AnimeEpisode','episode', $this->return);
-
- });
-
-
- /*
- * Parsing
- */
-
- foreach ($this->file as $lineNo => $line) {
- $this->line = $line;
- $this->lineNo = $lineNo;
-
- $this->find();
- }
-
- return (array) $this->model;
- }
-}
diff --git a/src/Lib/Parser/AnimeForumParse.php b/src/Lib/Parser/AnimeForumParse.php
deleted file mode 100755
index 863994ae..00000000
--- a/src/Lib/Parser/AnimeForumParse.php
+++ /dev/null
@@ -1,99 +0,0 @@
-model = new AnimeForumModel;
-
- /*
- * Rules
- */
-
- $this->addRule('topic', '~~', function() {
- $i = 0;
- $topics = [];
-
- while (true) {
- $line = $this->file[$this->lineNo + $i];
-
- if (preg_match('~~', $line)) {
- $i += 2;
-
- $topic = [
- 'topic_id' => null,
- 'url' => null,
- 'title' => null,
- 'date_posted' => null,
- 'author_name' => null,
- 'author_url' => null,
- 'replies' => 0,
- 'last_post' => [
- 'url' => null,
- 'author_name' => null,
- 'author_url' => null,
- 'date_relative' => null,
- ]
- ];
-
- preg_match('~(Poll: |) (.*) (.*?)
(.*) - (.*) | ~', $this->file[$this->lineNo + $i], $this->matches);
-
-
- $topic['url'] = BASE_URL . $this->matches[3];
- $topic['title'] = $this->matches[4];
- $topic['author_name'] = $this->matches[7];
- $topic['author_url'] = BASE_URL . $this->matches[6];
- $topic['date_posted'] = @date_format(date_create($this->matches[8]), 'o-m-d');
-
- preg_match('~forum/\?topicid=(.*)~', $this->matches[3], $this->matches);
- $topic['topic_id'] = (int) $this->matches[1];
-
- $i++;
- preg_match('~(.*) | ~', $this->file[$this->lineNo+$i], $this->matches);
- $topic['replies'] = (int) $this->matches[2];
-
- $i++;
- preg_match('~by (.*) »»
(.*) | ~', $this->file[$this->lineNo+$i], $this->matches);
- $topic['last_post']['author_url'] = BASE_URL . $this->matches[2];
- $topic['last_post']['author_name'] = BASE_URL . $this->matches[3];
- $topic['last_post']['url'] = BASE_URL . $this->matches[4];
- $topic['last_post']['date_relative'] = $this->matches[5];
-
- $topics[] = $topic;
- }
-
- $i++;
- }
-
-
- $this->model->set('AnimeForum', 'topic', $topics);
- });
-
- /*
- * Parsing
- */
-
- foreach ($this->file as $lineNo => $line) {
- $this->line = $line;
- $this->lineNo = $lineNo;
-
- $this->find();
- }
-
- return (array) $this->model;
- }
-}
diff --git a/src/Lib/Parser/AnimeMoreInfoParse.php b/src/Lib/Parser/AnimeMoreInfoParse.php
deleted file mode 100755
index edfb2aaa..00000000
--- a/src/Lib/Parser/AnimeMoreInfoParse.php
+++ /dev/null
@@ -1,58 +0,0 @@
-model = new AnimeMoreInfoModel;
-
- /*
- * Rules
- */
-
- $this->addRule('moreinfo', '~More Info~', function() {
- $i = 0;
- $capture = "";
-
- while(true) {
- if (preg_match('~file[$this->lineNo + $i])) {
- $capture .= $this->file[$this->lineNo + $i];
- break;
- }
-
- $capture .= $this->file[$this->lineNo + $i];
-
- $i++;
- }
-
-
- $capture = trim(str_replace([' More Info', ' '], '', $capture));
- $capture = strip_tags(str_replace(['
', '
', '
'], '\n', $capture));
-
- $this->model->set('AnimeMoreInfo', 'more_info', $capture);
-
- });
-
- /*
- * Parsing
- */
-
- foreach ($this->file as $lineNo => $line) {
- $this->line = $line;
- $this->lineNo = $lineNo;
-
- $this->find();
- }
-
- return (array) $this->model;
- }
-}
diff --git a/src/Lib/Parser/AnimeNewsParse.php b/src/Lib/Parser/AnimeNewsParse.php
deleted file mode 100755
index e01854f7..00000000
--- a/src/Lib/Parser/AnimeNewsParse.php
+++ /dev/null
@@ -1,78 +0,0 @@
-model = new AnimeNewsModel;
-
- /*
- * Rules
- */
-
-
- $this->addRule('news', '~ News~', function() {
- $running = true;
- $i = 0;
-
- $news = [];
- while ($running) {
- $line = $this->file[$this->lineNo + $i];
- if (preg_match('~ ~', $line)) {
- $running = false;
- }
-
- if (preg_match('~( |) (.*) ~', $line, $this->matches)) {
-
- $tmp = [
- 'url' => BASE_URL . $this->matches[6],
- 'image_url' => !empty($this->matches[5]) ? trim(substr(explode(",", $this->matches[5])[1], 0, -3)) : null,
- 'forum_url' => null,
- 'comments' => 0,
- 'title' => $this->matches[8],
- 'date' => null,
- 'author_url' => null,
- 'author' => null
- ];
- if (preg_match('~ (.*) by (.*) \| Discuss \((.*) comments\) (.*)~', function() {
- $this->model->set('Anime', 'title', htmlspecialchars_decode($this->matches[1]));
- });
-
- $this->addRule('title_english', '~English: (.*)~', function() {
- $this->model->set('Anime', 'title_english', htmlspecialchars_decode($this->matches[1]));
- });
-
- $this->addRule('title_synonyms', '~Synonyms: (.*)~', function() {
- $this->model->set('Anime', 'title_synonyms', htmlspecialchars_decode($this->matches[1]));
- });
-
- $this->addRule('title_japanese', '~Japanese: (.*)~', function() {
- $this->model->set('Anime', 'title_japanese', htmlspecialchars_decode($this->matches[1]));
- });
-
- $this->addRule('image_url', '~~', function() {
- $this->model->set('Anime', 'image_url', $this->matches[1]);
- });
-
- $this->addRule('type', '~Type:~', function() {
- preg_match('~((.*?)|(.*))~', $this->file[$this->lineNo + 1], $this->matches);
- $this->model->set('Anime', 'type', (empty($this->matches[3]) ? $this->matches[4] : $this->matches[3]));
- });
-
- $this->addRule('episodes', '~Episodes:~', function() {
- $this->model->set('Anime', 'episodes', (int) $this->file[$this->lineNo + 1]);
- });
-
- $this->addRule('status', '~Status:~', function() {
- $this->model->set('Anime', 'status', $this->file[$this->lineNo + 1]);
-
- if (strpos($this->model->get('Anime', 'status'), "Currently Airing") !== false)
- $this->model->set('Anime', 'airing', true);
- });
-
- $this->addRule('aired', '~Aired:~', function() {
- $this->model->set('Anime', 'aired_string', $this->file[$this->lineNo + 1]);
-
-
- if (!empty($this->model->get('Anime', 'aired_string')) && $this->model->get('Anime', 'aired_string') != 'Not available') {
- if (strpos($this->model->get('Anime', 'aired_string'), 'to')) {
- preg_match('~(.*) to (.*)~', $this->model->get('Anime', 'aired_string'), $this->matches);
- $this->model->set('Anime', 'aired', [
- 'from' => (strpos($this->matches[1], '?') !== false) ? null : @date_format(date_create($this->matches[1]), 'o-m-d'),
- 'to' => (strpos($this->matches[2], '?') !== false) ? null : @date_format(date_create($this->matches[2]), 'o-m-d')
- ]);
- } else {
-
- if (preg_match('~^[0-9]{4}$~', $this->model->get('Anime', 'aired_string')) ||
- preg_match('~^[A-Za-z]{1,}, [0-9]{4}$~', $this->model->get('Anime', 'aired_string'))) {
- $this->model->set('Anime', 'aired', [
- 'from' => null,
- 'to' => null
- ]);
- } else {
- $this->model->set('Anime', 'aired', [
- 'from' => (strpos($this->model->get('Anime', 'aired_string'), '?') !== false) ? null : @date_format(date_create($this->model->get('Anime', 'aired_string')), 'o-m-d'),
- 'to' => (strpos($this->model->get('Anime', 'aired_string'), '?') !== false) ? null : @date_format(date_create($this->model->get('Anime', 'aired_string')), 'o-m-d')
- ]);
- }
- }
- } else {
- $this->model->set('Anime', 'aired', [
- 'from' => null,
- 'to' => null
- ]);
- }
- });
-
- $this->addRule('premiered', '~Premiered:~', function() {
- if (preg_match('~(.*)~', $this->file[$this->lineNo + 1], $this->matches)) {
- $this->model->set('Anime', 'premiered', $this->matches[2]);
- }
- });
-
- $this->addRule('broadcast', '~Broadcast:~', function() {
- $this->model->set('Anime', 'broadcast', $this->file[$this->lineNo + 1]);
- });
-
- $this->addRule('producer', '~Producers:~', function() {
- $return = [];
- if (!preg_match('~None found~', $this->file[$this->lineNo + 1])) {
- $array = explode("", $this->file[$this->lineNo + 1]);
- // producers can contain commas, so we can't use that as delimiter. e.g; "Kanetsu Co., LTD." //anime/16067/anime/32951
-
- foreach ($array as $key => $value) {
- if (preg_match('~([\s\S]*)(|)~', $value)) {
- preg_match('~([\s\S]*)(|)~', $value, $this->matches);
- $return[] = [
- 'url' => BASE_URL . $this->matches[1],
- 'name' => strip_tags($this->matches[2])
- ];
- }
- }
- }
-
- $this->model->set('Anime', 'producer', $return);
- });
-
- $this->addRule('licensor', '~Licensors:~', function() {
- $return = [];
- if (!preg_match('~None found~', $this->file[$this->lineNo + 1])) {
- $array = explode("", $this->file[$this->lineNo + 1]);
- // licensors can contain commas, so we can't use that as delimiter. e.g; "NIS America, Inc." //anime/16067
-
- foreach ($array as $key => $value) {
- if (preg_match('~([\s\S]*)(|)~', $value)) {
- preg_match('~([\s\S]*)(|)~', $value, $this->matches);
- $return[] = [
- 'url' => BASE_URL . $this->matches[1],
- 'name' => strip_tags($this->matches[2])
- ];
- }
- }
- }
-
- $this->model->set('Anime', 'licensor', $return);
- });
-
- $this->addRule('studio', '~Studios:~', function() {
- $return = [];
- if (!preg_match('~None found~', $this->file[$this->lineNo + 1])) {
- $array = explode("", $this->file[$this->lineNo + 1]);
-
- foreach ($array as $key => $value) {
- preg_match('~([\s\S]*)(|)~', $value, $this->matches);
-
- if (!empty($this->matches)) {
- $return[] = [
- 'url' => BASE_URL . $this->matches[1],
- 'name' => strip_tags($this->matches[2])
- ];
- }
- }
- }
-
- $this->model->set('Anime', 'studio', $return);
- });
-
- $this->addRule('source', '~Source:~', function() {
- $this->model->set('Anime', 'source', $this->file[$this->lineNo + 1]);
- });
-
- $this->addRule('genre', '~Genres:~', function() {
- $return = [];
- if (!preg_match('~No genres have been added yet~', $this->file[$this->lineNo + 1])) {
- $array = explode(",", $this->file[$this->lineNo + 1]);
-
- foreach ($array as $key => $value) {
- preg_match('~([\s\S]*)(|)~', $value, $this->matches);
- $return[] = [
- 'url' => BASE_URL . $this->matches[1],
- 'name' => strip_tags($this->matches[2])
- ];
- }
- }
-
- $this->model->set('Anime', 'genre', $return);
- });
-
- $this->addRule('duration', '~Duration:~', function() {
- $this->model->set('Anime', 'duration', $this->file[$this->lineNo + 1]);
- });
-
- $this->addRule('rating', '~Rating:~', function() {
- $this->model->set('Anime', 'rating', htmlspecialchars_decode($this->file[$this->lineNo + 1]));
- });
-
- $this->addRule('score', '~Score:~', function(){
- preg_match('~(.*)1 \(scored by (.*) users\)~', $this->file[$this->lineNo + 1], $this->matches);
-
- $this->model->set('Anime', 'score', (float) $this->matches[2]);
- $this->model->set('Anime', 'scored_by', (int) str_replace(",", "", $this->matches[4]));
- });
-
- $this->addRule('rank', '~Ranked:~', function() {
- if (!preg_match('~N/A2~', $this->file[$this->lineNo + 1], $this->matches)) {
- preg_match('~#(.*)2~', $this->file[$this->lineNo + 1], $this->matches);
-
- $this->model->set('Anime', 'rank', (int) $this->matches[1]);
- }
- });
-
- $this->addRule('popularity', '~Popularity:~', function() {
- preg_match('~#(.*)~', $this->file[$this->lineNo + 1], $this->matches);
-
- $this->model->set('Anime', 'popularity', (int) $this->matches[1]);
- });
-
- $this->addRule('members', '~Members:~', function() {
- $this->model->set('Anime', 'members', (int) str_replace(",", "", $this->file[$this->lineNo + 1]));
- });
-
- $this->addRule('favorites', '~Favorites:~', function() {
- $this->model->set('Anime', 'favorites', (int) str_replace(",", "", $this->file[$this->lineNo + 1]));
- });
-
- $this->addRule('synopsis', '~~', function() {
- $this->model->set('Anime', 'synopsis', htmlspecialchars_decode($this->matches[1]));
- });
-
- $this->addRule('related', '~~', $line)) {
- $running = false;
- }
-
- if (preg_match('~(.*) (play|)~', $line, $this->matches)) {
-
- $promo[] = [
- 'video_url' => $this->matches[1],
- 'image_url' => $this->matches[3],
- 'title' => $this->matches[7]
- ];
-
- }
-
- $i++;
- }
-
- $this->model->set('AnimeVideos', 'promo', $promo);
- });
-
-
-
- /*
- * Parsing
- */
-
- foreach ($this->file as $lineNo => $line) {
- $this->line = $line;
- $this->lineNo = $lineNo;
-
- $this->find();
- }
-
- return (array) $this->model;
- }
-}
diff --git a/src/Lib/Parser/CharacterParse.php b/src/Lib/Parser/CharacterParse.php
deleted file mode 100755
index b6ced45d..00000000
--- a/src/Lib/Parser/CharacterParse.php
+++ /dev/null
@@ -1,202 +0,0 @@
-model = new CharacterModel;
-
- /*
- * Rules
- */
-
- $this->addRule('link_canonical', '~ ~', function() {
- $this->model->set('Character', 'link_canonical', $this->matches[1]);
-
- preg_match('~myanimelist.net/(.+)/(.*)/~', $this->model->get('Character', 'link_canonical'), $this->matches);
- $this->model->set('Character', 'mal_id', (int) $this->matches[2]);
- });
-
- $this->addRule('name', '~~', function() {
-
- $this->model->set('Character', 'name', trim($this->matches[1]));
- if (!empty($this->matches[2])) {
- $this->model->set('Character', 'name_kanji', $this->matches[3]);
- }
- });
-
- $this->addRule('nicknames', '~ ~', $line)) {
- $running = false;
- }
-
- if (preg_match('~ | ~', $line)) {
- $i++;
- $this->matches = [];
- preg_match('~ | ~', $this->file[$this->lineNo + $i], $animeMeta);
- $i++;
- $animeName = [];
- preg_match('~(.*)~', $this->file[$this->lineNo + $i], $animeName);
- $i++;
- preg_match('~(.*)~', $this->file[$this->lineNo + $i], $this->matches);
-
- $animeography[] = [
- 'mal_id' => (int) $animeName[4],
- 'name' => $animeName[6],
- 'url' => $animeMeta[1],
- 'image_url' => $animeMeta[2],
- 'role' => $this->matches[1]
- ];
- }
- $i++;
- }
-
- $this->model->set('Character', 'animeography', $animeography);
- });
-
- $this->addRule('mangaography', '~~', function() {
- $running = true;
- $i = 1;
- $mangaography = [];
- while ($running) {
- $line = $this->file[$this->lineNo + $i];
- if (preg_match('~~', $line)) {
- $running = false;
- }
-
- if (preg_match('~ |
~', $line)) {
- $i++;
- $mangaMeta = array();
- preg_match('~ | ~', $this->file[$this->lineNo + $i], $mangaMeta);
- $i++;
- $mangaName = array();
- preg_match('~(.*)~', $this->file[$this->lineNo + $i], $mangaName);
- $i++;
- preg_match('~(.*)~', $this->file[$this->lineNo + $i], $this->matches);
-
- $mangaography[] = [
- 'mal_id' => (int) $mangaName[4],
- 'name' => $mangaName[6],
- 'url' => $mangaMeta[1],
- 'image_url' => $mangaMeta[2],
- 'role' => $this->matches[1]
- ];
- }
- $i++;
- }
-
- $this->model->set('Character', 'mangaography', $mangaography);
- });
-
- $this->addRule('voice_actors', '~~', function() {
- $running = true;
- $i = 1;
- $voiceActors = [];
- while ($running) {
- $line = $this->file[$this->lineNo + $i]; // bugs
- if (
- preg_match('~ |