Merge branch 'master' into dependabot/pip/mkdocs-material-9.1.4

.github/workflows/deploy.yml

@@ -8,7 +8,7 @@ jobs:
     name: Build docs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.4.0
+      - uses: actions/checkout@v3.5.0
       - uses: actions/setup-python@v4.5.0
         with:
           python-version: 3.x
@@ -25,7 +25,7 @@ jobs:
     name: Deploy docs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.4.0
+      - uses: actions/checkout@v3.5.0
         with:
           fetch-depth: '0'
       - uses: actions/setup-python@v4.5.0

.github/workflows/lint.yml

@@ -7,7 +7,7 @@ jobs:
   editorconfig-checker:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.4.0
+      - uses: actions/checkout@v3.5.0
       - name: editorconfig-checker
         run: |
           docker run --rm \
@@ -17,7 +17,7 @@ jobs:
   markdownlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.4.0
+      - uses: actions/checkout@v3.5.0
       - name: markdownlint
         run: |
           find "${GITHUB_WORKSPACE}" -name '*.md' -exec \
@@ -30,7 +30,7 @@ jobs:
   yamllint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.4.0
+      - uses: actions/checkout@v3.5.0
       - name: yamllint
         run: |
           find "${GITHUB_WORKSPACE}" -name '*.yaml' -o -name '*.yml' -exec \

.github/workflows/metadata-validation.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Validate metadata.json
     steps:
-      - uses: actions/checkout@v3.4.0
+      - uses: actions/checkout@v3.5.0
       - uses: actions/setup-python@v4.5.0
         with:
           python-version: "3.x"

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

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