From a72e2e97dcb4efb40e80e1f8ab4454f8a297bfeb Mon Sep 17 00:00:00 2001 From: DariusIII Date: Sun, 18 Nov 2018 17:12:04 +0100 Subject: [PATCH] Use short version of where query in Nfo class --- Blacklight/Nfo.php | 12 ++++++------ Changelog | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Blacklight/Nfo.php b/Blacklight/Nfo.php index a0afd3d77..6212612c4 100755 --- a/Blacklight/Nfo.php +++ b/Blacklight/Nfo.php @@ -199,13 +199,13 @@ class Nfo public function addAlternateNfo(&$nfo, $release, $nntp): bool { if ($release['id'] > 0 && $this->isNFO($nfo, $release['guid'])) { - $check = ReleaseNfo::query()->where('releases_id', $release['id'])->first(['releases_id']); + $check = ReleaseNfo::whereReleasesId($release['id'])->first(['releases_id']); if ($check === null) { ReleaseNfo::query()->insert(['releases_id' => $release['id'], 'nfo' => "\x1f\x8b\x08\x00".gzcompress($nfo)]); } - Release::query()->where('id', $release['id'])->update(['nfostatus' => self::NFO_FOUND]); + Release::whereId($release['id'])->update(['nfostatus' => self::NFO_FOUND]); if (! isset($release['completion'])) { $release['completion'] = 0; @@ -334,11 +334,11 @@ class Nfo if ($fetchedBinary !== false) { // Insert nfo into database. - $ckReleaseId = ReleaseNfo::query()->where('releases_id', $arr['id'])->first(['releases_id']); + $ckReleaseId = ReleaseNfo::whereReleasesId($arr['id'])->first(['releases_id']); if ($ckReleaseId === null) { ReleaseNfo::query()->insert(['releases_id' => $arr['id'], 'nfo' => "\x1f\x8b\x08\x00".gzcompress($fetchedBinary)]); } - Release::query()->where('id', $arr['id'])->update(['nfostatus' => self::NFO_FOUND]); + Release::whereId($arr['id'])->update(['nfostatus' => self::NFO_FOUND]); $ret++; $movie->doMovieUpdate($fetchedBinary, 'nfo', $arr['id'], $processImdb); @@ -365,10 +365,10 @@ class Nfo foreach ($qry->get(['id']) as $release) { // remove any releasenfo for failed - ReleaseNfo::query()->where('releases_id', $release['id'])->delete(); + ReleaseNfo::whereReleasesId($release['id'])->delete(); // set release.nfostatus to failed - Release::query()->where('id', $release['id'])->update(['nfostatus' => self::NFO_FAILED]); + Release::whereId($release['id'])->update(['nfostatus' => self::NFO_FAILED]); } if ($this->echo) { diff --git a/Changelog b/Changelog index f9b89ada3..3a8c26765 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2018-11-18 DariusIII + * Chg: Use short version of where query in Nfo class 2018-11-17 DariusIII * Chg: Small adjustments in switch.php 2018-11-16 DariusIII