From d27ecfdbb29f4ec317b53af41d7ce8a399273d64 Mon Sep 17 00:00:00 2001 From: Darko Date: Tue, 9 Jun 2015 11:50:05 +0200 Subject: [PATCH] Pick up additional RAR names and match both functions. Some RAR file extensions weren't being picked up. Additionally the first and second checks didn't match so some files picked up in the first scan end up skipped in the second. Ported from Enverexes nZEDb PR. --- newznab/processing/post/ProcessAdditional.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/newznab/processing/post/ProcessAdditional.php b/newznab/processing/post/ProcessAdditional.php index e22c3e445..912715ce7 100644 --- a/newznab/processing/post/ProcessAdditional.php +++ b/newznab/processing/post/ProcessAdditional.php @@ -763,7 +763,7 @@ class ProcessAdditional // Check if it's a rar/zip. if ($this->_NZBHasCompressedFile === false && preg_match( - '/\.(part0*1|part0+|r0+|r0*1|rar|0+|0*10?|zip)(\s*\.rar)*($|[ ")\]-])|"[a-f0-9]{32}\.[1-9]\d{1,2}".*\(\d+\/\d{2,}\)$/i', + '/\.(part0*1|part0+|r0+|r0*1|rar|0+|0*10?|zipr\d{2,3}|zipx?)(\s*\.rar)*($|[ ")\]-])|"[a-f0-9]{32}\.[1-9]\d{1,2}".*\(\d+\/\d{2,}\)$/i', $this->_currentNZBFile['title'] ) ) { @@ -864,7 +864,7 @@ class ProcessAdditional // Probably not a rar/zip. if (!preg_match( - '/\.\b(part\d+|part00\.rar|part01\.rar|rar|r00|r01|zipr\d{2,3}|zip|zipx)($|[ ")\]-])|"[a-f0-9]{32}\.[1-9]\d{1,2}".*\(\d+\/\d{2,}\)$/i', + '/\.(part0*1|part0+|r0+|r0*1|rar|0+|0*10?|zipr\d{2,3}|zipx?)(\s*\.rar)*($|[ ")\]-])|"[a-f0-9]{32}\.[1-9]\d{1,2}".*\(\d+\/\d{2,}\)$/i', $nzbFile['title'] ) ) {