diff --git a/docs/Downloaders/NZBGet/scripts/Clean/Clean.py b/docs/Downloaders/NZBGet/scripts/Clean/Clean.py index c62997863..21232e59f 100644 --- a/docs/Downloaders/NZBGet/scripts/Clean/Clean.py +++ b/docs/Downloaders/NZBGet/scripts/Clean/Clean.py @@ -54,6 +54,7 @@ fwp = re.sub('(?i)\[TGx\]-xpost\.nzb$', '.nzb', fwp) fwp = re.sub('(?i)\[ettv\]\.nzb$', '.nzb', fwp) fwp = re.sub('(?i)-WRTEAM\.nzb$', '.nzb', fwp) fwp = re.sub('(?i)-CAPTCHA\.nzb$', '.nzb', fwp) +fwp = re.sub(r'(\-[^-.\n]*)(\-.{4})?\.nzb$', r'\1.nzb', fwp) if fwp: print('[NZB] NZBNAME=', fwp, sep='') diff --git a/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py b/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py index 87f0e4294..9848e0f50 100644 --- a/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py +++ b/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py @@ -49,7 +49,7 @@ fwp = re.sub('(?i)\[ettv\]$', '', fwp) 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() @@ -58,4 +58,4 @@ print() print() print() # 0 means OK -sys.exit(0) \ No newline at end of file +sys.exit(0)