Merge branch 'master' into dependabot/pip/mkdocs-minify-plugin-0.5.0

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='')
 

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)
+sys.exit(0)