From 6a58cace5c9c681e32fc3bcc4c4e9a19fbbaa791 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Mon, 27 Mar 2023 19:02:54 +0200 Subject: [PATCH 1/3] Fix `PR1234` # 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. --- docs/Sonarr/Sonarr-Release-Profile-RegEx.md | 2 +- docs/json/sonarr/rp/optionals.json | 2 +- docs/updates.txt | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md index f0e9fb309..0e90f5b71 100644 --- a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md +++ b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md @@ -536,7 +536,7 @@ Add this to your `Must not contain (2)` Add this to your `Must not contain (2)` ```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 ``` diff --git a/docs/json/sonarr/rp/optionals.json b/docs/json/sonarr/rp/optionals.json index a022c5970..f8d5dec89 100644 --- a/docs/json/sonarr/rp/optionals.json +++ b/docs/json/sonarr/rp/optionals.json @@ -16,7 +16,7 @@ }, { "name": "Ignore so called scene releases", "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", "trash_id": "538bad00ee6f8aced8e0db5218b8484c", diff --git a/docs/updates.txt b/docs/updates.txt index 18ca7e7b4..34b6f7134 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -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 **[New]** - None From 77a279c77a9e4b5f27a188b0a099e436f64292fa Mon Sep 17 00:00:00 2001 From: Gabe Date: Mon, 27 Mar 2023 22:28:18 +0200 Subject: [PATCH 2/3] SABnzbd - Update replace_for.py to work with V.4.0.0 Sabnzbd Version 4.0.0 (current beta) introduced a couple of input variables, that weren't available in the versions before. This PR fixes the two scripts in the Guide, so they are compatible with earlier and V4+ versions https://sabnzbd.org/wiki/scripts/pre-queue-scripts#toc3 --- .../Downloaders/SABnzbd/scripts/replace_for/replace_for.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/Downloaders/SABnzbd/scripts/replace_for/replace_for.py b/docs/Downloaders/SABnzbd/scripts/replace_for/replace_for.py index d347394cf..0345f3650 100644 --- a/docs/Downloaders/SABnzbd/scripts/replace_for/replace_for.py +++ b/docs/Downloaders/SABnzbd/scripts/replace_for/replace_for.py @@ -20,7 +20,12 @@ import os import os.path 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: print("No commandline parameters found") sys.exit(1) # exit with 1 causes SABnzbd to ignore the output of this script From ddc7efac1569cc22e0a42701b8e7955dd04cd7f9 Mon Sep 17 00:00:00 2001 From: Gabe Date: Mon, 27 Mar 2023 22:29:35 +0200 Subject: [PATCH 3/3] SABnzbd - Update Clean.py to work with V.4.0.0 Sabnzbd Version 4.0.0 (current beta) introduced a couple of input variables, that weren't available in the versions before. This PR fixes the two scripts in the Guide, so they are compatible with earlier and V4+ versions https://sabnzbd.org/wiki/scripts/pre-queue-scripts#toc3 --- docs/Downloaders/SABnzbd/scripts/Clean/Clean.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py b/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py index a7f13064a..060161642 100644 --- a/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py +++ b/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py @@ -21,8 +21,12 @@ import sys import re 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) +except ValueError: + # ...or 11 variables for earlier versions + (scriptname, nzbname, postprocflags, category, script, prio, downloadsize, grouplist, showname, season, episodenumber, episodename) = sys.argv except: sys.exit(1) # exit with 1 causes SABnzbd to ignore the output of this script @@ -64,4 +68,4 @@ print() print() print() # 0 means OK -sys.exit(0) \ No newline at end of file +sys.exit(0)