From a0179b09a6a98a59486350bb7a02e393cc09d7f8 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 7 Mar 2019 14:29:02 +0100 Subject: [PATCH] Use only query builder in PPA class --- .../processing/post/ProcessAdditional.php | 30 +++++-------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/Blacklight/processing/post/ProcessAdditional.php b/Blacklight/processing/post/ProcessAdditional.php index 4a912c87f..f32e84449 100755 --- a/Blacklight/processing/post/ProcessAdditional.php +++ b/Blacklight/processing/post/ProcessAdditional.php @@ -20,6 +20,7 @@ use Blacklight\ReleaseExtra; use Blacklight\ReleaseImage; use Blacklight\SphinxSearch; use FFMpeg\Format\Video\Ogg; +use Illuminate\Support\Carbon; use Mhor\MediaInfo\MediaInfo; use Blacklight\utility\Utility; use dariusiii\rarinfo\Par2Info; @@ -1736,18 +1737,8 @@ class ProcessAdditional $newTitle = escapeString(substr($newName, 0, 255)); // Update the search name. - DB::update( - sprintf( - ' - UPDATE releases - SET searchname = %s, categories_id = %d, iscategorized = 1, isrenamed = 1, proc_pp = 1 - WHERE id = %d', - $newTitle, - $newCat['categories_id'], - $this->_release->id - ) - ); - $release = Release::find($this->_release->id); + $release = Release::whereId($this->_release->id); + $release->update(['searchname' => $newTitle, 'categories_id' => $newCat['categories_id'], 'iscategorized' => 1, 'isrenamed' => 1, 'proc_pp' => 1]); $release->retag($newCat['tags']); $this->sphinx->updateRelease($this->_release->id); @@ -2130,21 +2121,14 @@ class ProcessAdditional if ($this->_par2Info->error) { return; } - - $releaseInfo = DB::selectOne( - sprintf( - ' - SELECT UNIX_TIMESTAMP(postdate) AS postdate, proc_pp - FROM releases - WHERE id = %d', - $this->_release->id - ) - ); + $releaseInfo = Release::query()->where('id', $this->_release->id)->select(['postdate', 'proc_pp'])->first(); if ($releaseInfo === null) { return; } + $postDate = Carbon::createFromFormat('Y-m-d H:i:s', $releaseInfo->postdate)->getTimestamp(); + // Only get a new name if the category is OTHER. $foundName = true; if ((int) $releaseInfo->proc_pp === 0 && config('nntmux.rename_par2') && @@ -2176,7 +2160,7 @@ class ProcessAdditional ) { // Try to add the files to the DB. - if (ReleaseFile::addReleaseFiles($this->_release->id, $file['name'], $file['size'], $releaseInfo->postdate, 0, $file['hash_16K'])) { + if (ReleaseFile::addReleaseFiles($this->_release->id, $file['name'], $file['size'], $postDate, 0, $file['hash_16K'])) { $filesAdded++; } }