From 81088a8e055f6c22b4adaeb147936bf6cf0ac734 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 7 Jul 2022 11:33:21 +0200 Subject: [PATCH 1/2] Add missing bots to Clean script (SABnzbd) --- docs/Downloaders/SABnzbd/scripts/Clean/Clean.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py b/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py index 9848e0f50..f2c5088d7 100644 --- a/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py +++ b/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py @@ -29,6 +29,8 @@ except: fwp = nzbname fwp = re.sub('(?i)-4P$', '', fwp) fwp = re.sub('(?i)-4Planet$', '', fwp) +fwp = re.sub('(?i)-AlternativeToRequested$', '', fwp) +fwp = re.sub('(?i)-AlteZachen$', '', fwp) fwp = re.sub('(?i)-AsRequested$', '', fwp) fwp = re.sub('(?i)-AsRequested-xpost$', '', fwp) fwp = re.sub('(?i)-BUYMORE$', '', fwp) @@ -37,12 +39,15 @@ fwp = re.sub('(?i)-GEROV$', '', fwp) fwp = re.sub('(?i)-iNC0GNiTO$', '', fwp) fwp = re.sub('(?i)-NZBGeek$', '', fwp) fwp = re.sub('(?i)-Obfuscated$', '', fwp) +fwp = re.sub('(?i)-Obfuscation$', '', fwp) fwp = re.sub('(?i)-postbot$', '', fwp) fwp = re.sub('(?i)-Rakuv$', '', fwp) +fwp = re.sub('(?i)-RePACKPOST$', '', fwp) fwp = re.sub('(?i)-Scrambled$', '', fwp) fwp = re.sub('(?i)-WhiteRev$', '', fwp) fwp = re.sub('(?i)-WRTEAM$', '', fwp) fwp = re.sub('(?i)-CAPTCHA$', '', fwp) +fwp = re.sub('(?i)-Z0iDS3N$', '', fwp) fwp = re.sub('(?i)\[eztv\]$', '', fwp) fwp = re.sub('(?i)\[TGx\]$', '', fwp) fwp = re.sub('(?i)\[ettv\]$', '', fwp) @@ -58,4 +63,4 @@ print() print() print() # 0 means OK -sys.exit(0) +sys.exit(0) \ No newline at end of file From bb7ce488b3ee92d39af6c714f9dcf40e943dacef Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 7 Jul 2022 11:36:45 +0200 Subject: [PATCH 2/2] Optimize regex matching in Clean script (SABnzbd) --- docs/Downloaders/SABnzbd/scripts/Clean/Clean.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py b/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py index f2c5088d7..3b3832ba8 100644 --- a/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py +++ b/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py @@ -41,7 +41,7 @@ fwp = re.sub('(?i)-NZBGeek$', '', fwp) fwp = re.sub('(?i)-Obfuscated$', '', fwp) fwp = re.sub('(?i)-Obfuscation$', '', fwp) fwp = re.sub('(?i)-postbot$', '', fwp) -fwp = re.sub('(?i)-Rakuv$', '', fwp) +fwp = re.sub('(?i)-Rakuv[a-z0-9]*$', '', fwp) fwp = re.sub('(?i)-RePACKPOST$', '', fwp) fwp = re.sub('(?i)-Scrambled$', '', fwp) fwp = re.sub('(?i)-WhiteRev$', '', fwp) @@ -55,6 +55,7 @@ fwp = re.sub('(?i)\[TGx\]-xpost$', '', fwp) fwp = re.sub('(?i).mkv-xpost$', '', fwp) fwp = re.sub('(?i)-xpost$', '', fwp) fwp = re.sub(r'(\-[^-.\n]*)(\-.{4})?$', r'\1', fwp) + print("1") # Accept print(fwp) print()