From a554b3287d724b2c9d29beec8cf2e73c490a42ff Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 21 Aug 2019 11:01:16 +0200 Subject: [PATCH] Handle bad releases and update passworded in PPA class --- .../processing/post/ProcessAdditional.php | 25 ++++++++++++++++--- Changelog | 1 + 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Blacklight/processing/post/ProcessAdditional.php b/Blacklight/processing/post/ProcessAdditional.php index c49ec3574..d743d605a 100755 --- a/Blacklight/processing/post/ProcessAdditional.php +++ b/Blacklight/processing/post/ProcessAdditional.php @@ -1203,10 +1203,6 @@ class ProcessAdditional $addReleaseFiles = ReleaseFile::addReleaseFiles($this->_release->id, $file['name'], $file['size'], $file['date'], $file['pass'], '', $file['crc32'] ?? ''); if (! empty($addReleaseFiles)) { $this->_addedFileInfo++; - if ($file['pass'] === true) { - $this->_releaseHasPassword = true; - $this->_passwordStatus = [Releases::PASSWD_RAR]; - } if ($this->_echoCLI) { $this->_echo('^', 'primaryOver'); @@ -1230,6 +1226,7 @@ class ProcessAdditional } } } + $this->_updatePassworded(); } /** @@ -1624,6 +1621,7 @@ class ProcessAdditional } Release::fromQuery($query); + $this->_removeBadReleases(); } /** @@ -2335,4 +2333,23 @@ class ProcessAdditional { $this->_echo('DEBUG: '.$string, 'debug'); } + + protected function _removeBadReleases(): void + { + $releases = Release::query()->where('passwordstatus', '=', -2)->get(); + + foreach ($releases as $release) { + $release->delete(); + } + } + + protected function _updatePassworded(): void + { + $passReleases = ReleaseFile::query()->where('passworded', '=', 1)->groupBy('releases_id')->get(); + + foreach ($passReleases as $passRelease) { + Release::whereId($passRelease->releases_id)->update(['passwordstatus' => 1]); + + } + } } diff --git a/Changelog b/Changelog index 354146bfc..e66f5239c 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-08-21 DariusIII + * Chg: Handle bad releases and update passworded in PPA class * Chg: Remove yadakhov/insertonduplicatekey library * Chg: Use the new insertOrIgnore function in place of insertIgnore from yadakhov/InsertOnDuplicateKey library * Chg: Update laravel/framework and laravel/horizon to latest versions