Set version to 3.5.0

Closes #2036, #2035

.github/workflows/build_release.yml

@@ -73,7 +73,7 @@ jobs:
       # We need the official Python, because the GA ones only support newer macOS versions
       # The deployment target is picked up by the Python build tools automatically
       # If updated, make sure to also set LSMinimumSystemVersion in SABnzbd.spec
-      PYTHON_VERSION: "3.10.1"
+      PYTHON_VERSION: "3.10.2"
       MACOSX_DEPLOYMENT_TARGET: "10.9"
       # We need to force compile for universal2 support
       CFLAGS: -arch arm64 -arch x86_64

.github/workflows/integration_testing.yml

@@ -13,6 +13,7 @@ jobs:
         python-version: ["3.7", "3.8", "3.9", "3.10"]
         os: [ubuntu-20.04]
         include:
+          # TODO: Update to 3.10 when all packages are available, currently lxml is missing
           - name: macOS
             os: macos-latest
             python-version: "3.10"

PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 1.0
 Name: SABnzbd
-Version: 3.5.0RC1
-Summary: SABnzbd-3.5.0RC1
+Version: 3.5.0
+Summary: SABnzbd-3.5.0
 Home-page: https://sabnzbd.org
 Author: The SABnzbd Team
 Author-email: team@sabnzbd.org

README.mkd

@@ -1,4 +1,4 @@
-Release Notes - SABnzbd 3.5.0 Release Candidate 1
+Release Notes - SABnzbd 3.5.0
 =========================================================
 
 ## Changes since 3.4.2
@@ -11,28 +11,30 @@ Release Notes - SABnzbd 3.5.0 Release Candidate 1
 - Show an estimated time-left indicator for repair and unpacking. 
 - Require TLS version 1.2 or higher for SSL news server connections.
 - Setting custom ciphers forces the maximum TLS version to 1.2.
-- Print low-level Windows status error on `IOError`.
 - Reduced memory usage during and after parsing `.nzb` files.
 - Handle multiple passwords stored in NZB-file.
 - macOS/Linux: `Permissions` are only applied if any are set.
-- macOS/Windows: updated to Python 3.10.1.
+- macOS/Windows: updated to Python 3.10.2.
 - macOS: run native on M1 systems. However, included tools 
   (`par2`, `unrar` and `7za`) still require Rosetta emulation.
 - Snap: updated to `core20` base and restore 7zip support.
 
 ## Bugfixes since 3.4.2
+- Global interface settings would not always be applied correctly.
 - Email notification setting was not shown correctly.
 - Improvements and fixes for `Defobfuscate final filenames`.
 - `Post-Process Only Verified Jobs` would not always work as intended.
 - Correctly detect too little disk space when unpacking 7zip's.
 - Improvements to handling of repair by MultiPar and par2cmdline.
+- HTML characters in configuration fields were shown incorrectly.
 - On Retry the number of downloaded bytes could exceed the total bytes.
 - `unrar` logging of Direct Unpack was not logged if it was aborted.
 - Windows: `portable.cmd` was not included in the release.
+- Windows: print low-level Windows error on `IOError`.
 
 ## Upgrade notices
 - The download statistics file `totals10.sab` is updated in 3.2.x 
-  version. If you downgrade to 3.1.x or lower, detailed download 
+  version. If you downgrade to 3.1.x or lower, all detailed download 
   statistics will be lost.
 
 ## Known problems and solutions

sabnzbd/interface.py

@@ -30,6 +30,7 @@ import hashlib
 import socket
 import ssl
 import functools
+import copy
 from random import randint
 from xml.sax.saxutils import escape
 from Cheetah.Template import Template
@@ -367,8 +368,11 @@ def check_apikey(kwargs):
 
 def template_filtered_response(file: str, search_list: Dict[str, Any]):
     """Wrapper for Cheetah response"""
-    recursive_html_escape(search_list, exclude_items=("webdir",))
-    return Template(file=file, searchList=[search_list], compilerSettings=CHEETAH_DIRECTIVES).respond()
+    # We need a copy, because otherwise source-dicts might be modified
+    search_list_copy = copy.deepcopy(search_list)
+    # 'filters' is excluded because the RSS-filters are listed twice
+    recursive_html_escape(search_list_copy, exclude_items=("webdir", "filters"))
+    return Template(file=file, searchList=[search_list_copy], compilerSettings=CHEETAH_DIRECTIVES).respond()
 
 
 def log_warning_and_ip(txt):
@@ -1445,7 +1449,7 @@ class ConfigRss:
 
         if filt:
             feed_cfg.filters.update(
-                int(kwargs.get("index", 0)), (cat, pp, script, kwargs.get("filter_type"), filt, prio, enabled)
+                int(kwargs.get("index", 0)), [cat, pp, script, kwargs.get("filter_type"), filt, prio, enabled]
             )
 
             # Move filter if requested

sabnzbd/misc.py

@@ -1080,11 +1080,13 @@ def recursive_html_escape(input_dict_or_list: Union[Dict[str, Any], List], exclu
             iterator = enumerate(input_dict_or_list)
 
         for key, value in iterator:
-            # We ignore any other than str and those on the exclude_items-list
-            if isinstance(value, str) and key not in exclude_items:
-                input_dict_or_list[key] = html.escape(value, quote=True)
-            if isinstance(value, (dict, list)):
-                recursive_html_escape(value)
+            # Ignore any keys that are not safe to convert
+            if key not in exclude_items:
+                # We ignore any other than str
+                if isinstance(value, str):
+                    input_dict_or_list[key] = html.escape(value, quote=True)
+                if isinstance(value, (dict, list)):
+                    recursive_html_escape(value, exclude_items=exclude_items)
     else:
         raise ValueError("Expected dict or str, got %s" % type(input_dict_or_list))
 

sabnzbd/newsunpack.py

@@ -970,6 +970,8 @@ def unseven(nzo: NzbObject, workdir_complete: str, one_folder: bool, sevens: Lis
         logging.info("Starting extract on 7zip set/file: %s ", seven_set)
         nzo.set_action_line(T("Unpacking"), setname_from_path(seven_set))
 
+        # Sort, so that x.001 is the first one
+        seven_sets[seven_set].sort()
         seven_path = seven_sets[seven_set][0]
 
         if workdir_complete and seven_path.startswith(nzo.download_path):
@@ -978,7 +980,9 @@ def unseven(nzo: NzbObject, workdir_complete: str, one_folder: bool, sevens: Lis
             extraction_path = os.path.split(seven_path)[0]
 
         res, new_files_set = seven_extract(nzo, seven_path, seven_set, extraction_path, one_folder)
-        if not res and nzo.delete:
+        if res:
+            unseven_failed = True
+        elif nzo.delete:
             for seven in seven_sets[seven_set]:
                 try:
                     remove_file(seven)
@@ -1284,7 +1288,7 @@ def par2cmdline_verify(
         if line == "":
             continue
 
-        if not line.startswith(("Repairing:", "Scanning:", "Loading:")):
+        if not line.startswith(("Repairing:", "Scanning:", "Loading:", "Solving:", "Constructing:")):
             lines.append(line)
 
         if line.startswith(("Invalid option specified", "Invalid thread option", "Cannot specify recovery file count")):
@@ -2046,12 +2050,14 @@ def unrar_check(rar: str) -> Tuple[int, bool]:
 
 def sevenzip_check(sevenzip: str) -> str:
     """Return version of 7zip, currently as a string"""
-    try:
-        seven_command_output = run_command([sevenzip])
-        # Example: 7-Zip (z) 21.06 (x64) : Copyright (c) 1999-2021 Igor Pavlov : 2021-11-24
-        return re.search(r"(\d+\.\d+).*Copyright", seven_command_output).group(1)
-    except:
-        return ""
+    if sevenzip:
+        try:
+            seven_command_output = run_command([sevenzip])
+            # Example: 7-Zip (z) 21.06 (x64) : Copyright (c) 1999-2021 Igor Pavlov : 2021-11-24
+            return re.search(r"(\d+\.\d+).*Copyright", seven_command_output).group(1)
+        except:
+            pass
+    return ""
 
 
 def par2_mt_check(par2_path: str) -> bool:

sabnzbd/version.py

@@ -5,5 +5,5 @@
 
 # You MUST use double quotes (so " and not ')
 
-__version__ = "develop"
-__baseline__ = "unknown"
+__version__ = "3.5.0"
+__baseline__ = "e586ead024510309058ce5dfb6b9400fe86ec716"

tests/requirements.txt

@@ -7,6 +7,7 @@ pytest-httpbin
 pytest-httpserver
 flaky
 xmltodict
-tavern
+tavern<1.16.2; python_version == '3.6'
+tavern; python_version > '3.6'
 tavalidate
 lxml>=4.5.0 # needed by tavalidate