Set release as passworded if files inside archives are passworded

NNTmux · Aug 16, 2019 · 58761de · 58761de
1 parent bfa2cd9
commit 58761de
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/Blacklight/processing/post/ProcessAdditional.php b/Blacklight/processing/post/ProcessAdditional.php
@@ -318,7 +318,7 @@ class ProcessAdditional
 
     /**
      * Password status of the current release.
-     * @var array
+     * @var string
      */
     protected $_passwordStatus;
 
@@ -1087,7 +1087,7 @@ protected function _processCompressedData(&$compressedData): bool
                 $this->_debug('ArchiveInfo: Compressed file has a password.');
             }
             $this->_releaseHasPassword = true;
-            $this->_passwordStatus[] = Releases::PASSWD_RAR;
+            $this->_passwordStatus = Releases::PASSWD_RAR;
 
             return false;
         }
@@ -1154,13 +1154,13 @@ protected function _processCompressedFileList(): bool
 
                 if (isset($file['pass']) && $file['pass'] === true) {
                     $this->_releaseHasPassword = true;
-                    $this->_passwordStatus[] = Releases::PASSWD_RAR;
+                    $this->_passwordStatus = Releases::PASSWD_RAR;
                     break;
                 }
 
                 if ($this->_innerFileBlacklist !== false && preg_match($this->_innerFileBlacklist, $file['name'])) {
                     $this->_releaseHasPassword = true;
-                    $this->_passwordStatus[] = Releases::PASSWD_POTENTIAL;
+                    $this->_passwordStatus = Releases::PASSWD_POTENTIAL;
                     break;
                 }
 
@@ -1215,6 +1215,9 @@ protected function _addFileInfo(&$file): void
                 ['size'], ])->first() === null) {
                 if (ReleaseFile::addReleaseFiles($this->_release->id, $file['name'], $file['size'], $file['date'], $file['pass'], '', $file['crc32'] ?? '')) {
                     $this->_addedFileInfo++;
+                    if ((int) $file['pass'] === 1) {
+                        $this->_passwordStatus = Releases::PASSWD_RAR;
+                    }
 
                     if ($this->_echoCLI) {
                         $this->_echo('^', 'primaryOver');
@@ -1228,7 +1231,7 @@ protected function _addFileInfo(&$file): void
                             $this->_debug('Codec spam found, setting release to potentially passworded.');
                         }
                         $this->_releaseHasPassword = true;
-                        $this->_passwordStatus[] = Releases::PASSWD_POTENTIAL;
+                        $this->_passwordStatus = Releases::PASSWD_POTENTIAL;
                     } //Run a PreDB filename check on insert to try and match the release
                     elseif ($file['name'] !== '' && strpos($file['name'], '.') !== 0) {
                         $this->_release['filename'] = $file['name'];
@@ -2297,7 +2300,7 @@ protected function _resetReleaseStatus(): void
         $this->_foundSample = $this->_processThumbnails ? false : true;
         $this->_foundPAR2Info = false;
 
-        $this->_passwordStatus = [Releases::PASSWD_NONE];
+        $this->_passwordStatus = Releases::PASSWD_NONE;
         $this->_releaseHasPassword = false;
 
         $this->_releaseGroupName = UsenetGroup::getNameByID($this->_release->groups_id);

diff --git a/Changelog b/Changelog
@@ -1,4 +1,5 @@
 2019-08-16 DariusIII
+	* Chg: Set release as passworded if files inside archives are passworded
 	* Chg: Update tinyMCE config
 	* Fix: Fix opening existing forum posts
 	* Fix: Fix bad order of variables in PostProcess class

diff --git a/captainhook.json b/captainhook.json
@@ -5,7 +5,7 @@
             {
                 "action": "\\CaptainHook\\App\\Hook\\Message\\Action\\Beams",
                 "options": {
-                    "subjectLength": 50,
+                    "subjectLength": 200,
                     "bodyLineLength": 72
                 },
                 "conditions": []