diff --git a/Blacklight/Releases.php b/Blacklight/Releases.php index 29311a279..529521ee1 100755 --- a/Blacklight/Releases.php +++ b/Blacklight/Releases.php @@ -747,7 +747,7 @@ class Releases g.name AS group_name, cp.id AS categoryparentid, v.tvdb, v.trakt, v.tvrage, v.tvmaze, v.imdb, v.tmdb, - tve.firstaired + tve.firstaired, tve.title, tve.series, tve.episode FROM releases r LEFT OUTER JOIN videos v ON r.videos_id = v.id LEFT OUTER JOIN tv_episodes tve ON r.tv_episodes_id = tve.id @@ -802,13 +802,13 @@ class Releases { $siteSQL = []; $showSql = ''; - if (\is_array($siteIdArr)) { + foreach ($siteIdArr as $column => $Id) { if ($Id > 0) { $siteSQL[] = sprintf('v.%s = %d', $column, $Id); } } - } + if (\count($siteSQL) > 0) { // If we have show info, find the Episode ID/Video ID first to avoid table scans $showQry = sprintf( @@ -940,13 +940,12 @@ class Releases { $siteSQL = []; $showSql = ''; - if (\is_array($siteIdArr)) { foreach ($siteIdArr as $column => $Id) { if ($Id > 0) { $siteSQL[] = sprintf('v.%s = %d', $column, $Id); } } - } + if (\count($siteSQL) > 0) { // If we have show info, find the Episode ID/Video ID first to avoid table scans $showQry = sprintf( diff --git a/Changelog b/Changelog index c03881d00..154754707 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2018-08-07 DariusIII + * Fix: Fix ApiV2 responses 2018-08-06 DariusIII * Chg: Update handling of user and role disabled categories 2018-08-05 DariusIII diff --git a/app/Transformers/ApiTransformer.php b/app/Transformers/ApiTransformer.php index 00e2d2fbd..9586f26a4 100644 --- a/app/Transformers/ApiTransformer.php +++ b/app/Transformers/ApiTransformer.php @@ -38,8 +38,8 @@ class ApiTransformer extends TransformerAbstract 'size' => $releases->size, 'files' => $releases->totalpart, 'poster' => $releases->fromname, - 'imdbid' => $releases->imdbid, - 'tmdbid' => $releases->tmdbid, + 'imdbid' => $releases->imdbid !== 0 ? $releases->imdbid : $this->null(), + 'tmdbid' => $releases->tmdbid !== 0 ? $releases->tmdbid : $this->null(), 'traktid' => $releases->traktid !== 0 ? $releases->traktid : $this->null(), 'grabs' => $releases->grabs !== 0 ? $releases->grabs : $this->null(), 'comments' => $releases->comments !== 0 ? $releases->comments : $this->null(), @@ -60,16 +60,16 @@ class ApiTransformer extends TransformerAbstract 'size' => $releases->size, 'files' => $releases->totalpart, 'poster' => $releases->fromname, - 'episode_title' => $releases->title, - 'season' =>$releases->series, - 'episode' =>$releases->episode, - 'tvairdate' => $releases->firstaired, - 'tvdbid' => $releases->tvdb, - 'traktid' => $releases->trakt, - 'tvrageid' => $releases->tvrage, - 'tvmazeid' => $releases->tvmaze, - 'imdbid' => $releases->imdb, - 'tmdbid' => $releases->tmdb, + 'episode_title' => $releases->title ?? $this->null(), + 'season' => $releases->series ?? $this->null(), + 'episode' => $releases->episode ?? $this->null(), + 'tvairdate' =>$releases->firstaired ?? $this->null(), + 'tvdbid' => $releases->tvdb !== 0 ? $releases->tvdb : $this->null(), + 'traktid' => $releases->trakt !== 0 ? $releases->trakt : $this->null(), + 'tvrageid' => $releases->tvrage !== 0 ? $releases->tvrage : $this->null(), + 'tvmazeid' => $releases->tvmaze !== 0 ?$releases->tvmaze : $this->null(), + 'imdbid' => $releases->imdb !== 0 ?$releases ->imdb: $this->null(), + 'tmdbid' => $releases->tmdb !== 0 ?$releases->tmdb : $this->null(), 'grabs' => $releases->grabs !== 0 ? $releases->grabs : $this->null(), 'comments' => $releases->comments !== 0 ? $releases->comments : $this->null(), 'password' => $releases->passwordstatus,