starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add exceptions handling, fix incorrect library usage

Browse Source
This commit is contained in:
DariusIII
2017-04-11 11:45:48 +02:00
parent e9023b62dc
commit 0cd02e4d08
4 changed files with 102 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changelog
+2
View File
@@ -1,3 +1,5 @@
2017-04-11 DariusIII
* Chg: Add exceptions handling, fix incorrect library usage
2017-04-10 DariusIII
* Chg: Update Tv, TVDB classes for new TVDB v2 library
* Chg: Update fxp-assest-plugin, guzzlehttp, remove moinax/tvdb add adrenth/thetvdb2 for thetvdb api v2 support
misc/testing/Tests/test_tvdb_API.php
+25 -5
View File
@@ -3,6 +3,10 @@
require_once dirname(__DIR__, 3) . DIRECTORY_SEPARATOR . 'bootstrap.php';
use nntmux\processing\tv\TVDB;
use Adrenth\Thetvdb\Exception\InvalidArgumentException;
use Adrenth\Thetvdb\Exception\InvalidJsonInResponseException;
use Adrenth\Thetvdb\Exception\RequestFailedException;
use Adrenth\Thetvdb\Exception\UnauthorizedException;
$c = new nntmux\ColorCLI();
$tvdb = new TVDB();
@@ -26,14 +30,30 @@ if (isset($argv[1]) && !empty($argv[1]) && isset($argv[2]) && is_numeric($argv[2
if ($season > 0 && $episode > 0 && $day === '') {
$episodeObj = $tvdb->client->series()->getEpisodesWithQuery($serie[0]->getid(), ['airedSeason' => $season, 'airedepisodeNumber' => $episode]);
try {
$episodeObj = $tvdb->client->series()->getEpisodesWithQuery($serie[0]->getid(), ['airedSeason' => $season, 'airedEpisode' => $episode]);
} catch (InvalidArgumentException $error) {
echo 'Invalid argument(s) used' . PHP_EOL;
return false;
} catch (InvalidJsonInResponseException $error) {
if (strpos($error->getMessage(), 'Could not decode JSON data') === 0 || strpos($error->getMessage(), 'Incorrect data structure') === 0) {
return false;
}
} catch (RequestFailedException $error) {
return false;
} catch (UnauthorizedException $error) {
if (strpos($error->getMessage(), 'Unauthorized') === 0) {
return false;
}
}
if ($episodeObj) {
print_r($episodeObj);
}
} else if ($season === 0 && $episode === 0) {
$episodeObj = $tvdb->client->series()->getEpisodes($serie[0]->getid());
if (is_array($episodeObj['episodes'])) {
foreach ($episodeObj['episodes'] AS $ep) {
if (is_object($episodeObj)) {
foreach ($episodeObj->getData() AS $ep) {
print_r($ep);
}
}
@@ -51,7 +71,7 @@ if (isset($argv[1]) && !empty($argv[1]) && isset($argv[2]) && is_numeric($argv[2
}
} else {
exit($c->error("Invalid arguments. This script requires a text string (show name) followed by a season and episode number." . PHP_EOL .
"You can also optionally supply 'YYYY' 'MM' 'DD' arguments instead of season/episode for an airdate lookup.")
exit($c->error('Invalid arguments. This script requires a text string (show name) followed by a season and episode number.' . PHP_EOL .
'You can also optionally supply "YYYY" "MM" "DD" arguments instead of season/episode for an airdate lookup.')
);
}
nntmux/processing/tv/TV.php
+1 -1
View File
@@ -782,7 +782,7 @@ abstract class TV extends Videos
$required = ['id', 'seriesName', 'overview', 'firstAired'];
break;
case 'tvdbE':
$required = ['episodeName', 'airedSeason', 'airedEpisodeNumber', 'firstAired', 'overview'];
$required = ['episodeName', 'airedSeason', 'airedEpisode', 'firstAired', 'overview'];
break;
case 'tvmazeS':
$required = ['id', 'name', 'summary', 'premiered', 'country'];
nntmux/processing/tv/TVDB.php
+74 -21
View File
@@ -3,6 +3,9 @@ namespace nntmux\processing\tv;
use Adrenth\Thetvdb\Client;
use Adrenth\Thetvdb\Exception\CouldNotLoginException;
use Adrenth\Thetvdb\Exception\InvalidArgumentException;
use Adrenth\Thetvdb\Exception\InvalidJsonInResponseException;
use Adrenth\Thetvdb\Exception\RequestFailedException;
use Adrenth\Thetvdb\Exception\UnauthorizedException;
use nntmux\ColorCLI;
use nntmux\ReleaseImage;
@@ -55,6 +58,7 @@ class TVDB extends TV
$this->client = new Client();
$this->client->setLanguage('en');
$this->posterUrl = self::TVDB_URL . DS . 'graphical/%s-g.jpg';
$this->fanartUrl = self::TVDB_URL . DS . '_cache/fanart/original/%s-3.jpg';
$this->local = false;
// Check if we can get the time for API status
@@ -248,16 +252,36 @@ class TVDB extends TV
$highestMatch = 0;
try {
$response = $this->client->search()->seriesByName($cleanName);
} catch (\Exception $error) {
echo $error->getMessage();
} catch (InvalidArgumentException $error) {
return false;
} catch (InvalidJsonInResponseException $error) {
if (strpos($error->getMessage(), 'Could not decode JSON data') === 0 || strpos($error->getMessage(), 'Incorrect data structure') === 0) {
return false;
}
} catch (RequestFailedException $error) {
return false;
} catch (UnauthorizedException $error) {
if (strpos($error->getMessage(), 'Unauthorized') === 0) {
return false;
}
}
if ($response === false && $country !== '') {
try {
$response = $this->client->search()->seriesByName(rtrim(str_replace($country, '', $cleanName)));
} catch (\Exception $error) {
echo $error->getMessage();
} catch (InvalidArgumentException $error) {
return false;
} catch (InvalidJsonInResponseException $error) {
if (strpos($error->getMessage(), 'Could not decode JSON data') === 0 || strpos($error->getMessage(), 'Incorrect data structure') === 0) {
return false;
}
} catch (RequestFailedException $error) {
return false;
} catch (UnauthorizedException $error) {
if (strpos($error->getMessage(), 'Unauthorized') === 0) {
return false;
}
}
}
@@ -273,7 +297,7 @@ class TVDB extends TV
}
// Check each show title for similarity and then find the highest similar value
$matchPercent = $this->checkMatch(strtolower($show->name), strtolower($cleanName), self::MATCH_PROBABILITY);
$matchPercent = $this->checkMatch(strtolower($show->getSeriesName()), strtolower($cleanName), self::MATCH_PROBABILITY);
// If new match has a higher percentage, set as new matched title
if ($matchPercent > $highestMatch) {
@@ -293,7 +317,7 @@ class TVDB extends TV
}
}
}
if (isset($highest)) {
if (!empty($highest)) {
$return = $this->formatShowInfo($highest);
}
}
@@ -345,32 +369,62 @@ class TVDB extends TV
if ($airdate !== '') {
try {
$response = $this->client->series()->getEpisodesWithQuery($tvdbid, ['lastAired' => $airdate]);
} catch (\Exception $error) {
echo $error->getMessage();
$response = $this->client->series()->getEpisodesWithQuery($tvdbid, ['firstAired' => $airdate]);
} catch (InvalidArgumentException $error) {
return false;
} catch (InvalidJsonInResponseException $error) {
if (strpos($error->getMessage(), 'Could not decode JSON data') === 0 || strpos($error->getMessage(), 'Incorrect data structure') === 0) {
return false;
}
} catch (RequestFailedException $error) {
return false;
} catch (UnauthorizedException $error) {
if (strpos($error->getMessage(), 'Unauthorized') === 0) {
return false;
}
}
} else if ($videoId > 0) {
try {
$response = $this->client->series()->getEpisodes($tvdbid);
} catch (\Exception $error) {
echo $error->getMessage();
} catch (InvalidArgumentException $error) {
return false;
} catch (InvalidJsonInResponseException $error) {
if (strpos($error->getMessage(), 'Could not decode JSON data') === 0 || strpos($error->getMessage(), 'Incorrect data structure') === 0) {
return false;
}
} catch (RequestFailedException $error) {
return false;
} catch (UnauthorizedException $error) {
if (strpos($error->getMessage(), 'Unauthorized') === 0) {
return false;
}
}
} else {
try {
$response = $this->client->series()->getEpisodesWithQuery($tvdbid, ['airedSeason' => $season, 'airedEpsiodeNumber' => $episode]);
} catch (\Exception $error) {
echo $error->getMessage();
$response = $this->client->series()->getEpisodesWithQuery($tvdbid, ['airedSeason' => $season, 'airedEpisode' => $episode]);
} catch (InvalidArgumentException $error) {
return false;
} catch (InvalidJsonInResponseException $error) {
if (strpos($error->getMessage(), 'Could not decode JSON data') === 0 || strpos($error->getMessage(), 'Incorrect data structure') === 0) {
return false;
}
} catch (RequestFailedException $error) {
return false;
} catch (UnauthorizedException $error) {
if (strpos($error->getMessage(), 'Unauthorized') === 0) {
return false;
}
}
}
sleep(1);
if (is_object($response->getData())) {
if ($this->checkRequiredAttr($response, 'tvdbE')) {
if ($this->checkRequiredAttr($response->getData(), 'tvdbE')) {
$return = $this->formatEpisodeInfo($response);
}
} else if (is_array($response->getData()) && isset($response['episodes']) && $videoId > 0) {
foreach ($response['episodes'] as $singleEpisode) {
} else if ($videoId > 0 && is_array($response->getData())) {
foreach ($response->getData() as $singleEpisode) {
if ($this->checkRequiredAttr($singleEpisode, 'tvdbE')) {
$this->addEpisode($videoId, $this->formatEpisodeInfo($singleEpisode));
}
@@ -390,15 +444,14 @@ class TVDB extends TV
*/
protected function formatShowInfo($show)
{
$show = $show->getData();
preg_match('/tt(?P<imdbid>\d{6,7})$/i', $show->imdbId, $imdb);
return [
'type' => (int)parent::TYPE_TV,
'title' => (string)$show->name,
'summary' => (string)$show->overview,
'title' => (string)$show->getSeriesName(),
'summary' => (string)$show->getOverview(),
'started' => $show->firstAired->format('Y-m-d'),
'publisher' => (string)$show->network,
'publisher' => (string)$show->getNetwork(),
'source' => (int)parent::SOURCE_TVDB,
'imdb' => (int)($imdb['imdbid'] ?? 0),
'tvdb' => (int)$show->getid(),