Merge branch 'master' into dependabot/github_actions/actions/checkout-3.5.0

pull/1235/head
TRaSH 2 years ago committed by GitHub
commit b031b18d35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -21,8 +21,12 @@ import sys
import re import re
try: try:
(scriptname, nzbname, postprocflags, category, script, prio, downloadsize, grouplist, showname, season, episodenumber, episodename) = sys.argv # Parse the 18 input variables for SABnzbd version >= 4.0.0
(scriptname, nzbname, postprocflags, category, script, prio, downloadsize, grouplist, showname, season, episodenumber, episodename, is_proper, resolution, decade, year, month, day, job_type) = sys.argv
downloadsize = int(downloadsize) downloadsize = int(downloadsize)
except ValueError:
# ...or 11 variables for earlier versions
(scriptname, nzbname, postprocflags, category, script, prio, downloadsize, grouplist, showname, season, episodenumber, episodename) = sys.argv
except: except:
sys.exit(1) # exit with 1 causes SABnzbd to ignore the output of this script sys.exit(1) # exit with 1 causes SABnzbd to ignore the output of this script
@ -64,4 +68,4 @@ print()
print() print()
print() print()
# 0 means OK # 0 means OK
sys.exit(0) sys.exit(0)

@ -20,7 +20,12 @@ import os
import os.path import os.path
try: try:
(scriptname, directory, orgnzbname, jobname, reportnumber, category, group, postprocstatus, url) = sys.argv try:
# Parse the 18 input variables for SABnzbd version >= 4.0.0
(scriptname, nzbname, postprocflags, category, script, prio, downloadsize, grouplist, showname, season, episodenumber, episodename, is_proper, resolution, decade, year, month, day, job_type) = sys.argv
except ValueError:
# ...or 11 variables for earlier versions
(scriptname, nzbname, postprocflags, category, script, prio, downloadsize, grouplist, showname, season, episodenumber, episodename) = sys.argv
except: except:
print("No commandline parameters found") print("No commandline parameters found")
sys.exit(1) # exit with 1 causes SABnzbd to ignore the output of this script sys.exit(1) # exit with 1 causes SABnzbd to ignore the output of this script

@ -536,7 +536,7 @@ Add this to your `Must not contain (2)`
Add this to your `Must not contain (2)` Add this to your `Must not contain (2)`
```bash ```bash
/^(?!.*(web[ ]dl|-deflate|-inflate))(?=.*([_. ]WEB[_. ])(?!DL)\b)|\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT)).*/i /^(?!.*(web[ ]dl|-deflate|-inflate))(?=.*([_. ]WEB[_. ])(?!DL)\b)|\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT).*/i
``` ```

@ -16,7 +16,7 @@
}, { }, {
"name": "Ignore so called scene releases", "name": "Ignore so called scene releases",
"trash_id": "5bc23c3a055a1a5d8bbe4fb49d80e0cb", "trash_id": "5bc23c3a055a1a5d8bbe4fb49d80e0cb",
"term": "/^(?!.*(web[ ]dl|-deflate|-inflate))(?=.*([_. ]WEB[_. ])(?!DL)\\b)|\\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT)).*/i" "term": "/^(?!.*(web[ ]dl|-deflate|-inflate))(?=.*([_. ]WEB[_. ])(?!DL)\\b)|\\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT).*/i"
}, { }, {
"name": "Ignore Bad Dual Audio Groups", "name": "Ignore Bad Dual Audio Groups",
"trash_id": "538bad00ee6f8aced8e0db5218b8484c", "trash_id": "538bad00ee6f8aced8e0db5218b8484c",

@ -1,3 +1,13 @@
# 2023-03-27 19:00
**[New]**
- None
**[Updated]**
- None
**[Fixed]**
- [Sonarr v3] Fix copy/paste error with PR#1234 for the Optional `Scene` prevent matching on releases renamed by trackers.
# 2023-03-26 11:00 # 2023-03-26 11:00
**[New]** **[New]**
- None - None

Loading…
Cancel
Save