Set version to 4.3.2

Closes #2817

.git-blame-ignore-revs

@@ -40,4 +40,3 @@ f06891926661986fff52d6eb4b4cb120c71972d1
 9bcbcaefdfecc85aedfd8e2f8aaa1ca7f959404e
 433dcab02b29f7bd3827e237434034deecc1b549
 9f6a9f991222efccc87b45a701086c95629c67b6
-f89114ca7e1b20bf8e645ecd0b52b707ec857aa9

.github/renovate.json

@@ -15,7 +15,6 @@
       "builder/release-requirements.txt"
     ]
   },
-  "ignorePaths": [],
   "ignoreDeps": [
     "jaraco.text",
     "jaraco.context",

.github/workflows/build_release.yml

@@ -69,8 +69,8 @@ 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.12.6"
-      MACOSX_DEPLOYMENT_TARGET: "10.13"
+      PYTHON_VERSION: "3.12.3"
+      MACOSX_DEPLOYMENT_TARGET: "10.9"
       # We need to force compile for universal2 support
       CFLAGS: -arch x86_64 -arch arm64
       ARCHFLAGS: -arch x86_64 -arch arm64
@@ -95,12 +95,14 @@ jobs:
     - name: Install Python
       run: sudo installer -pkg ~/python.pkg -target /
     - name: Install Python dependencies
-      # We have to manually compile some modules as they don't automatically fetch universal2 binaries
+      # We have to manually take a few steps:
+      # 1.  We need to build the PyInstaller bootloader:
+      #     https://github.com/pyinstaller/pyinstaller/issues/6235
       run: |
         python3 --version
         pip3 install --upgrade pip wheel
         pip3 install --upgrade -r requirements.txt --no-binary cffi,CT3,PyYAML,charset_normalizer --no-dependencies
-        pip3 install --upgrade -r builder/requirements.txt --no-dependencies
+        PYINSTALLER_COMPILE_BOOTLOADER=1 pip3 install --upgrade -r builder/requirements.txt --no-binary pyinstaller --no-dependencies
     - name: Import macOS codesign certificates
       # Taken from https://github.com/Apple-Actions/import-codesign-certs/pull/27 (comments)
       env:

.github/workflows/integration_testing.yml

@@ -31,18 +31,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         python-architecture: ["x64"]
         name: ["Linux"]
-        os: [ubuntu-latest]
+        os: [ubuntu-20.04]
         include:
           - name: macOS
             os: macos-latest
-            python-version: "3.13"
+            python-version: "3.12"
             python-architecture: "x64"
           - name: Windows
             os: windows-latest
-            python-version: "3.13"
+            python-version: "3.12"
             python-architecture: "x64"
           - name: Windows (32bit)
             os: windows-latest
@@ -60,7 +60,7 @@ jobs:
         cache-dependency-path: "**/requirements.txt"
     - name: Install system dependencies
       if: runner.os == 'Linux'
-      run: sudo apt-get install unrar 7zip par2
+      run: sudo apt-get install unrar p7zip-full par2
     - name: Install Python dependencies
       run: |
         python --version

README.mkd

@@ -1,17 +1,48 @@
-Release Notes - SABnzbd 4.4.0 Alpha 2
+Release Notes - SABnzbd 4.3.2
 =========================================================
 
-This is the first test release of SABnzbd 4.4.0.
+This is the second bug fix release of SABnzbd 4.3.0.
 
-## New features since 4.3.0
+## Bug fixes and changes since 4.3.1
 
-* Subtitle files will be deobfuscated if required.
-* macOS: Dropped support for macOS 10.12 and below.
+* Added Special option `disable_archive` for jobs to always be permanently deleted.
+* Specific AppRise notifications could fail to send.
+* Update of the article decoder core (`rapidyenc`).
+* Windows: After some time the interface would no longer load.
+* Windows: Custom shortcuts would be removed by the installer.
+* Windows/macOS: Updated Unrar to 7.01 and 7zip to 24.05.
 
-## Bug fixes since 4.3.0
+## Key changes since 4.2.0
 
-* Toggling of Servers could result in jobs being stuck at 99%.
-* Config restart would always determine redirect URL instead of using current.
+* **Archive:**
+    * When jobs are removed from the History, they are moved to the Archive.
+    * Keep your History clean and still be able to reliably use Duplicate Detection.
+
+* **Apprise Integrated:**
+    * Send notifications using Apprise to almost any notification service.
+    * Supported notifications: https://github.com/caronc/apprise/wiki
+    * Notification Script `SABnzbd-notify.py` is no longer needed.
+
+* **Added IPv6-staging option:**
+    * Enable `ipv6_staging` in Config - Specials to get additional IPv6 features:
+        * Add IPv6 hostnames during address selection.
+        * Internet Bandwidth is measured separately for IPv4 and IPv6.
+
+* **Other:**
+    * The `text` output format is removed from the API, `json` is the default.
+    * Handling of multiple inputs to several API methods was improved.
+    * File browser dialog is available to select file paths in the Config.
+    * Users will be warned if they configure an Indexer as a Server.
+    * Added `SAB_API_KEY` and `SAB_API_URL` to script environment variables.
+    * Windows/macOS: Updated Python to 3.12.3, Multipar to v1.3.3.2,
+      Unrar to 7.00 and 7zip to 24.03.
+
+## Bug fixes since 4.2.0
+
+* Incorrect warnings of unknown status codes could be thrown.
+* Watched Folder would not work if Socks5 proxy was active.
+* Prevent crash on invalid Server Expiration Date.
+* Windows: Installer could create duplicate shortcuts.
 
 ## Upgrade notices
 

SABnzbd.py

@@ -65,7 +65,7 @@ import sabnzbd
 import sabnzbd.lang
 import sabnzbd.interface
 from sabnzbd.constants import (
-    DEF_NETWORKING_TIMEOUT,
+    DEF_TIMEOUT,
     DEF_LOG_ERRFILE,
     DEF_MAIN_TMPL,
     DEF_STD_WEB_DIR,
@@ -170,8 +170,7 @@ class GUIHandler(logging.Handler):
         # This prevents endless looping if the notification service itself throws an error/warning
         # We don't check based on message content, because if it includes a timestamp it's not unique
         if not any(
-            stored_warning["origin"] == warning["origin"]
-            and stored_warning["time"] + DEF_NETWORKING_TIMEOUT > time.time()
+            stored_warning["origin"] == warning["origin"] and stored_warning["time"] + DEF_TIMEOUT > time.time()
             for stored_warning in self.store
         ):
             if record.levelno == logging.WARNING:
@@ -298,14 +297,14 @@ def daemonize():
         os.dup2(f.fileno(), sys.stderr.fileno())
 
 
-def abort_and_show_error(browserhost, web_port, err=""):
+def abort_and_show_error(browserhost, cherryport, err=""):
     """Abort program because of CherryPy troubles"""
     logging.error(T("Failed to start web-interface") + " : " + str(err))
     if not sabnzbd.DAEMON:
         if "49" in err:
-            panic_host(browserhost, web_port)
+            panic_host(browserhost, cherryport)
         else:
-            panic_port(browserhost, web_port)
+            panic_port(browserhost, cherryport)
     sabnzbd.halt()
     exit_sab(2)
 
@@ -531,19 +530,19 @@ def check_resolve(host):
     return True
 
 
-def get_webhost(web_host, web_port, https_port):
+def get_webhost(cherryhost, cherryport, https_port):
     """Determine the webhost address and port,
     return (host, port, browserhost)
     """
-    if web_host == "0.0.0.0" and not check_resolve("127.0.0.1"):
-        web_host = ""
-    elif web_host == "::" and not check_resolve("::1"):
-        web_host = ""
+    if cherryhost == "0.0.0.0" and not check_resolve("127.0.0.1"):
+        cherryhost = ""
+    elif cherryhost == "::" and not check_resolve("::1"):
+        cherryhost = ""
 
-    if web_host is None:
-        web_host = sabnzbd.cfg.web_host()
+    if cherryhost is None:
+        cherryhost = sabnzbd.cfg.cherryhost()
     else:
-        sabnzbd.cfg.web_host.set(web_host)
+        sabnzbd.cfg.cherryhost.set(cherryhost)
 
     # Get IP address, but discard APIPA/IPV6
     # If only APIPA's or IPV6 are found, fall back to localhost
@@ -555,10 +554,10 @@ def get_webhost(web_host, web_port, https_port):
         # Hostname does not resolve
         try:
             # Valid user defined name?
-            info = socket.getaddrinfo(web_host, None)
+            info = socket.getaddrinfo(cherryhost, None)
         except socket.error:
-            if not is_localhost(web_host):
-                web_host = "0.0.0.0"
+            if not is_localhost(cherryhost):
+                cherryhost = "0.0.0.0"
             try:
                 info = socket.getaddrinfo(localhost, None)
             except socket.error:
@@ -575,75 +574,75 @@ def get_webhost(web_host, web_port, https_port):
             hostip = ip
 
     # A blank host will use the local ip address
-    if web_host == "":
+    if cherryhost == "":
         if ipv6 and ipv4:
             # To protect Firefox users, use numeric IP
-            web_host = hostip
+            cherryhost = hostip
             browserhost = hostip
         else:
-            web_host = socket.gethostname()
-            browserhost = web_host
+            cherryhost = socket.gethostname()
+            browserhost = cherryhost
 
     # 0.0.0.0 will listen on all ipv4 interfaces (no ipv6 addresses)
-    elif web_host == "0.0.0.0":
+    elif cherryhost == "0.0.0.0":
         # Just take the gamble for this
-        web_host = "0.0.0.0"
+        cherryhost = "0.0.0.0"
         browserhost = localhost
 
     # :: will listen on all ipv6 interfaces (no ipv4 addresses)
-    elif web_host in ("::", "[::]"):
-        web_host = web_host.strip("[").strip("]")
+    elif cherryhost in ("::", "[::]"):
+        cherryhost = cherryhost.strip("[").strip("]")
         # Assume '::1' == 'localhost'
         browserhost = localhost
 
     # IPV6 address
-    elif "[" in web_host or ":" in web_host:
-        browserhost = web_host
+    elif "[" in cherryhost or ":" in cherryhost:
+        browserhost = cherryhost
 
     # IPV6 numeric address
-    elif web_host.replace(".", "").isdigit():
+    elif cherryhost.replace(".", "").isdigit():
         # IPV4 numerical
-        browserhost = web_host
+        browserhost = cherryhost
 
-    elif web_host == localhost:
-        web_host = localhost
+    elif cherryhost == localhost:
+        cherryhost = localhost
         browserhost = localhost
 
     else:
         # If on APIPA, use numerical IP, to help FireFoxers
         if ipv6 and ipv4:
-            web_host = hostip
-        browserhost = web_host
+            cherryhost = hostip
+        browserhost = cherryhost
 
         # Some systems don't like brackets in numerical ipv6
         if sabnzbd.MACOS:
-            web_host = web_host.strip("[]")
+            cherryhost = cherryhost.strip("[]")
         else:
             try:
-                socket.getaddrinfo(web_host, None)
+                socket.getaddrinfo(cherryhost, None)
             except socket.error:
-                web_host = web_host.strip("[]")
+                cherryhost = cherryhost.strip("[]")
 
-    if ipv6 and ipv4 and web_host == "" and sabnzbd.WIN32:
+    if ipv6 and ipv4 and cherryhost == "" and sabnzbd.WIN32:
         helpful_warning(T("Please be aware the 0.0.0.0 hostname will need an IPv6 address for external access"))
 
-    if web_host == "localhost" and not sabnzbd.WIN32 and not sabnzbd.MACOS:
+    if cherryhost == "localhost" and not sabnzbd.WIN32 and not sabnzbd.MACOS:
         # On the Ubuntu family, localhost leads to problems for CherryPy
         ips = ip_extract()
         if "127.0.0.1" in ips and "::1" in ips:
-            web_host = "127.0.0.1"
+            cherryhost = "127.0.0.1"
             if ips[0] != "127.0.0.1":
                 browserhost = "127.0.0.1"
 
     # This is to please Chrome on macOS
-    if web_host == "localhost" and sabnzbd.MACOS:
-        web_host = "127.0.0.1"
+    if cherryhost == "localhost" and sabnzbd.MACOS:
+        cherryhost = "127.0.0.1"
         browserhost = "localhost"
 
-    if web_port is None:
-        web_port = sabnzbd.cfg.web_port.get_int()
+    if cherryport is None:
+        cherryport = sabnzbd.cfg.cherryport.get_int()
     else:
-        sabnzbd.cfg.web_port.set(str(web_port))
+        sabnzbd.cfg.cherryport.set(str(cherryport))
 
     if https_port is None:
         https_port = sabnzbd.cfg.https_port.get_int()
@@ -652,12 +651,12 @@ def get_webhost(web_host, web_port, https_port):
         # if the https port was specified, assume they want HTTPS enabling also
         sabnzbd.cfg.enable_https.set(True)
 
-    if web_port == https_port and sabnzbd.cfg.enable_https():
+    if cherryport == https_port and sabnzbd.cfg.enable_https():
         sabnzbd.cfg.enable_https.set(False)
         # Should have a translated message, but that's not available yet
         logging.error(T("HTTP and HTTPS ports cannot be the same"))
 
-    return web_host, web_port, browserhost, https_port
+    return cherryhost, cherryport, browserhost, https_port
 
 
 def attach_server(host, port, cert=None, key=None, chain=None):
@@ -842,8 +841,8 @@ def main():
     fork = False
     pause = False
     inifile = None
-    web_host = None
-    web_port = None
+    cherryhost = None
+    cherryport = None
     https_port = None
     cherrypylogging = None
     clean_up = False
@@ -881,11 +880,14 @@ def main():
         elif opt in ("-t", "--templates"):
             web_dir = arg
         elif opt in ("-s", "--server"):
-            (web_host, web_port) = split_host(arg)
+            (cherryhost, cherryport) = split_host(arg)
         elif opt in ("-n", "--nobrowser"):
             autobrowser = False
         elif opt in ("-b", "--browser"):
-            autobrowser = sabnzbd.misc.bool_conv(arg)
+            try:
+                autobrowser = bool(int(arg))
+            except ValueError:
+                autobrowser = True
         elif opt == "--autorestarted":
             autorestarted = True
         elif opt in ("-c", "--clean"):
@@ -1004,24 +1006,24 @@ def main():
         sabnzbd.cfg.ipv6_hosting.set(ipv6_hosting)
 
     # Determine web host address
-    web_host, web_port, browserhost, https_port = get_webhost(web_host, web_port, https_port)
+    cherryhost, cherryport, browserhost, https_port = get_webhost(cherryhost, cherryport, https_port)
     enable_https = sabnzbd.cfg.enable_https()
 
     # When this is a daemon, just check and bail out if port in use
     if sabnzbd.DAEMON:
         if enable_https and https_port:
             try:
-                portend.free(web_host, https_port, timeout=0.05)
+                portend.free(cherryhost, https_port, timeout=0.05)
             except IOError:
-                abort_and_show_error(browserhost, web_port)
+                abort_and_show_error(browserhost, cherryport)
             except:
-                abort_and_show_error(browserhost, web_port, "49")
+                abort_and_show_error(browserhost, cherryport, "49")
         try:
-            portend.free(web_host, web_port, timeout=0.05)
+            portend.free(cherryhost, cherryport, timeout=0.05)
         except IOError:
-            abort_and_show_error(browserhost, web_port)
+            abort_and_show_error(browserhost, cherryport)
         except:
-            abort_and_show_error(browserhost, web_port, "49")
+            abort_and_show_error(browserhost, cherryport, "49")
 
     # Windows instance is reachable through registry
     url = None
@@ -1032,7 +1034,7 @@ def main():
 
     # SSL
     if enable_https:
-        port = https_port or web_port
+        port = https_port or cherryport
         try:
             portend.free(browserhost, port, timeout=0.05)
         except IOError as error:
@@ -1044,7 +1046,7 @@ def main():
                 if new_instance or not check_for_sabnzbd(url, upload_nzbs, autobrowser):
                     # Bail out if we have fixed our ports after first start-up
                     if sabnzbd.cfg.fixed_ports():
-                        abort_and_show_error(browserhost, web_port)
+                        abort_and_show_error(browserhost, cherryport)
                     # Find free port to bind
                     newport = find_free_port(browserhost, port)
                     if newport > 0:
@@ -1054,34 +1056,34 @@ def main():
                             sabnzbd.cfg.https_port.set(newport)
                         else:
                             # In case HTTPS == HTTP port
-                            web_port = newport
-                            sabnzbd.cfg.web_port.set(newport)
+                            cherryport = newport
+                            sabnzbd.cfg.cherryport.set(newport)
         except:
             # Something else wrong, probably badly specified host
-            abort_and_show_error(browserhost, web_port, "49")
+            abort_and_show_error(browserhost, cherryport, "49")
 
     # NonSSL check if there's no HTTPS or we only use 1 port
     if not (enable_https and not https_port):
         try:
-            portend.free(browserhost, web_port, timeout=0.05)
+            portend.free(browserhost, cherryport, timeout=0.05)
         except IOError as error:
             if str(error) == "Port not bound.":
                 pass
             else:
                 if not url:
-                    url = "http://%s:%s%s/api?" % (browserhost, web_port, sabnzbd.cfg.url_base())
+                    url = "http://%s:%s%s/api?" % (browserhost, cherryport, sabnzbd.cfg.url_base())
                 if new_instance or not check_for_sabnzbd(url, upload_nzbs, autobrowser):
                     # Bail out if we have fixed our ports after first start-up
                     if sabnzbd.cfg.fixed_ports():
-                        abort_and_show_error(browserhost, web_port)
+                        abort_and_show_error(browserhost, cherryport)
                     # Find free port to bind
-                    port = find_free_port(browserhost, web_port)
+                    port = find_free_port(browserhost, cherryport)
                     if port > 0:
-                        sabnzbd.cfg.web_port.set(port)
-                        web_port = port
+                        sabnzbd.cfg.cherryport.set(port)
+                        cherryport = port
         except:
             # Something else wrong, probably badly specified host
-            abort_and_show_error(browserhost, web_port, "49")
+            abort_and_show_error(browserhost, cherryport, "49")
 
     # We found a port, now we never check again
     sabnzbd.cfg.fixed_ports.set(True)
@@ -1275,29 +1277,29 @@ def main():
     # Starting of the webserver
     # Determine if this system has multiple definitions for 'localhost'
     hosts = all_localhosts()
-    multilocal = len(hosts) > 1 and web_host in ("localhost", "0.0.0.0")
+    multilocal = len(hosts) > 1 and cherryhost in ("localhost", "0.0.0.0")
 
     # For 0.0.0.0 CherryPy will always pick IPv4, so make sure the secondary localhost is IPv6
-    if multilocal and web_host == "0.0.0.0" and hosts[1] == "127.0.0.1":
+    if multilocal and cherryhost == "0.0.0.0" and hosts[1] == "127.0.0.1":
         hosts[1] = "::1"
 
     # The Windows binary requires numeric localhost as primary address
-    if web_host == "localhost":
-        web_host = hosts[0]
+    if cherryhost == "localhost":
+        cherryhost = hosts[0]
 
     if enable_https:
         if https_port:
             # Extra HTTP port for primary localhost
-            attach_server(web_host, web_port)
+            attach_server(cherryhost, cherryport)
             if multilocal:
                 # Extra HTTP port for secondary localhost
-                attach_server(hosts[1], web_port)
+                attach_server(hosts[1], cherryport)
                 # Extra HTTPS port for secondary localhost
                 attach_server(hosts[1], https_port, https_cert, https_key, https_chain)
-            web_port = https_port
+            cherryport = https_port
         elif multilocal:
             # Extra HTTPS port for secondary localhost
-            attach_server(hosts[1], web_port, https_cert, https_key, https_chain)
+            attach_server(hosts[1], cherryport, https_cert, https_key, https_chain)
 
         cherrypy.config.update(
             {
@@ -1309,7 +1311,7 @@ def main():
         )
     elif multilocal:
         # Extra HTTP port for secondary localhost
-        attach_server(hosts[1], web_port)
+        attach_server(hosts[1], cherryport)
 
     if no_login:
         sabnzbd.cfg.username.set("")
@@ -1332,8 +1334,8 @@ def main():
     cherrypy.config.update(
         {
             "server.environment": "production",
-            "server.socket_host": web_host,
-            "server.socket_port": web_port,
+            "server.socket_host": cherryhost,
+            "server.socket_port": cherryport,
             "server.shutdown_timeout": 0,
             "engine.autoreload.on": False,
             "tools.encode.on": True,
@@ -1401,7 +1403,7 @@ def main():
 
     # Set authentication for CherryPy
     sabnzbd.interface.set_auth(cherrypy.config)
-    logging.info("Starting web-interface on %s:%s", web_host, web_port)
+    logging.info("Starting web-interface on %s:%s", cherryhost, cherryport)
 
     sabnzbd.cfg.log_level.callback(guard_loglevel)
 
@@ -1411,7 +1413,7 @@ def main():
         # Since the webserver is started by cherrypy in a separate thread, we can't really catch any
         # start-up errors. This try/except only catches very few errors, the rest is only shown in the console.
         logging.error(T("Failed to start web-interface: "), exc_info=True)
-        abort_and_show_error(browserhost, web_port)
+        abort_and_show_error(browserhost, cherryport)
 
     # Create a record of the active cert/key/chain files, for use with config.create_config_backup()
     if enable_https:
@@ -1421,16 +1423,16 @@ def main():
 
     # Set URL for browser
     if enable_https:
-        sabnzbd.BROWSER_URL = "https://%s:%s%s" % (browserhost, web_port, sabnzbd.cfg.url_base())
+        sabnzbd.BROWSER_URL = "https://%s:%s%s" % (browserhost, cherryport, sabnzbd.cfg.url_base())
     else:
-        sabnzbd.BROWSER_URL = "http://%s:%s%s" % (browserhost, web_port, sabnzbd.cfg.url_base())
+        sabnzbd.BROWSER_URL = "http://%s:%s%s" % (browserhost, cherryport, sabnzbd.cfg.url_base())
 
     if sabnzbd.WIN32:
         # Write URL for uploads and version check directly to registry
         set_connection_info(f"{sabnzbd.BROWSER_URL}/api?apikey={sabnzbd.cfg.api_key()}")
 
     if pid_path or pid_file:
-        sabnzbd.pid_file(pid_path, pid_file, web_port)
+        sabnzbd.pid_file(pid_path, pid_file, cherryport)
 
     # Stop here in case of fatal errors
     if sabnzbd.NO_DOWNLOADING:
@@ -1458,11 +1460,11 @@ def main():
     autorestarted = False
 
     # Start SSDP and Bonjour if SABnzbd isn't listening on localhost only
-    if sabnzbd.cfg.enable_broadcast() and not is_localhost(web_host):
+    if sabnzbd.cfg.enable_broadcast() and not is_localhost(cherryhost):
         # Try to find a LAN IP address for SSDP/Bonjour
-        if is_lan_addr(web_host):
+        if is_lan_addr(cherryhost):
             # A specific listening address was configured, use that
-            external_host = web_host
+            external_host = cherryhost
         else:
             # Fall back to the IPv4 address of the LAN interface
             external_host = local_ipv4()
@@ -1476,13 +1478,13 @@ def main():
             (not sabnzbd.cfg.local_ranges()) or any(ip_in_subnet(external_host, r) for r in sabnzbd.cfg.local_ranges())
         ):
             # Start Bonjour and SSDP
-            sabnzbd.zconfig.set_bonjour(external_host, web_port)
+            sabnzbd.zconfig.set_bonjour(external_host, cherryport)
 
             # Set URL for browser for external hosts
             ssdp_url = "%s://%s:%s%s" % (
                 ("https" if enable_https else "http"),
                 external_host,
-                web_port,
+                cherryport,
                 sabnzbd.cfg.url_base(),
             )
             ssdp.start_ssdp(

builder/SABnzbd.spec

@@ -1,5 +1,6 @@
 # -*- mode: python -*-
 import os
+import re
 import sys
 
 from PyInstaller.building.api import EXE, COLLECT, PYZ
@@ -7,13 +8,13 @@ from PyInstaller.building.build_main import Analysis
 from PyInstaller.building.osx import BUNDLE
 from PyInstaller.utils.hooks import collect_data_files, collect_submodules
 
-from builder.constants import EXTRA_FILES, EXTRA_FOLDERS, RELEASE_VERSION, RELEASE_VERSION_TUPLE
+from builder.constants import EXTRA_FILES, EXTRA_FOLDERS, RELEASE_VERSION
 
 # Add extra files in the PyInstaller-spec
 extra_pyinstaller_files = []
 
 # Add hidden imports
-extra_hiddenimports = ["Cheetah.DummyTransaction", "cheroot.ssl.builtin", "certifi", "pkg_resources.extern"]
+extra_hiddenimports = ["Cheetah.DummyTransaction", "cheroot.ssl.builtin", "certifi"]
 extra_hiddenimports.extend(collect_submodules("apprise"))
 extra_hiddenimports.extend(collect_submodules("babelfish.converters"))
 extra_hiddenimports.extend(collect_submodules("guessit.data"))
@@ -44,12 +45,16 @@ else:
     EXTRA_FOLDERS += ["win/multipar/", "win/par2/", "win/unrar/", "win/7zip/"]
     EXTRA_FILES += ["portable.cmd"]
 
+    # Parse the version info
+    version_regexed = re.search(r"(\d+)\.(\d+)\.(\d+)([a-zA-Z]*)(\d*)", RELEASE_VERSION)
+    version_tuple = (int(version_regexed.group(1)), int(version_regexed.group(2)), int(version_regexed.group(3)), 0)
+
     # Detailed instructions are in the PyInstaller documentation
     # We don't include the alpha/beta/rc in the counters
     version_info = VSVersionInfo(
         ffi=FixedFileInfo(
-            filevers=RELEASE_VERSION_TUPLE,
-            prodvers=RELEASE_VERSION_TUPLE,
+            filevers=version_tuple,
+            prodvers=version_tuple,
             mask=0x3F,
             flags=0x0,
             OS=0x40004,
@@ -165,7 +170,7 @@ if sys.platform == "darwin":
                 "NSPersistentStoreTypeKey": "Binary",
             }
         ],
-        "LSMinimumSystemVersion": "10.13",
+        "LSMinimumSystemVersion": "10.9",
         "LSEnvironment": {"LANG": "en_US.UTF-8", "LC_ALL": "en_US.UTF-8"},
     }
 

builder/constants.py

@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import os
-import re
 
 # Constants
 VERSION_FILE = "sabnzbd/version.py"
@@ -34,10 +33,6 @@ RELEASE_VERSION = __version__
 # Pre-releases are longer than 6 characters (e.g. 3.1.0Beta1 vs 3.1.0, but also 3.0.11)
 PRERELEASE = len(RELEASE_VERSION) > 5
 
-# Parse the version info for Windows file properties information
-version_regexed = re.search(r"(\d+)\.(\d+)\.(\d+)([a-zA-Z]*)(\d*)", RELEASE_VERSION)
-RELEASE_VERSION_TUPLE = (int(version_regexed.group(1)), int(version_regexed.group(2)), int(version_regexed.group(3)), 0)
-
 # Define release name
 RELEASE_NAME = "SABnzbd-%s" % RELEASE_VERSION
 RELEASE_TITLE = "SABnzbd %s" % RELEASE_VERSION

builder/package.py

@@ -32,7 +32,6 @@ from typing import List
 
 from constants import (
     RELEASE_VERSION,
-    RELEASE_VERSION_TUPLE,
     VERSION_FILE,
     RELEASE_README,
     RELEASE_NAME,
@@ -259,8 +258,8 @@ if __name__ == "__main__":
                 [
                     "makensis.exe",
                     "/V3",
+                    "/DSAB_PRODUCT=%s" % RELEASE_NAME,
                     "/DSAB_VERSION=%s" % RELEASE_VERSION,
-                    "/DSAB_VERSIONKEY=%s" % ".".join(map(str, RELEASE_VERSION_TUPLE)),
                     "/DSAB_FILE=%s" % RELEASE_INSTALLER,
                     "NSIS_Installer.nsi.tmp",
                 ]

builder/release-requirements.txt

@@ -1,2 +1,2 @@
-PyGithub==2.4.0
+PyGithub==2.3.0
 praw==7.7.1

builder/requirements.txt

@@ -1,26 +1,26 @@
 # Basic build requirements
 # Note that not all sub-dependencies are listed, but only ones we know could cause trouble
 pyinstaller==5.13.2
-packaging==24.1
-pyinstaller-hooks-contrib==2024.8
+packaging==24.0
+pyinstaller-hooks-contrib==2024.6
 altgraph==0.17.4
 wrapt==1.16.0
-setuptools==75.1.0
+setuptools==69.5.1
 
 # Required on 32bit Windows, exclude it based on Python-version
-importlib_metadata==8.5.0; python_version < '3.10'
-importlib_resources==6.4.5; python_version < '3.10'
-zipp==3.20.2; python_version < '3.10'
+importlib_metadata==7.1.0; python_version < '3.10'
+importlib_resources==6.4.0; python_version < '3.10'
+zipp==3.18.2; python_version < '3.10'
 
 # orjson does not support 32bit Windows, also exclude based on Python-version
-orjson==3.10.7; python_version > '3.8'
+orjson==3.10.3; python_version > '3.8'
 
 # For the Windows build
-pefile==2024.8.26; sys_platform == 'win32'
-pywin32-ctypes==0.2.3; sys_platform == 'win32'
+pefile==2023.2.7; sys_platform == 'win32'
+pywin32-ctypes==0.2.2; sys_platform == 'win32'
 
 # For the macOS build
-dmgbuild==1.6.2; sys_platform == 'darwin'
+dmgbuild==1.6.1; sys_platform == 'darwin'
 mac-alias==2.2.2; sys_platform == 'darwin'
 macholib==1.16.3; sys_platform == 'darwin'
 ds-store==1.3.1; sys_platform == 'darwin'

builder/win/NSIS_Installer.nsi

@@ -68,18 +68,7 @@ Unicode true
 
 ;------------------------------------------------------------------
 ; Define names of the product
-  Name "SABnzbd ${SAB_VERSION}"
-  VIProductVersion "${SAB_VERSIONKEY}"
-  VIFileVersion "${SAB_VERSIONKEY}"
-
-  VIAddVersionKey "Comments" "SABnzbd ${SAB_VERSION}"
-  VIAddVersionKey "CompanyName" "The SABnzbd-Team"
-  VIAddVersionKey "FileDescription" "SABnzbd ${SAB_VERSION}"
-  VIAddVersionKey "FileVersion" "${SAB_VERSION}"
-  VIAddVersionKey "LegalCopyright" "The SABnzbd-Team"
-  VIAddVersionKey "ProductName" "SABnzbd ${SAB_VERSION}"
-  VIAddVersionKey "ProductVersion" "${SAB_VERSION}"
-
+  Name "${SAB_PRODUCT}"
   OutFile "${SAB_FILE}"
   InstallDir "$PROGRAMFILES\SABnzbd"
 

interfaces/Config/templates/_inc_header_uc.tmpl

@@ -92,7 +92,7 @@
                 <span class="icon-bar"></span>
             </button>
 
-            <a class="navbar-logo navbar-logo-small" href="${root}" title="$T('Home')" data-placement="bottom">
+            <a class="navbar-logo navbar-logo-small" href="${root}" title="$T('Home')">
                 #include $webdir + "/staticcfg/images/logo-small.svg"#
             </a>
         </div>

interfaces/Config/templates/config_general.tmpl

@@ -26,7 +26,7 @@
                     </div>
                     <div class="field-pair">
                         <label class="config" for="port">$T('opt-port')</label>
-                        <input type="number" name="port" id="port" value="$port" size="8" data-original="$port" min="0" max="65535" />
+                        <input type="number" name="port" id="port" value="$port" size="8" data-original="$port" />
                         <span class="desc">$T('explain-port')</span>
                     </div>
                     <div class="field-pair">
@@ -69,7 +69,7 @@
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="https_port">$T('opt-https_port')</label>
-                        <input type="number" name="https_port" id="https_port" value="$https_port" size="8" data-original="$https_port" min="0" max="65535" />
+                        <input type="number" name="https_port" id="https_port" value="$https_port" size="8" data-original="$https_port" />
                         <span class="desc">$T('explain-https_port')</span>
                     </div>
                     <div class="field-pair advanced-settings">

interfaces/Config/templates/config_notify.tmpl

@@ -10,13 +10,13 @@
             <label class="config wide" for="${section_label}_prio_$type">
                 $T($notify_types[$type]).replace('/', ' / ')
             </label>
-            <input type="checkbox" name="${section_label}_prio_$type" id="${section_label}_prio_$type" value="1" <!--#if $getVar($section_label + '_prio_' + $type) then 'checked="checked"' else ""#--> />
+            <input type="checkbox" name="${section_label}_prio_$type" id="${section_label}_prio_$type" value="1" <!--#if int($getVar($section_label + '_prio_' + $type)) > 0 then 'checked="checked"' else ""#--> />
         </div>
     <!--#end for#-->
 <!--#end def#-->
 
 <!--#def show_cat_box($section_label)#-->
-    <div class="col2-cats" <!--#if $getVar($section_label + '_enable') then '' else 'style="display:none"'#-->>
+    <div class="col2-cats" <!--#if int($getVar($section_label + '_enable')) > 0 then '' else 'style="display:none"'#-->>
         <hr>
         <b>$T('affectedCat')</b><br/>
         <select name="${section_label}_cats" multiple="multiple" class="multiple_cats" size="$len($categories)">
@@ -58,12 +58,12 @@
                 </div>
                 <div class="field-pair">
                     <label class="config" for="email_full">$T('opt-email_full')</label>
-                    <input type="checkbox" name="email_full" id="email_full" value="1" <!--#if $email_full then 'checked="checked"' else ""#--> />
+                    <input type="checkbox" name="email_full" id="email_full" value="1" <!--#if int($email_full) > 0 then 'checked="checked"' else ""#--> />
                     <span class="desc">$T('explain-email_full')</span>
                 </div>
                 <div class="field-pair">
                     <label class="config" for="email_rss">$T('opt-email_rss')</label>
-                    <input type="checkbox" name="email_rss" id="email_rss" value="1" <!--#if $email_rss then 'checked="checked"' else ""#--> />
+                    <input type="checkbox" name="email_rss" id="email_rss" value="1" <!--#if int($email_rss) > 0 then 'checked="checked"' else ""#--> />
                     <span class="desc">$T('explain-email_rss')</span>
                 </div>
                 <div class="field-pair">
@@ -107,12 +107,12 @@
             <h3>$T('section-NC')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="ncenter_enable" id="ncenter_enable" value="1" <!--#if $ncenter_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="ncenter_enable" id="ncenter_enable" value="1" <!--#if int($ncenter_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="ncenter_enable"> $T('opt-ncenter_enable')</label></td>
                 </tr>
             </table>
         </div>
-        <div class="col1" <!--#if $ncenter_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($ncenter_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('ncenter')
                 <div class="field-pair no-field-pair-bg">
@@ -132,13 +132,13 @@
             <h3>$T('section-AC')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="acenter_enable" id="acenter_enable" value="1" <!--#if $acenter_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="acenter_enable" id="acenter_enable" value="1" <!--#if int($acenter_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="acenter_enable"> $T('opt-acenter_enable')</label></td>
                 </tr>
             </table>
             $show_cat_box('acenter')
         </div>
-        <div class="col1" <!--#if $acenter_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($acenter_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('acenter')
                 <div class="field-pair no-field-pair-bg">
@@ -158,13 +158,13 @@
             <h3>$T('section-OSD') <a href="$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="ntfosd_enable" id="ntfosd_enable" value="1" <!--#if $ntfosd_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="ntfosd_enable" id="ntfosd_enable" value="1" <!--#if int($ntfosd_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="ntfosd_enable"> $T('opt-ntfosd_enable')</label></td>
                 </tr>
             </table>
             $show_cat_box('ntfosd')
         </div>
-        <div class="col1" <!--#if $ntfosd_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($ntfosd_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('ntfosd')
                 <div class="field-pair no-field-pair-bg">
@@ -183,7 +183,7 @@
             <h3>Apprise <a href="$help_uri#apprise" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="apprise_enable" id="apprise_enable" value="1" <!--#if $apprise_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="apprise_enable" id="apprise_enable" value="1" <!--#if int($apprise_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="apprise_enable"> $T('opt-apprise_enable')</label></td>
                 </tr>
             </table>
@@ -192,7 +192,7 @@
 
             $show_cat_box('apprise')
         </div>
-        <div class="col1" <!--#if $apprise_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($apprise_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
                     <label class="config" for="apprise_urls">$T('opt-apprise_urls')</label>
@@ -208,7 +208,7 @@
                         <label class="config" for="${section_label}_target_${type}">
                             $T($notify_types[$type]).replace('/', ' / ')
                         </label>
-                        <input type="checkbox" name="${section_label}_target_${type}_enable" id="${section_label}_target_${type}_enable" value="1" <!--#if $getVar($section_label + '_target_' + $type + '_enable') then 'checked="checked"' else ""#--> />
+                        <input type="checkbox" name="${section_label}_target_${type}_enable" id="${section_label}_target_${type}_enable" value="1" <!--#if int($getVar($section_label + '_target_' + $type + '_enable')) > 0 then 'checked="checked"' else ""#--> />
                         <input type="text" name="${section_label}_target_${type}" id="${section_label}_target_${type}" value="$getVar($section_label + '_target_' + $type)"  placeholder="$T('opt-apprise_urls')" />
                     </div>
                 <!--#end for#-->
@@ -228,14 +228,14 @@
             <h3>$T('section-NScript') <a href="$help_uri#nscript" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="nscript_enable" id="nscript_enable" value="1" <!--#if $nscript_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="nscript_enable" id="nscript_enable" value="1" <!--#if int($nscript_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="nscript_enable"> $T('opt-nscript_enable')</label></td>
                 </tr>
             </table>
             <em>$T('explain-nscript_enable')</em><br><a href="$help_uri#nscript" target="_blank">$T('readwiki')</a>
             $show_cat_box('nscript')
         </div>
-        <div class="col1" <!--#if $nscript_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($nscript_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
                     <label class="config" for="nscript_script">$T('opt-nscript_script')</label>
@@ -267,14 +267,14 @@
             <h3>$T('section-Prowl')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="prowl_enable" id="prowl_enable" value="1" <!--#if $prowl_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="prowl_enable" id="prowl_enable" value="1" <!--#if int($prowl_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="prowl_enable"> $T('opt-prowl_enable')</label></td>
                 </tr>
             </table>
             <em>$T('explain-prowl_enable')</em>
             $show_cat_box('prowl')
         </div>
-        <div class="col1" <!--#if $prowl_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($prowl_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
                     <label class="config" for="prowl_apikey">$T('opt-prowl_apikey')</label>
@@ -313,14 +313,14 @@
             <h3>$T('section-Pushover')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="pushover_enable" id="pushover_enable" value="1" <!--#if $pushover_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="pushover_enable" id="pushover_enable" value="1" <!--#if int($pushover_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="pushover_enable"> $T('opt-pushover_enable')</label></td>
                 </tr>
             </table>
             <em>$T('explain-pushover_enable')</em>
             $show_cat_box('pushover')
         </div>
-        <div class="col1" <!--#if $pushover_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($pushover_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
                     <label class="config" for="pushover_token">$T('opt-pushover_token')</label>
@@ -378,14 +378,14 @@
             <h3>$T('section-Pushbullet')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="pushbullet_enable" id="pushbullet_enable" value="1" <!--#if $pushbullet_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="pushbullet_enable" id="pushbullet_enable" value="1" <!--#if int($pushbullet_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                     <td><label for="pushbullet_enable"> $T('opt-pushbullet_enable')</label></td>
                 </tr>
             </table>
             <em>$T('explain-pushbullet_enable')</em>
             $show_cat_box('pushbullet')
         </div>
-        <div class="col1" <!--#if $pushbullet_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($pushbullet_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
                     <label class="config" for="pushbullet_apikey">$T('opt-pushbullet_apikey')</label>

interfaces/Config/templates/config_server.tmpl

@@ -28,7 +28,7 @@
         </label>
 
         <div class="advanced-buttonSeperator"></div>
-        <div class="chart-selector-container" title="$T('selectedDates')" data-placement="bottom">
+        <div class="chart-selector-container" title="$T('selectedDates')">
             <span class="glyphicon glyphicon-signal"></span>
             <!--#set today = datetime.date.today()#-->
             <input type="date" name="chart-start" id="chart-start" value="<!--#echo (today-datetime.timedelta(days=30)).strftime('%Y-%m-%d')#-->"> -
@@ -59,7 +59,7 @@
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="port">$T('srv-port')</label>
-                        <input type="number" name="port" id="port" size="8" value="563" min="0" max="65535" />
+                        <input type="number" name="port" id="port" size="8" value="563" min="0" />
                     </div>
                     <div class="field-pair">
                         <label class="config" for="ssl">$T('srv-ssl')</label>
@@ -142,7 +142,7 @@
         </div>
     </div>
 
-    <!--#set $prio_colors = ["#59cc33", "#26a69a", "#3366cc", "#7f33cc", "#cc33a6", "#f39c12", "#cc3333", "#8d6e63"] #-->
+    <!--#set $prio_colors = ["#59cc33", "#3366cc","#7f33cc", "#cc33a6", "#cc3333"] #-->
     <!--#set $cur_prio_color = -1 #-->
     <!--#set $last_prio = -1 #-->
     <!--#for $cur, $server in enumerate($servers) #-->
@@ -185,7 +185,7 @@
                         </div>
                         <div class="field-pair advanced-settings">
                             <label class="config" for="port$cur">$T('srv-port')</label>
-                            <input type="number" name="port" id="port$cur" value="$server['port']" size="8" min="0" max="65535" required />
+                            <input type="number" name="port" id="port$cur" value="$server['port']" size="8" min="0" required />
                         </div>
                         <div class="field-pair">
                             <label class="config" for="ssl$cur">$T('srv-ssl')</label>

interfaces/Config/templates/config_sorting.tmpl

@@ -71,7 +71,7 @@
                         <div class="field-pair">
                             <label class="config" for="field_sort_string_$cur">$T('sortString')</label>
                             <input type="text" name="sort_string" id="field_sort_string_$cur" value="$slot.sort_string" required="required" />
-                            <button type="button" class="btn btn-default patternKey" onclick="jQuery('#pattern_explainer_$cur').toggle(); window.scrollBy(0, 500);">
+                            <button type="button" title="$T('sort-legenda')" class="btn btn-default patternKey" onclick="jQuery('#pattern_explainer_$cur').toggle(); window.scrollBy(0, 500);">
                                 <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> $T('sort-legenda')
                             </button>
                         </div>

interfaces/Config/templates/config_switches.tmpl

@@ -69,7 +69,7 @@
                     </div>
                     <div class="field-pair">
                         <label class="config" for="propagation_delay">$T('opt-propagation_delay')</label>
-                        <input type="number" name="propagation_delay" id="propagation_delay" value="$propagation_delay" min="0" /> <i>$T('minutes')</i>
+                        <input type="number" name="propagation_delay" id="propagation_delay" value="$propagation_delay" /> <i>$T('minutes')</i>
                         <span class="desc">$T('explain-propagation_delay')</span>
                     </div>
                     <div class="field-pair advanced-settings">

interfaces/Config/templates/login/main.tmpl

@@ -1,4 +1,3 @@
-<!DOCTYPE HTML>
 <html lang="$active_lang">
 <head>
     <title>SABnzbd - $T('login')</title>
@@ -37,8 +36,8 @@
                 <div class="alert alert-danger" role="alert">$error</div>
                 <!--#end if#-->
 
-                <input type="text" class="form-control" name="username" placeholder="$T('srv-username')" autocomplete="username" required autofocus>
-                <input type="password" class="form-control" name="password" placeholder="$T('srv-password')" autocomplete="current-password" required>
+                <input type="text" class="form-control" name="username" placeholder="$T('srv-username')" required autofocus>
+                <input type="password" class="form-control" name="password" placeholder="$T('srv-password')" required>
 
                 <button class="btn btn-default"><span class="glyphicon glyphicon-circle-arrow-right"></span> $T('login') </button>
 
@@ -63,4 +62,4 @@
             } catch(err) { }
         </script>
     </body>
- </html>
+ </html>

interfaces/Config/templates/staticcfg/css/Night.css

@@ -208,7 +208,7 @@ ul.tabs a,
 #subscriptions,
 .RSS form[action="add_rss_feed"] tr:nth-child(even),
 .Config .table {
-    border: 1px solid #555555;
+    border: 1px solid #555555 !important;
 }
 
 .Categories form:first-of-type tr:last-of-type,

interfaces/Config/templates/staticcfg/css/style.css

@@ -19,7 +19,6 @@ body {
     float: left;
     overflow: visible;
     border: 1px solid #dfdede;
-    border-bottom: none !important;
     background-color: #FFF;
     width: 100%
 }
@@ -1223,6 +1222,7 @@ input[type="checkbox"] {
 }
 .value-and-select select {
     min-width: 30px;
+    margin-top: 1px;
 }
 
 .dotOne, .dotTwo, .dotThree {

interfaces/Config/templates/staticcfg/js/script.js

@@ -262,10 +262,9 @@ function do_restart() {
     // Show overlay
     $('.main-restarting').show()
 
-    // Check if we need redirect
-    // Uses == on purpose, because val() returns string and data() returns int!
+    // What template
     var switchedHTTPS = ($('#enable_https').is(':checked') === ($('#enable_https').data('original') === undefined))
-    var portsUnchanged  = ($('#port').val() == $('#port').data('original')) && ($('#https_port').val() == $('#https_port').data('original'))
+    var portsUnchanged  = ($('#port').val() === $('#port').data('original')) && ($('#https_port').val() === $('#https_port').data('original'))
 
     // Are we on settings page or did nothing change?
     if(!$('body').hasClass('General') || (!switchedHTTPS && portsUnchanged)) {
@@ -490,9 +489,6 @@ $(document).ready(function () {
         addRowColor()
     }
     addRowColor()
-
-    // Add tooltips
-    jQuery('[title]').tooltip()
 });
 
 /*

interfaces/Glitter/templates/include_overlays.tmpl

@@ -135,7 +135,7 @@
                             <div class="col-sm-6 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.pystone"></span>
                                 <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest') (~10 $T('seconds'))"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small title="$cpumodel $cpusimd $docker" data-tooltip="true">$cpumodel $cpusimd $docker</small>
+                                <small title="$cpumodel $cpusimd" data-tooltip="true">$cpumodel $cpusimd</small>
                             </div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
@@ -528,7 +528,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label">$T('category')</label>
                     <div class="col-sm-6">
-                        <select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText', optionsCaption: ''"></select>
+                        <select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText'"></select>
                         <span class="glyphicon glyphicon-tag"></span>
                     </div>
                 </div>
@@ -537,7 +537,7 @@
                     <div class="col-sm-6">
                         <!-- This list is different from the one during download! -->
                         <select name="Priority" class="form-control">
-                            <option value=""></option>
+                            <option value="-100">$T('default')</option>
                             <option value="2">$T('pr-force')</option>
                             <option value="1">$T('pr-high')</option>
                             <option value="0">$T('pr-normal')</option>
@@ -550,14 +550,14 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label">$T('swtag-pp')</label>
                     <div class="col-sm-6">
-                        <select name="Processing" class="form-control" data-bind="options: queue.processingOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: ''"></select>
+                        <select name="Processing" class="form-control" data-bind="options: queue.processingOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '$T('default')'"></select>
                         <span class="glyphicon glyphicon-check"></span>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-4 control-label">$T('eoq-scripts')</label>
                     <div class="col-sm-6">
-                        <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '', optionsValue: 'scriptValue', optionsText: 'scriptText', enable: (queue.scriptsList().length > 1)"></select>
+                        <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '$T('default')', optionsValue: 'scriptValue', optionsText: 'scriptText', enable: (queue.scriptsList().length > 1)"></select>
                         <span class="glyphicon glyphicon-flash"></span>
                     </div>
                 </div>

interfaces/Glitter/templates/static/javascripts/glitter.main.js

@@ -704,7 +704,6 @@ function ViewModel() {
         data.append("apikey", apiKey);
 
         // Add this one
-        debugger
         $.ajax({
             url: "./api",
             type: "POST",

interfaces/wizard/one.html

@@ -57,13 +57,13 @@
                             <div class="form-group">
                                 <label for="port" class="col-sm-4 control-label">$T('srv-port')</label>
                                 <div class="col-sm-8">
-                                    <input type="number" class="form-control" name="port" id="port" value="<!--#if $port then $port else '563' #-->" min="0" max="65535" />
+                                    <input type="number" class="form-control" name="port" id="port" value="<!--#if $port then $port else '563' #-->" />
                                 </div>
                             </div>
                             <div class="form-group">
                                 <label for="connections" class="col-sm-4 control-label">$T('srv-connections')</label>
                                 <div class="col-sm-8">
-                                    <input type="number" class="form-control" name="connections" id="connections" value="<!--#if $connections then $connections else '8'#-->" min="1" max="500" data-toggle="tooltip" data-placement="right" title="$T('wizard-server-con-explain') $T('wizard-server-con-eg')" />
+                                    <input type="number" class="form-control" name="connections" id="connections" value="<!--#if $connections then $connections else '8'#-->" data-toggle="tooltip" data-placement="right" title="$T('wizard-server-con-explain') $T('wizard-server-con-eg')" />
                                 </div>
                             </div>
                             <div class="form-group">

linux/org.sabnzbd.sabnzbd.appdata.xml

@@ -30,7 +30,6 @@
   <url type="faq">https://sabnzbd.org/wiki/faq</url>
   <url type="contact">https://sabnzbd.org/live-chat.html</url>
   <releases>
-    <release version="4.3.3" date="2024-08-01" type="stable"/>
     <release version="4.3.2" date="2024-05-30" type="stable"/>
     <release version="4.3.1" date="2024-05-03" type="stable"/>
     <release version="4.3.0" date="2024-05-01" type="stable"/>

po/email/SABemail.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.2RC1\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"

po/email/cs.po

@@ -3,7 +3,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Language-Team: Czech (https://app.transifex.com/sabnzbd/teams/111101/cs/)\n"
 "MIME-Version: 1.0\n"

po/email/da.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Danish (https://app.transifex.com/sabnzbd/teams/111101/da/)\n"

po/email/de.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: German (https://app.transifex.com/sabnzbd/teams/111101/de/)\n"

po/email/es.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Spanish (https://app.transifex.com/sabnzbd/teams/111101/es/)\n"

po/email/fi.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Finnish (https://app.transifex.com/sabnzbd/teams/111101/fi/)\n"

po/email/fr.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: French (https://app.transifex.com/sabnzbd/teams/111101/fr/)\n"

po/email/he.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: ION, 2020\n"
 "Language-Team: Hebrew (https://app.transifex.com/sabnzbd/teams/111101/he/)\n"

po/email/it.po

@@ -3,7 +3,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Language-Team: Italian (https://app.transifex.com/sabnzbd/teams/111101/it/)\n"
 "MIME-Version: 1.0\n"

po/email/nb.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Norwegian Bokmål (https://app.transifex.com/sabnzbd/teams/111101/nb/)\n"

po/email/nl.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Dutch (https://app.transifex.com/sabnzbd/teams/111101/nl/)\n"

po/email/pl.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Polish (https://app.transifex.com/sabnzbd/teams/111101/pl/)\n"

po/email/pt_BR.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Portuguese (Brazil) (https://app.transifex.com/sabnzbd/teams/111101/pt_BR/)\n"

po/email/ro.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Romanian (https://app.transifex.com/sabnzbd/teams/111101/ro/)\n"

po/email/ru.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Russian (https://app.transifex.com/sabnzbd/teams/111101/ru/)\n"

po/email/sr.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Serbian (https://app.transifex.com/sabnzbd/teams/111101/sr/)\n"

po/email/sv.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Swedish (https://app.transifex.com/sabnzbd/teams/111101/sv/)\n"

po/email/zh_CN.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/sabnzbd/teams/111101/zh_CN/)\n"

po/main/SABnzbd.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.2RC1\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"
@@ -399,10 +399,6 @@ msgstr ""
 msgid "Deobfuscate renamed %d file(s)"
 msgstr ""
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr ""

po/main/cs.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Czech (https://app.transifex.com/sabnzbd/teams/111101/cs/)\n"
@@ -434,10 +434,6 @@ msgstr ""
 msgid "Deobfuscate renamed %d file(s)"
 msgstr ""
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr "Přímé rozbalení"

po/main/da.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Danish (https://app.transifex.com/sabnzbd/teams/111101/da/)\n"
@@ -437,10 +437,6 @@ msgstr ""
 msgid "Deobfuscate renamed %d file(s)"
 msgstr ""
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr ""

po/main/de.po

@@ -14,13 +14,12 @@
 # HandyDandy04, 2024
 # Safihre <safihre@sabnzbd.org>, 2024
 # Gjelbrim Haskaj, 2024
-# Stefan Rodriguez Galeano, 2024
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
-"Last-Translator: Stefan Rodriguez Galeano, 2024\n"
+"Last-Translator: Gjelbrim Haskaj, 2024\n"
 "Language-Team: German (https://app.transifex.com/sabnzbd/teams/111101/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -258,7 +257,7 @@ msgstr "Die Verbindung konnte nicht überprüft werden. (%s)"
 
 #: sabnzbd/api.py
 msgid "Resolving address"
-msgstr "Adresse wird aufgelöst"
+msgstr "Adresse wird aufgelöst …"
 
 #. No value, used in dropdown menus
 #: sabnzbd/api.py, sabnzbd/skintext.py
@@ -478,10 +477,6 @@ msgstr "Entschleiern korrigierte die Erweiterung von %d Datei(en)"
 msgid "Deobfuscate renamed %d file(s)"
 msgstr "Entschleiern hat %dDatei(en) umbenannt"
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr "Umbenannte Untertiteldatei(en)%d verschleiern"
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr "Direkt entpacken"
@@ -562,7 +557,7 @@ msgstr "Schwerer Fehler im Downloader"
 #. Warning message
 #: sabnzbd/downloader.py
 msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr "%s@%s:Unbekannter Statuscode%s für Artikel erhalten %s"
+msgstr ""
 
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
@@ -1236,22 +1231,21 @@ msgstr "Prowl-Nachricht konnte nicht versendet werden"
 #. Warning message
 #: sabnzbd/notifier.py
 msgid "Failed to send Apprise message - no URLs defined"
-msgstr "Übertragung der Info-Nachricht fehlgeschlagen - keine URLs definiert"
+msgstr ""
 
 #. Warning message
 #: sabnzbd/notifier.py
 msgid "One or more Apprise URLs could not be loaded."
-msgstr "Eine oder mehrere Informations-URLs konnten nicht geladen werden."
+msgstr ""
 
 #: sabnzbd/notifier.py
 msgid "Failed to send one or more Apprise Notifications"
 msgstr ""
-"Eine oder mehrere Info-Benachrichtigungen konnten nicht gesendet werden"
 
 #. Warning message
 #: sabnzbd/notifier.py
 msgid "Failed to send Apprise message"
-msgstr "Info-Nachricht konnte nicht gesendet werden"
+msgstr ""
 
 #. Error message
 #: sabnzbd/notifier.py
@@ -2436,7 +2430,7 @@ msgstr "Alle Elemente in der Warteschlange löschen?"
 #. Delete confirmation popup
 #: sabnzbd/skintext.py
 msgid "Are you sure you want to remove these jobs?"
-msgstr "Sind Sie sicher, dass Sie diese Aufträge entfernen wollen?"
+msgstr ""
 
 #. Queue page button
 #: sabnzbd/skintext.py
@@ -2461,7 +2455,7 @@ msgstr "NZBs und Dateien löschen"
 #. Checkbox if job should be added to Archive
 #: sabnzbd/skintext.py
 msgid "Permanently delete (skip archive)"
-msgstr "erhaft löschen (Archiv überspringen)"
+msgstr ""
 
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
@@ -2484,7 +2478,7 @@ msgstr "Kontingent jetzt zurücksetzen"
 
 #: sabnzbd/skintext.py
 msgid "Archive"
-msgstr "Archiv"
+msgstr ""
 
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
@@ -2509,7 +2503,7 @@ msgstr "Alle anzeigen"
 #. Button showing all archived jobs
 #: sabnzbd/skintext.py
 msgid "Show Archive"
-msgstr "Zeige Archiv"
+msgstr ""
 
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
@@ -2802,11 +2796,11 @@ msgstr "Port, auf dem SABnzbd auf Anfragen warten soll."
 
 #: sabnzbd/skintext.py
 msgid "Web Interface Theme"
-msgstr "Benutzeroberfläche"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Choose a theme."
-msgstr "Wählen Sie ein Theme."
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "SABnzbd Username"
@@ -2977,36 +2971,28 @@ msgstr "Alle Aufträge behalten"
 msgid ""
 "Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
-"Verschieben von Aufträgen in das Archiv, wenn der Verlauf die angegebene "
-"Anzahl von Aufträgen überschreitet."
 
 #: sabnzbd/skintext.py
 msgid ""
 "Delete jobs if the history and archive exceeds specified number of jobs"
 msgstr ""
-"Löschen von Aufträgen, wenn der Verlauf und das Archiv die angegebene Anzahl"
-" von Aufträgen überschreiten"
 
 #: sabnzbd/skintext.py
 msgid "Move jobs to the archive after specified number of days"
 msgstr ""
-"Verschieben von Aufträgen in das Archiv nach einer bestimmten Anzahl von "
-"Tagen"
 
 #: sabnzbd/skintext.py
 msgid ""
 "Delete jobs from the history and archive after specified number of days"
 msgstr ""
-"Löschen von Aufträgen aus der Historie und dem Archiv nach einer bestimmten "
-"Anzahl von Tagen"
 
 #: sabnzbd/skintext.py
 msgid "Move all completed jobs to archive"
-msgstr "Alle abgeschlossenen Aufträge ins Archiv verschieben"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Delete all completed jobs"
-msgstr "Alle abgeschlossenen Aufträge löschen"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -3295,7 +3281,7 @@ msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Purge Logs"
-msgstr "Protokolle bereinigen"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid ".nzb Backup Folder"
@@ -3420,7 +3406,7 @@ msgstr "Aufgabe abgebrochen (verschoben in die Historie)"
 
 #: sabnzbd/skintext.py
 msgid "Abort post-processing"
-msgstr "Nachbearbeitung abbrechen"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3493,7 +3479,7 @@ msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "On queue finish script"
-msgstr "Skript zur Beendigung der Warteschlange"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Executed after the queue finishes downloading."
@@ -4294,13 +4280,11 @@ msgstr "Geräte, welche die Benachrichtigungen empfangen sollen"
 #. Apprise settings
 #: sabnzbd/skintext.py
 msgid "Enable Apprise notifications"
-msgstr "Aktivieren Sie Info-Benachrichtigungen"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Send notifications using Apprise to almost any notification service"
 msgstr ""
-"Senden Sie Benachrichtigungen mit Anfragen an fast jeden "
-"Benachrichtigungsdienst"
 
 #. Apprise settings
 #: sabnzbd/skintext.py
@@ -4311,15 +4295,11 @@ msgstr ""
 #: sabnzbd/skintext.py
 msgid "Use a comma and/or space to identify more than one URL."
 msgstr ""
-"Verwenden Sie ein Komma und/oder ein Leerzeichen, um mehr als eine URL zu "
-"kennzeichnen."
 
 #: sabnzbd/skintext.py
 msgid ""
 "Override the default URLs for specific notification types below, if desired."
 msgstr ""
-"Falls gewünscht, können Sie die Standard-URLs für bestimmte "
-"Benachrichtigungstypen unten überschreiben."
 
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
@@ -4818,9 +4798,6 @@ msgid ""
 "When you Retry a job, 'Duplicate Detection' and 'Abort jobs that cannot be "
 "completed' are disabled."
 msgstr ""
-"Wenn Sie einen Auftrag wiederholen, sind die Funktionen „Erkennung von "
-"Duplikaten“ und „Abbruch von Aufträgen, die nicht abgeschlossen werden "
-"können“ deaktiviert."
 
 #: sabnzbd/skintext.py
 msgid "View Script Log"
@@ -5055,7 +5032,7 @@ msgstr ""
 #. Error message
 #: sabnzbd/sorting.py
 msgid "Failed to rename %s to %s"
-msgstr "Fehler beim Umbenennen von %s nach %s"
+msgstr "Fehler beim umbennenen von %s nach %s"
 
 #. Error message
 #: sabnzbd/sorting.py

po/main/es.po

@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Spanish (https://app.transifex.com/sabnzbd/teams/111101/es/)\n"
@@ -455,10 +455,6 @@ msgstr ""
 msgid "Deobfuscate renamed %d file(s)"
 msgstr ""
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr "Descomprimir directamente"

po/main/fi.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Finnish (https://app.transifex.com/sabnzbd/teams/111101/fi/)\n"
@@ -433,10 +433,6 @@ msgstr ""
 msgid "Deobfuscate renamed %d file(s)"
 msgstr ""
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr ""

po/main/fr.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.2RC1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Fred L <88com88@gmail.com>, 2024\n"
 "Language-Team: French (https://app.transifex.com/sabnzbd/teams/111101/fr/)\n"
@@ -469,10 +469,6 @@ msgstr "La désobfuscation a corrigé l'extension de %d fichier(s)"
 msgid "Deobfuscate renamed %d file(s)"
 msgstr "La désobfuscation a renommé %d fichier(s)"
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr "Désobfusquer le(s) fichier(s) de sous-titres renommé(s) %d"
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr "Décompression Directe"

po/main/he.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: ION, 2024\n"
 "Language-Team: Hebrew (https://app.transifex.com/sabnzbd/teams/111101/he/)\n"
@@ -437,10 +437,6 @@ msgstr "אי־האפלה תיקנה את הסיומת של %d קבצים"
 msgid "Deobfuscate renamed %d file(s)"
 msgstr "אי־האפלה שינתה שם של %d קבצים"
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr "פריקה ישירה"

po/main/it.po

@@ -3,7 +3,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Language-Team: Italian (https://app.transifex.com/sabnzbd/teams/111101/it/)\n"
 "MIME-Version: 1.0\n"
@@ -420,10 +420,6 @@ msgstr ""
 msgid "Deobfuscate renamed %d file(s)"
 msgstr ""
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr ""

po/main/nb.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Norwegian Bokmål (https://app.transifex.com/sabnzbd/teams/111101/nb/)\n"
@@ -431,10 +431,6 @@ msgstr ""
 msgid "Deobfuscate renamed %d file(s)"
 msgstr ""
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr ""

po/main/nl.po

@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2024\n"
 "Language-Team: Dutch (https://app.transifex.com/sabnzbd/teams/111101/nl/)\n"
@@ -463,10 +463,6 @@ msgstr "Extensie van %d bestand(en) gecorrigeerd"
 msgid "Deobfuscate renamed %d file(s)"
 msgstr "Bestandsnamen van %d bestand(en) aangepast."
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr "Direct Uitpakken"

po/main/pl.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Polish (https://app.transifex.com/sabnzbd/teams/111101/pl/)\n"
@@ -430,10 +430,6 @@ msgstr ""
 msgid "Deobfuscate renamed %d file(s)"
 msgstr ""
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr ""

po/main/pt_BR.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Portuguese (Brazil) (https://app.transifex.com/sabnzbd/teams/111101/pt_BR/)\n"
@@ -444,10 +444,6 @@ msgstr ""
 msgid "Deobfuscate renamed %d file(s)"
 msgstr ""
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr ""

po/main/ro.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Romanian (https://app.transifex.com/sabnzbd/teams/111101/ro/)\n"
@@ -447,10 +447,6 @@ msgstr ""
 msgid "Deobfuscate renamed %d file(s)"
 msgstr ""
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr "Dezarhivare directă"

po/main/ru.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Russian (https://app.transifex.com/sabnzbd/teams/111101/ru/)\n"
@@ -430,10 +430,6 @@ msgstr ""
 msgid "Deobfuscate renamed %d file(s)"
 msgstr ""
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr ""

po/main/sr.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Serbian (https://app.transifex.com/sabnzbd/teams/111101/sr/)\n"
@@ -427,10 +427,6 @@ msgstr ""
 msgid "Deobfuscate renamed %d file(s)"
 msgstr ""
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr ""

po/main/sv.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Swedish (https://app.transifex.com/sabnzbd/teams/111101/sv/)\n"
@@ -428,10 +428,6 @@ msgstr ""
 msgid "Deobfuscate renamed %d file(s)"
 msgstr ""
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr ""

po/main/zh_CN.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Kangwei Li <lkw20010211@gmail.com>, 2023\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/sabnzbd/teams/111101/zh_CN/)\n"
@@ -425,10 +425,6 @@ msgstr ""
 msgid "Deobfuscate renamed %d file(s)"
 msgstr ""
 
-#: sabnzbd/deobfuscate_filenames.py
-msgid "Deobfuscate renamed %d subtitle file(s)"
-msgstr ""
-
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
 msgstr ""

po/nsis/SABnsis.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-4.3.2RC1\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"

po/nsis/cs.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Pavel C <quoing_transifex@mess.cz>, 2022\n"
 "Language-Team: Czech (https://app.transifex.com/sabnzbd/teams/111101/cs/)\n"

po/nsis/da.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Danish (https://app.transifex.com/sabnzbd/teams/111101/da/)\n"

po/nsis/de.po

@@ -9,7 +9,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Lorenz B, 2024\n"
 "Language-Team: German (https://app.transifex.com/sabnzbd/teams/111101/de/)\n"

po/nsis/es.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Ester Molla Aragones <moarages@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://app.transifex.com/sabnzbd/teams/111101/es/)\n"

po/nsis/fi.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Finnish (https://app.transifex.com/sabnzbd/teams/111101/fi/)\n"

po/nsis/fr.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Fred L <88com88@gmail.com>, 2024\n"
 "Language-Team: French (https://app.transifex.com/sabnzbd/teams/111101/fr/)\n"

po/nsis/he.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: ION, 2024\n"
 "Language-Team: Hebrew (https://app.transifex.com/sabnzbd/teams/111101/he/)\n"

po/nsis/it.po

@@ -3,7 +3,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Language-Team: Italian (https://app.transifex.com/sabnzbd/teams/111101/it/)\n"
 "MIME-Version: 1.0\n"

po/nsis/nb.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Norwegian Bokmål (https://app.transifex.com/sabnzbd/teams/111101/nb/)\n"

po/nsis/nl.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2024\n"
 "Language-Team: Dutch (https://app.transifex.com/sabnzbd/teams/111101/nl/)\n"

po/nsis/pl.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Polish (https://app.transifex.com/sabnzbd/teams/111101/pl/)\n"

po/nsis/pt_BR.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Portuguese (Brazil) (https://app.transifex.com/sabnzbd/teams/111101/pt_BR/)\n"

po/nsis/ro.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Romanian (https://app.transifex.com/sabnzbd/teams/111101/ro/)\n"

po/nsis/ru.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Russian (https://app.transifex.com/sabnzbd/teams/111101/ru/)\n"

po/nsis/sr.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Serbian (https://app.transifex.com/sabnzbd/teams/111101/sr/)\n"

po/nsis/sv.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Petter Ramme, 2024\n"
 "Language-Team: Swedish (https://app.transifex.com/sabnzbd/teams/111101/sv/)\n"

po/nsis/zh_CN.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/sabnzbd/teams/111101/zh_CN/)\n"

requirements.txt

@@ -1,73 +1,72 @@
 # Main requirements
 # Note that not all sub-dependencies are listed, but only ones we know could cause trouble
-apprise==1.9.0
-sabctools==8.2.5
+apprise==1.8.0
+sabctools==8.2.0
 CT3==3.3.3.post1
-cffi==1.17.1
+cffi==1.16.0
 pycparser==2.22
 feedparser==6.0.11
-configobj==5.0.9
+configobj==5.0.8
 cheroot==10.0.1
 six==1.16.0
-cherrypy==18.10.0
-jaraco.functools==4.1.0
+cherrypy==18.9.0
+jaraco.functools==4.0.1
 jaraco.collections==5.0.0
 jaraco.text==3.8.1 # Newer version introduces irrelevant extra dependencies
 jaraco.classes==3.4.0
 jaraco.context==4.3.0
-more-itertools==10.5.0
+more-itertools==10.2.0
 zc.lockfile==3.0.post1
 python-dateutil==2.9.0.post0
-tempora==5.7.0
-pytz==2024.2
+tempora==5.5.1
+pytz==2024.1
 sgmllib3k==1.0.0
 portend==3.2.0
 chardet==5.2.0
-pyunormalize==16.0.0
 PySocks==1.7.1
-puremagic==1.28
+puremagic==1.23
 guessit==3.8.0
 babelfish==0.6.1
 rebulk==3.2.0
 
 # Recent cryptography versions require Rust. If you run into issues compiling this
 # SABnzbd will also work with older pre-Rust versions such as cryptography==3.3.2
-cryptography==43.0.1
+cryptography==42.0.7
 
 # We recommend using "orjson" as it is 2x as fast as "ujson". However, it requires
 # Rust so SABnzbd works just as well with "ujson" or the Python built in "json" module
 ujson==5.10.0
 
 # Windows system integration
-pywin32==308; sys_platform == 'win32'
-windows-toasts==1.3.0; sys_platform == 'win32' and python_version > '3.8'
-winrt-runtime==2.2.0; sys_platform == 'win32' and python_version > '3.8'
-winrt-Windows.Data.Xml.Dom==2.2.0; sys_platform == 'win32' and python_version > '3.8'
-winrt-Windows.Foundation==2.2.0; sys_platform == 'win32' and python_version > '3.8'
-winrt-Windows.Foundation.Collections==2.2.0; sys_platform == 'win32' and python_version > '3.8'
-winrt-Windows.UI.Notifications==2.2.0; sys_platform == 'win32' and python_version > '3.8'
+pywin32==306; sys_platform == 'win32'
+windows-toasts==1.1.1; sys_platform == 'win32' and python_version > '3.8'
+winrt-runtime==2.0.1; sys_platform == 'win32' and python_version > '3.8'
+winrt-Windows.Data.Xml.Dom==2.0.1; sys_platform == 'win32' and python_version > '3.8'
+winrt-Windows.Foundation==2.0.1; sys_platform == 'win32' and python_version > '3.8'
+winrt-Windows.Foundation.Collections==2.0.1; sys_platform == 'win32' and python_version > '3.8'
+winrt-Windows.UI.Notifications==2.0.1; sys_platform == 'win32' and python_version > '3.8'
 
 # macOS system calls
-pyobjc-core==10.3.1; sys_platform == 'darwin'
-pyobjc-framework-Cocoa==10.3.1; sys_platform == 'darwin'
+pyobjc-core==10.2; sys_platform == 'darwin'
+pyobjc-framework-Cocoa==10.2; sys_platform == 'darwin'
 
 # Linux notifications
 notify2==0.3.1; sys_platform != 'win32' and sys_platform != 'darwin'
 
 # Apprise Requirements
-requests==2.32.3
+requests==2.31.0
 requests-oauthlib==2.0.0
-PyYAML==6.0.2
-markdown==3.7
+PyYAML==6.0.1
+markdown==3.6
 paho-mqtt==1.6.1 # Pinned, newer versions don't work with AppRise yet
 
 # Requests Requirements
-charset_normalizer==3.4.0
-idna==3.10
-urllib3==2.2.3
-certifi==2024.8.30
+charset_normalizer==3.3.2
+idna==3.7
+urllib3==2.2.1
+certifi==2024.2.2
 oauthlib==3.2.2
-PyJWT==2.9.0
+PyJWT==2.8.0
 blinker==1.8.2
 
 # Optional support for *nix tray icon.

sabnzbd/__init__.py

@@ -37,7 +37,7 @@ KERNEL32 = LIBC = MACOSLIBC = None
 
 if os.name == "nt":
     WIN32 = True
-    WIN64 = platform.uname().machine in ["AMD64", "ARM64"]  # includes emulation of X86_64 on Windows ARM64
+    WIN64 = platform.uname().machine == "AMD64"
     from sabnzbd.utils.apireg import del_connection_info
 
     try:
@@ -245,11 +245,10 @@ def initialize(pause_downloader=False, clean_up=False, repair=0):
 
     # Set call backs for Config items
     cfg.cache_limit.callback(cfg.new_limit)
-    cfg.web_host.callback(cfg.guard_restart)
-    cfg.web_port.callback(cfg.guard_restart)
+    cfg.cherryhost.callback(cfg.guard_restart)
+    cfg.cherryport.callback(cfg.guard_restart)
     cfg.web_dir.callback(cfg.guard_restart)
     cfg.web_color.callback(cfg.guard_restart)
-    cfg.url_base.callback(trigger_restart)
     cfg.username.callback(cfg.guard_restart)
     cfg.password.callback(cfg.guard_restart)
     cfg.log_dir.callback(cfg.guard_restart)
@@ -275,8 +274,30 @@ def initialize(pause_downloader=False, clean_up=False, repair=0):
     # Set end-of-queue action
     sabnzbd.misc.change_queue_complete_action(cfg.queue_complete(), new=False)
 
-    # Do any config conversions
-    cfg.config_conversions()
+    # Convert auto-sort
+    if cfg.auto_sort() == "0":
+        cfg.auto_sort.set("")
+    elif cfg.auto_sort() == "1":
+        cfg.auto_sort.set("avg_age asc")
+
+    # Convert old series/date/movie sorters
+    if not cfg.sorters_converted():
+        misc.convert_sorter_settings()
+        cfg.sorters_converted.set(True)
+
+    # Convert duplicate settings
+    if cfg.no_series_dupes():
+        cfg.no_smart_dupes.set(cfg.no_series_dupes())
+        cfg.no_series_dupes.set(0)
+
+    # Convert history retention setting
+    if cfg.history_retention():
+        misc.convert_history_retention()
+        cfg.history_retention.set("")
+
+    # Add hostname to the whitelist
+    if not cfg.host_whitelist():
+        cfg.host_whitelist.set(socket.gethostname())
 
     # Do repair if requested
     if misc.check_repair_request():
@@ -298,6 +319,10 @@ def initialize(pause_downloader=False, clean_up=False, repair=0):
     # Run startup tasks
     sabnzbd.NzbQueue.read_queue(repair)
     sabnzbd.Scheduler.analyse(pause_downloader)
+
+    # Set cache limit for new users
+    if not cfg.cache_limit():
+        cfg.cache_limit.set(misc.get_cache_limit())
     sabnzbd.ArticleCache.new_limit(cfg.cache_limit.get_int())
 
     logging.info("All processes started")

sabnzbd/api.py

@@ -54,7 +54,7 @@ from sabnzbd.constants import (
     AddNzbFileResult,
     PP_LOOKUP,
     STAGES,
-    DEF_NETWORKING_TEST_TIMEOUT,
+    DEF_TEST_TIMEOUT,
 )
 import sabnzbd.config as config
 import sabnzbd.cfg as cfg
@@ -76,7 +76,6 @@ from sabnzbd.misc import (
     change_queue_complete_action,
     clean_comma_separated_list,
     match_str,
-    bool_conv,
 )
 from sabnzbd.filesystem import diskspace, get_ext, clip_path, remove_all, list_scripts, purge_log_files, pathbrowser
 from sabnzbd.encoding import xml_name, utob
@@ -181,7 +180,7 @@ def _api_queue_delete(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> b
         removed = sabnzbd.NzbQueue.remove_all(kwargs.get("search"))
         return report(keyword="", data={"status": bool(removed), "nzo_ids": removed})
     elif items := clean_comma_separated_list(value):
-        delete_all_data = bool_conv(kwargs.get("del_files"))
+        delete_all_data = int_conv(kwargs.get("del_files"))
         removed = sabnzbd.NzbQueue.remove_multiple(items, delete_all_data=delete_all_data)
         return report(keyword="", data={"status": bool(removed), "nzo_ids": removed})
     else:
@@ -423,8 +422,8 @@ def _api_change_opts(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> byt
 def _api_fullstatus(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: full history status"""
     status = build_status(
-        calculate_performance=bool_conv(kwargs.get("calculate_performance")),
-        skip_dashboard=bool_conv(kwargs.get("skip_dashboard")),
+        calculate_performance=int_conv(kwargs.get("calculate_performance", 0)),
+        skip_dashboard=int_conv(kwargs.get("skip_dashboard", 1)),
     )
     return report(keyword="status", data=status)
 
@@ -488,7 +487,7 @@ def _api_history(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     search = kwargs.get("search")
     categories = clean_comma_separated_list(kwargs.get("cat") or kwargs.get("category"))
     statuses = clean_comma_separated_list(kwargs.get("status"))
-    failed_only = bool_conv(kwargs.get("failed_only"))
+    failed_only = int_conv(kwargs.get("failed_only"))
     nzo_ids = clean_comma_separated_list(kwargs.get("nzo_ids"))
 
     archive = True
@@ -499,7 +498,7 @@ def _api_history(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
             archive = False
 
         special = value.lower()
-        del_files = bool_conv(kwargs.get("del_files"))
+        del_files = bool(int_conv(kwargs.get("del_files")))
         if special in ("all", "failed", "completed"):
             history_db = sabnzbd.get_db_connection()
             if special in ("all", "failed"):
@@ -869,9 +868,9 @@ def _api_undefined(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes
 
 def _api_browse(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """Return tree of local path"""
-    compact = bool_conv(kwargs.get("compact"))
-    show_files = bool_conv(kwargs.get("show_files"))
-    show_hidden = bool_conv(kwargs.get("show_hidden_folders"))
+    compact = bool(int_conv(kwargs.get("compact")))
+    show_files = bool(int_conv(kwargs.get("show_files")))
+    show_hidden = bool(int_conv(kwargs.get("show_hidden_folders")))
 
     if compact:
         # Used for typeahead
@@ -1268,7 +1267,7 @@ def test_nntp_server_dict(kwargs: Dict[str, Union[str, List[str]]]) -> Tuple[boo
     password = kwargs.get("password", "").strip()
     server = kwargs.get("server", "").strip()
     connections = int_conv(kwargs.get("connections", 0))
-    timeout = int_conv(kwargs.get("timeout", DEF_NETWORKING_TEST_TIMEOUT))
+    timeout = int_conv(kwargs.get("timeout", DEF_TEST_TIMEOUT))
     ssl = int_conv(kwargs.get("ssl", 0))
     ssl_verify = int_conv(kwargs.get("ssl_verify", 1))
     ssl_ciphers = kwargs.get("ssl_ciphers", "").strip()
@@ -1287,7 +1286,7 @@ def test_nntp_server_dict(kwargs: Dict[str, Union[str, List[str]]]) -> Tuple[boo
 
     if not timeout:
         # Lower value during new server testing
-        timeout = DEF_NETWORKING_TEST_TIMEOUT
+        timeout = DEF_TEST_TIMEOUT
 
     if "*" in password and not password.strip("*"):
         # If the password is masked, try retrieving it from the config
@@ -1319,7 +1318,7 @@ def test_nntp_server_dict(kwargs: Dict[str, Union[str, List[str]]]) -> Tuple[boo
     if not test_server.addrinfo:
         # Try if we can connect on port 80 (so web server), forcing a short timeout
         test_server.port = 80
-        test_server.timeout = DEF_NETWORKING_TEST_TIMEOUT
+        test_server.timeout = DEF_TEST_TIMEOUT
         test_server.request_addrinfo_blocking()
         if test_server.addrinfo:
             return False, T(
@@ -1385,7 +1384,7 @@ def test_nntp_server_dict(kwargs: Dict[str, Union[str, List[str]]]) -> Tuple[boo
     return return_status
 
 
-def build_status(calculate_performance: bool = False, skip_dashboard: bool = False) -> Dict[str, Any]:
+def build_status(calculate_performance: int = False, skip_dashboard: int = False) -> Dict[str, Any]:
     # build up header full of basic information
     info = build_header(trans_functions=False)
 

sabnzbd/cfg.py

@@ -115,11 +115,9 @@ def validate_single_tag(value: List[str]) -> Tuple[None, List[str]]:
     return None, value
 
 
-def validate_url_base(value: str) -> Tuple[None, str]:
-    """Strips the right slash and adds starting slash, if not present"""
-    if value and isinstance(value, str):
-        if not value.startswith("/"):
-            value = "/" + value
+def validate_strip_right_slash(value: str) -> Tuple[None, str]:
+    """Strips the right slash"""
+    if value:
         return None, value.rstrip("/")
     return None, value
 
@@ -279,9 +277,6 @@ def validate_default_if_empty(root: str, value: str, default: str) -> Tuple[None
 # Special settings
 ##############################################################################
 
-# Increase everytime we do a configuration conversion
-config_conversion_version = OptionNumber("misc", "config_conversion_version", default_val=0)
-
 # This should be here so it's initialized first when the config is read
 helpful_warnings = OptionBool("misc", "helpful_warnings", True)
 
@@ -314,8 +309,8 @@ version_check = OptionNumber("misc", "check_new_rel", 1)
 autobrowser = OptionBool("misc", "auto_browser", True)
 language = OptionStr("misc", "language", "en")
 enable_https_verification = OptionBool("misc", "enable_https_verification", True)
-web_host = OptionStr("misc", "host", DEF_HOST, validation=validate_host)
-web_port = OptionStr("misc", "port", DEF_PORT)
+cherryhost = OptionStr("misc", "host", DEF_HOST, validation=validate_host)
+cherryport = OptionStr("misc", "port", DEF_PORT)
 https_port = OptionStr("misc", "https_port")
 username = OptionStr("misc", "username")
 password = OptionPassword("misc", "password")
@@ -491,7 +486,7 @@ wait_ext_drive = OptionNumber("misc", "wait_ext_drive", 5, minval=1, maxval=60)
 max_foldername_length = OptionNumber("misc", "max_foldername_length", DEF_FOLDER_MAX, minval=20, maxval=65000)
 marker_file = OptionStr("misc", "nomedia_marker")
 ipv6_servers = OptionBool("misc", "ipv6_servers", True)
-url_base = OptionStr("misc", "url_base", "", validation=validate_url_base)
+url_base = OptionStr("misc", "url_base", "/sabnzbd", validation=validate_strip_right_slash)
 host_whitelist = OptionList("misc", "host_whitelist", validation=all_lowercase)
 local_ranges = OptionList("misc", "local_ranges", protect=True)
 max_url_retries = OptionNumber("misc", "max_url_retries", 10, minval=1)
@@ -696,9 +691,7 @@ def set_root_folders2():
 ##############################################################################
 def new_limit():
     """Callback for article cache changes"""
-    if sabnzbd.__INITIALIZED__:
-        # Only update after full startup
-        sabnzbd.ArticleCache.new_limit(cache_limit.get_int())
+    sabnzbd.ArticleCache.new_limit(cache_limit.get_int())
 
 
 def guard_restart():
@@ -739,52 +732,3 @@ def guard_language():
 def guard_https_ver():
     """Callback for change of https verification"""
     sabnzbd.misc.set_https_verification(enable_https_verification())
-
-
-##############################################################################
-# Conversions
-##############################################################################
-
-
-def config_conversions():
-    """Update sections of the config, only once"""
-    # Basic old conversions
-    if config_conversion_version() < 1:
-        logging.info("Config conversion set 1")
-        # Convert auto-sort
-        if auto_sort() == "0":
-            auto_sort.set("")
-        elif auto_sort() == "1":
-            auto_sort.set("avg_age asc")
-
-        # Convert old series/date/movie sorters
-        if not sorters_converted():
-            sabnzbd.misc.convert_sorter_settings()
-            sorters_converted.set(True)
-
-        # Convert duplicate settings
-        if no_series_dupes():
-            no_smart_dupes.set(no_series_dupes())
-            no_series_dupes.set(0)
-
-        # Convert history retention setting
-        if history_retention():
-            sabnzbd.misc.convert_history_retention()
-            history_retention.set("")
-
-        # Add hostname to the whitelist
-        if not host_whitelist():
-            host_whitelist.set(socket.gethostname())
-
-        # Set cache limit for new users
-        if not cache_limit():
-            cache_limit.set(sabnzbd.misc.get_cache_limit())
-
-        # Done
-        config_conversion_version.set(1)
-
-    # url_base conversion
-    if config_conversion_version() < 2:
-        logging.info("Config conversion set 2")
-        # We did not end up applying this conversion, so we skip this conversion_version
-        pass

sabnzbd/config.py

@@ -120,8 +120,7 @@ class Option:
         """Set new value, no validation"""
         global CFG_MODIFIED
         if value is not None:
-            # Use get() to make sure we use default if nothing was set yet
-            if isinstance(value, list) or isinstance(value, dict) or value != self.get():
+            if isinstance(value, list) or isinstance(value, dict) or value != self.__value:
                 self.__value = value
                 CFG_MODIFIED = True
                 if self.__callback:
@@ -206,7 +205,7 @@ class OptionBool(Option):
 
     def set(self, value: Any):
         # Store the value as integer, easier to parse when reading the config.
-        super().set(sabnzbd.misc.bool_conv(value))
+        super().set(sabnzbd.misc.int_conv(value))
 
     def __call__(self) -> int:
         """get() replacement"""

sabnzbd/constants.py

@@ -49,7 +49,7 @@ RENAMES_FILE = "__renames__"
 ATTRIB_FILE = "SABnzbd_attrib"
 REPAIR_REQUEST = "repair-all.sab"
 
-SABCTOOLS_VERSION_REQUIRED = "8.2.5"
+SABCTOOLS_VERSION_REQUIRED = "8.2.0"
 
 DB_HISTORY_VERSION = 1
 DB_HISTORY_NAME = "history%s.db" % DB_HISTORY_VERSION
@@ -74,9 +74,8 @@ DEF_LOG_ERRFILE = "sabnzbd.error.log"
 DEF_LOG_CHERRY = "cherrypy.log"
 DEF_ARTICLE_CACHE_DEFAULT = "500M"
 DEF_ARTICLE_CACHE_MAX = "1G"
-DEF_NETWORKING_TIMEOUT = 60
-DEF_NETWORKING_TEST_TIMEOUT = 5
-DEF_NETWORKING_SHORT_TIMEOUT = 3
+DEF_TIMEOUT = 60
+DEF_TEST_TIMEOUT = 5
 DEF_SCANRATE = 5
 DEF_HTTPS_CERT_FILE = "server.cert"
 DEF_HTTPS_KEY_FILE = "server.key"
@@ -101,7 +100,6 @@ SOFT_QUEUE_LIMIT = 0.5
 # Percentage of cache to use before adding file to assembler
 ASSEMBLER_WRITE_THRESHOLD = 5
 NNTP_BUFFER_SIZE = int(800 * KIBI)
-NTTP_MAX_BUFFER_SIZE = int(10 * MEBI)
 
 REPAIR_PRIORITY = 3
 FORCE_PRIORITY = 2

sabnzbd/database.py

@@ -35,7 +35,7 @@ from sabnzbd.constants import DB_HISTORY_NAME, STAGES, Status, PP_LOOKUP
 from sabnzbd.bpsmeter import this_week, this_month
 from sabnzbd.decorators import synchronized
 from sabnzbd.encoding import ubtou, utob
-from sabnzbd.misc import caller_name, opts_to_pp, to_units, bool_conv, match_str
+from sabnzbd.misc import int_conv, caller_name, opts_to_pp, to_units
 from sabnzbd.filesystem import remove_file, clip_path
 
 DB_LOCK = threading.Lock()
@@ -129,7 +129,7 @@ class HistoryDB:
                     logging.error(T("Cannot write to History database, check access rights!"))
                     # Report back success, because there's no recovery possible
                     return True
-                elif match_str(error, ("not a database", "malformed", "no such table", "duplicate column name")):
+                elif "not a database" in error or "malformed" in error or "duplicate column name" in error:
                     logging.error(T("Damaged History database, created empty replacement"))
                     logging.info("Traceback: ", exc_info=True)
                     self.close()
@@ -141,7 +141,7 @@ class HistoryDB:
                     self.connect()
                     # Return False in case of "duplicate column" error
                     # because the column addition in connect() must be terminated
-                    return True
+                    return "duplicate column name" not in error
                 else:
                     logging.error(T("SQL Command Failed, see log"))
                     logging.info("SQL: %s", command)
@@ -596,7 +596,7 @@ def unpack_history_info(item: sqlite3.Row) -> Dict[str, Any]:
     item["archive"] = bool(item["archive"])
 
     # Retry and retry for failed URL-fetch
-    item["retry"] = bool_conv(item["status"] == Status.FAILED and item["path"] and os.path.exists(item["path"]))
+    item["retry"] = int_conv(item["status"] == Status.FAILED and item["path"] and os.path.exists(item["path"]))
     if item["report"] == "future":
         item["retry"] = True
 
@@ -604,5 +604,6 @@ def unpack_history_info(item: sqlite3.Row) -> Dict[str, Any]:
 
 
 def scheduled_history_purge():
+    logging.info("Scheduled history purge")
     with HistoryDB() as history_db:
         history_db.auto_history_purge()

sabnzbd/decoder.py

@@ -92,7 +92,7 @@ def decode(article: Article, data_view: memoryview):
         sabnzbd.Downloader.pause()
 
         # This article should be fetched again
-        article.allow_new_fetcher()
+        sabnzbd.NzbQueue.reset_try_lists(article)
         return
 
     except BadData as error:

sabnzbd/deobfuscate_filenames.py

@@ -27,13 +27,14 @@ files to the job-name in the queue if the filename looks obfuscated
 Based on work by P1nGu1n
 
 """
+
 import hashlib
 import logging
 import os
 import re
 
 import sabnzbd
-from sabnzbd.filesystem import get_unique_filename, renamer, get_ext, get_basename, listdir_normalized
+from sabnzbd.filesystem import get_unique_filename, renamer, get_ext, get_basename
 from sabnzbd.par2file import is_parfile, parse_par2_file
 import sabnzbd.utils.file_extension as file_extension
 from sabnzbd.misc import match_str
@@ -59,7 +60,7 @@ def decode_par2(parfile: str) -> List[str]:
     # Parse all files in the folder
     dirname = os.path.dirname(parfile)
     new_files = []  # list of new files generated
-    for fn in listdir_normalized(dirname):
+    for fn in os.listdir(dirname):
         filepath = os.path.join(dirname, fn)
         # Only check files
         if os.path.isfile(filepath):
@@ -168,29 +169,21 @@ def is_probably_obfuscated(myinputfilename: str) -> bool:
     return True  # default is obfuscated
 
 
-def get_biggest_file(filelist: List[str]) -> str:
-    """Returns biggest file if that file is much bigger than the other files
-    If only one file exists, return that. If no file, return None
-    Note: the files in filelist must exist, because their sizes on disk are checked"""
-
-    # sort from big to small
-    filelist = sorted(filelist, key=os.path.getsize)[::-1]  # reversed, so big to small. Format [start:stop:step]
+def first_file_is_much_bigger(filelist):
+    # returns True if first file is much bigger than second file
+    # Note: input parameter filelist must ordered on size!
     try:
         factor = os.path.getsize(filelist[0]) / os.path.getsize(filelist[1])
         if factor > 3:
-            return filelist[0]
+            return True
         else:
             return False
     except:
-        if len(filelist) == 1:
-            # the only file, so biggest
-            return filelist[0]
-        else:
-            # no existing file(s)
-            return None
+        # no second file at all
+        return True
 
 
-def deobfuscate(nzo, filelist: List[str], usefulname: str) -> List[str]:
+def deobfuscate(nzo, filelist: List[str], usefulname: str):
     """
     For files in filelist:
     1. if a file has no meaningful extension, add it (for example ".txt" or ".png")
@@ -232,60 +225,69 @@ def deobfuscate(nzo, filelist: List[str], usefulname: str) -> List[str]:
     nzo: sabnzbd.nzbstuff.NzbObject
 
     # to be sure, only keep really existing files and remove any duplicates:
-    filtered_filelist = list(set(f for f in filelist if os.path.isfile(f)))
+    filelist = set(f for f in filelist if os.path.isfile(f))
 
     # Do not deobfuscate/rename anything if there is a typical DVD or Bluray directory:
     ignored_movie_folders_with_dir_sep = tuple(os.path.sep + f + os.path.sep for f in IGNORED_MOVIE_FOLDERS)
-    match_ignored_movie_folders = [f for f in filtered_filelist if match_str(f, ignored_movie_folders_with_dir_sep)]
+    match_ignored_movie_folders = [f for f in filelist if match_str(f, ignored_movie_folders_with_dir_sep)]
     if match_ignored_movie_folders:
         logging.info(
             "Skipping deobfuscation because of DVD/Bluray directory name(s), like: %s",
             str(match_ignored_movie_folders)[:200],
         )
         nzo.set_unpack_info("Deobfuscate", T("Deobfuscate skipped due to DVD/Bluray directories"))
-        return filtered_filelist
+        return
 
     # If needed, add a useful extension (by looking at file contents)
     # Example: if 'kjladsflkjadf.adsflkjads' is probably a PNG, rename to 'kjladsflkjadf.adsflkjads.png'
-    new_filelist = []
+    newlist = []
     nr_ext_renamed = 0
-    for file in filtered_filelist:
+    for file in filelist:
         if file_extension.has_popular_extension(file):
             # common extension, like .doc or .iso, so assume OK and change nothing
             logging.debug("Extension of %s looks common", file)
-            new_filelist.append(file)
+            newlist.append(file)
         else:
             # uncommon (so: obfuscated) extension
-            if new_extension_to_add := file_extension.what_is_most_likely_extension(file):
+            new_extension_to_add = file_extension.what_is_most_likely_extension(file)
+            if new_extension_to_add:
                 new_name = get_unique_filename("%s%s" % (file, new_extension_to_add))
                 logging.info("Deobfuscate renaming (adding extension) %s to %s", file, new_name)
-                # Use output of renamer, just in case it's somehow modified by sanitization
-                new_filelist.append(renamer(file, new_name))
+                renamer(file, new_name)
+                newlist.append(new_name)
                 nr_ext_renamed += 1
             else:
                 # no new extension found
-                new_filelist.append(file)
+                newlist.append(file)
 
     if nr_ext_renamed:
         nzo.set_unpack_info("Deobfuscate", T("Deobfuscate corrected the extension of %d file(s)") % nr_ext_renamed)
-    filtered_filelist = new_filelist
-
-    nr_files_renamed = 0
+        filelist = newlist
 
     logging.debug("Trying to see if there are qualifying files to be deobfuscated")
+    nr_files_renamed = 0
 
-    if not (biggest_file := get_biggest_file(filtered_filelist)) or not os.path.isfile(biggest_file):
+    # We pick the biggest file ... probably the most important file
+    # so sort filelist on size:
+    filelist = sorted(filelist, key=os.path.getsize, reverse=True)
+    if filelist:
+        biggest_file = filelist[0]
+    else:
+        biggest_file = None
+    if not biggest_file or not os.path.isfile(biggest_file):
         # no file found, which is weird
-        logging.info("No biggest file found, or not found (%s)", biggest_file)
-        return filtered_filelist
-
+        logging.info("No file given, or not found (%s)", biggest_file)
+        return
     logging.debug("Deobfuscate inspecting biggest file%s", biggest_file)
+    if not first_file_is_much_bigger(filelist):
+        logging.debug("%s excluded from deobfuscation because it is not much bigger than other file(s)", biggest_file)
+        return
     if get_ext(biggest_file) in EXCLUDED_FILE_EXTS:
         logging.debug("%s excluded from deobfuscation because of excluded extension", biggest_file)
-        return filtered_filelist
+        return
     if not is_probably_obfuscated(biggest_file):
         logging.debug("%s excluded from deobfuscation because filename does not look obfuscated", biggest_file)
-        return filtered_filelist
+        return
 
     # if we get here, the biggest_file is relatively big, has no excluded extension, and is obfuscated
     # Rename the biggest_file and make sure the new filename is unique
@@ -293,89 +295,20 @@ def deobfuscate(nzo, filelist: List[str], usefulname: str) -> List[str]:
     # construct new_name: <path><usefulname><extension>
     new_name = get_unique_filename("%s%s" % (os.path.join(path, usefulname), get_ext(biggest_file)))
     logging.info("Deobfuscate renaming %s to %s", biggest_file, new_name)
-    filtered_filelist.remove(biggest_file)
-    filtered_filelist.append(renamer(biggest_file, new_name))
+    renamer(biggest_file, new_name)
     nr_files_renamed += 1
 
     # Now find other files with the same basename in filelist, and rename them in the same way:
     basedirfile = get_basename(biggest_file)  # something like "/home/this/myiso"
-    for otherfile in filtered_filelist[:]:
+    for otherfile in filelist:
         if otherfile.startswith(basedirfile) and os.path.isfile(otherfile):
             # yes, same basedirfile, only different ending
             remaining_ending = otherfile.replace(basedirfile, "")  # might be long ext, like ".dut.srt" or "-sample.iso"
             new_name = get_unique_filename("%s%s" % (os.path.join(path, usefulname), remaining_ending))
             logging.info("Deobfuscate renaming %s to %s", otherfile, new_name)
-            filtered_filelist.remove(otherfile)
-            filtered_filelist.append(renamer(otherfile, new_name))
+            # Rename and make sure the new filename is unique
+            renamer(otherfile, new_name)
             nr_files_renamed += 1
 
     if nr_files_renamed:
         nzo.set_unpack_info("Deobfuscate", T("Deobfuscate renamed %d file(s)") % nr_files_renamed)
-
-    return filtered_filelist
-
-
-def without_extension(fullpathfilename: str) -> str:
-    """Returns full file path, without extension
-    So '/some/dir/somefile.bin' results in '/some/dir/somefile'"""
-    return os.path.splitext(fullpathfilename)[0]
-
-
-def deobfuscate_subtitles(nzo, filelist: List[str]):
-    """
-    input:
-    nzo, so we can update result via set_unpack_info()
-    filelist must be a List of existing filenames
-
-    Find .srt subtitle files, and rename to match the biggest file (if there is a clearly biggest file)
-
-    Some_Big_File_2024.avi      # biggest file
-    Some_Big_File_2024.srt      # no renaming wanted
-    Some_Big_File_2024.ger.srt  # no renaming wanted
-    14_English.srt              # to be renamed
-    dut.srt                     # to be renamed
-    Something.else.txt          # no renaming wanted, because no .srt
-
-    will result in
-
-    Some_Big_File_2024.avi
-    Some_Big_File_2024.srt
-    Some_Big_File_2024.ger.srt
-    Some_Big_File_2024.14_English.srt   # renamed by prepending base name
-    Some_Big_File_2024.dut.srt          # renamed by prepending base name
-    Something.else.txt
-
-    """
-
-    # Can't be imported directly due to circular import
-    nzo: sabnzbd.nzbstuff.NzbObject
-
-    # find .srt files
-    if not (srt_files := [f for f in filelist if f.endswith(".srt")]):
-        logging.debug("No .srt files found, so nothing to do")
-        return None
-
-    # check there is a clearly biggest file
-    if not (biggest_file := get_biggest_file(filelist)):
-        logging.debug("No clearly biggest file found, so no subtitle renaming feasible")
-        return None
-
-    biggest_file_without_ext = without_extension(biggest_file)  # get full path base name of biggest file
-    logging.debug(f"Using as base filename: {biggest_file_without_ext}")
-
-    # handle srt files one by one
-    nr_files_renamed = 0
-    for srt_file in srt_files:
-        if without_extension(srt_file).startswith(biggest_file_without_ext):
-            # already the same start as the biggest file, so skip
-            continue
-        # not the same start, so rename the srt file
-        nr_files_renamed += 1
-        filename_only = os.path.basename(srt_file)  # like "14_English.srt", so without path
-        # now put that name after the base name of the biggestfile:
-        new_full_name = f"{biggest_file_without_ext}.{filename_only}"  # put (renamed) srt behind that
-        unique_filename = get_unique_filename(new_full_name)  # make sure it's really unique
-        renamer(srt_file, unique_filename)  # ... and rename actual file on disk
-    if nr_files_renamed > 0:
-        # and put it into history to be shown in GUI
-        nzo.set_unpack_info("Deobfuscate", T("Deobfuscate renamed %d subtitle file(s)") % nr_files_renamed)

sabnzbd/downloader.py

@@ -165,12 +165,11 @@ class Server:
         self.reset_article_queue()
 
     def stop(self):
-        """Remove all connections and cached articles from server"""
+        """Remove all connections from server"""
         for nw in self.idle_threads:
             sabnzbd.Downloader.remove_socket(nw)
             nw.hard_reset()
         self.idle_threads = set()
-        self.reset_article_queue()
 
     @synchronized(DOWNLOADER_LOCK)
     def get_article(self):
@@ -196,13 +195,10 @@ class Server:
                 self.next_article_search = time.time() + _SERVER_CHECK_DELAY
         return None
 
-    @synchronized(DOWNLOADER_LOCK)
     def reset_article_queue(self):
-        """Reset articles queued for the Server. Locked to prevent
-        articles getting stuck in the Server when enabled/disabled"""
-        logging.debug("Resetting article queue for %s (%s)", self, self.article_queue)
+        logging.debug("Resetting article queue for %s", self)
         for article in self.article_queue:
-            article.allow_new_fetcher()
+            sabnzbd.NzbQueue.reset_try_lists(article, remove_fetcher_from_trylist=False)
         self.article_queue = []
 
     def request_addrinfo(self):
@@ -215,7 +211,7 @@ class Server:
 
     def request_addrinfo_blocking(self):
         """Blocking attempt to run getaddrinfo() and Happy Eyeballs for specified server"""
-        logging.debug("Retrieving server address information for %s", self)
+        logging.debug("Retrieving server address information for %s", self.host)
 
         # Disable IPV6 if desired
         family = socket.AF_UNSPEC
@@ -233,7 +229,7 @@ class Server:
         sabnzbd.Downloader.wakeup()
 
     def __repr__(self):
-        return "<Server: id=%s, host=%s:%s>" % (self.id, self.host, self.port)
+        return "<Server: %s:%s>" % (self.host, self.port)
 
 
 class Downloader(Thread):
@@ -333,6 +329,7 @@ class Downloader(Thread):
                     create = False
                     server.newid = newserver
                     server.restart = True
+                    server.reset_article_queue()
                     self.server_restarts += 1
                     break
 
@@ -513,8 +510,8 @@ class Downloader(Thread):
         # Handle broken articles directly
         if not data_view:
             if not article.search_new_server():
-                article.nzf.nzo.increase_bad_articles_counter("missing_articles")
                 sabnzbd.NzbQueue.register_article(article, success=False)
+                article.nzf.nzo.increase_bad_articles_counter("missing_articles")
             return
 
         # Decode and send to article cache
@@ -707,14 +704,9 @@ class Downloader(Thread):
         except ssl.SSLWantReadError:
             return
         except (ConnectionError, ConnectionAbortedError):
-            # The ConnectionAbortedError is also thrown by sabctools in case of fatal SSL-layer problems
+            # The ConnectionAbortedError is thrown by sabctools in case of fatal SSL-layer problems
             self.__reset_nw(nw, "Server closed connection", wait=False)
             return
-        except BufferError:
-            # The BufferError is thrown when exceeding maximum buffer size
-            # Make sure to discard the article
-            self.__reset_nw(nw, "Maximum data buffer size exceeded", wait=False, retry_article=False)
-            return
 
         article = nw.article
         server = nw.server
@@ -968,9 +960,14 @@ class Downloader(Thread):
                 self.decode(nw.article)
                 nw.article.tries = 0
             else:
-                # Allow all servers again for this article
-                # Do not use the article_queue, as the server could already have been disabled when we get here!
-                nw.article.allow_new_fetcher()
+                # Retry again with the same server
+                logging.debug(
+                    "Re-adding article %s from %s to server %s",
+                    nw.article.article,
+                    nw.article.nzf.filename,
+                    nw.article.fetcher,
+                )
+                nw.article.fetcher.article_queue.append(nw.article)
 
         # Reset connection object
         nw.hard_reset(wait)

sabnzbd/encoding.py

@@ -20,7 +20,6 @@ sabnzbd.encoding - Unicode/byte translation functions
 """
 
 import locale
-import pyunormalize
 import chardet
 from xml.sax.saxutils import escape
 from typing import AnyStr
@@ -28,11 +27,6 @@ from typing import AnyStr
 CODEPAGE = locale.getpreferredencoding()
 
 
-def normalize_utf8(inputstring: str) -> str:
-    """Make sure we return an utf8 normalized version"""
-    return pyunormalize.NFC(inputstring)
-
-
 def utob(str_in: AnyStr) -> bytes:
     """Shorthand for converting UTF-8 string to bytes"""
     if isinstance(str_in, bytes):
@@ -43,19 +37,22 @@ def utob(str_in: AnyStr) -> bytes:
 def ubtou(str_in: AnyStr) -> str:
     """Shorthand for converting unicode bytes to UTF-8 string"""
     if isinstance(str_in, str):
-        return normalize_utf8(str_in)
-    return normalize_utf8(str_in.decode("utf-8"))
+        return str_in
+    return str_in.decode("utf-8")
 
 
 def platform_btou(str_in: AnyStr) -> str:
-    """Return Unicode string, if not already Unicode, decode with locale encoding"""
+    """Return Unicode string, if not already Unicode, decode with locale encoding.
+    NOTE: Used for POpen because universal_newlines/text parameter doesn't
+    always work! We cannot use encoding-parameter because it's Python 3.7+
+    """
     if isinstance(str_in, bytes):
         try:
             return ubtou(str_in)
         except UnicodeDecodeError:
-            return normalize_utf8(str_in.decode(CODEPAGE, errors="replace").replace("?", "!"))
+            return str_in.decode(CODEPAGE, errors="replace").replace("?", "!")
     else:
-        return normalize_utf8(str_in)
+        return str_in
 
 
 def correct_unknown_encoding(str_or_bytes_in: AnyStr) -> str:
@@ -74,10 +71,10 @@ def correct_unknown_encoding(str_or_bytes_in: AnyStr) -> str:
     except UnicodeDecodeError:
         try:
             # Try using 8-bit ASCII, if came from Windows
-            return normalize_utf8(str_or_bytes_in.decode("ISO-8859-1"))
+            return str_or_bytes_in.decode("ISO-8859-1")
         except ValueError:
             # Last resort we use the slow chardet package
-            return normalize_utf8(str_or_bytes_in.decode(chardet.detect(str_or_bytes_in)["encoding"]))
+            return str_or_bytes_in.decode(chardet.detect(str_or_bytes_in)["encoding"])
 
 
 def correct_cherrypy_encoding(inputstring: str) -> str:

sabnzbd/filesystem.py

@@ -46,7 +46,7 @@ except ImportError:
 import sabnzbd
 from sabnzbd.decorators import synchronized, cache_maintainer
 from sabnzbd.constants import FUTURE_Q_FOLDER, JOB_ADMIN, GIGI, DEF_FILE_MAX, IGNORED_FILES_AND_FOLDERS, DEF_LOG_FILE
-from sabnzbd.encoding import correct_unknown_encoding, utob, ubtou, normalize_utf8
+from sabnzbd.encoding import correct_unknown_encoding, utob, ubtou
 from sabnzbd.utils import rarfile
 
 
@@ -561,7 +561,7 @@ def globber(path: str, pattern: str = "*") -> List[str]:
     """Return matching base file/folder names in folder `path`"""
     # Cannot use glob.glob() because it doesn't support Windows long name notation
     if os.path.exists(path):
-        return [f for f in listdir_normalized(path) if safe_fnmatch(f, pattern)]
+        return [f for f in os.listdir(path) if safe_fnmatch(f, pattern)]
     return []
 
 
@@ -569,8 +569,7 @@ def globber_full(path: str, pattern: str = "*") -> List[str]:
     """Return matching full file/folder names in folder `path`"""
     # Cannot use glob.glob() because it doesn't support Windows long name notation
     if os.path.exists(path):
-        path = normalize_utf8(path)
-        return [os.path.join(path, f) for f in listdir_normalized(path) if safe_fnmatch(f, pattern)]
+        return [os.path.join(path, f) for f in os.listdir(path) if safe_fnmatch(f, pattern)]
     return []
 
 
@@ -582,7 +581,7 @@ def fix_unix_encoding(folder: str):
     if not sabnzbd.WIN32 and not sabnzbd.MACOS:
         for root, dirs, files in os.walk(folder):
             for name in files:
-                new_name = normalize_utf8(correct_unknown_encoding(name))
+                new_name = correct_unknown_encoding(name)
                 if name != new_name:
                     try:
                         renamer(os.path.join(root, name), os.path.join(root, new_name))
@@ -805,12 +804,6 @@ def get_unique_filename(path: str) -> str:
     return path
 
 
-def listdir_normalized(input_dir: str) -> List[str]:
-    """On macOS, the OS returns un-normalized results.
-    Always use the same normalization on all platforms"""
-    return [normalize_utf8(path) for path in os.listdir(input_dir)]
-
-
 @synchronized(DIR_LOCK)
 def listdir_full(input_dir: str, recursive: bool = True) -> List[str]:
     """List all files in dirs and sub-dirs"""
@@ -819,7 +812,7 @@ def listdir_full(input_dir: str, recursive: bool = True) -> List[str]:
         for file in files:
             # Ignore special folders and resources files created by macOS
             if not sabnzbd.misc.match_str(root, IGNORED_FILES_AND_FOLDERS) and not file.startswith("._"):
-                filelist.append(normalize_utf8(os.path.join(root, file)))
+                filelist.append(os.path.join(root, file))
         if not recursive:
             break
     return filelist
@@ -1393,7 +1386,7 @@ def pathbrowser(path: str, show_hidden: bool = False, show_files: bool = False)
 
     # List all files and folders
     file_list = []
-    for filename in listdir_normalized(path):
+    for filename in os.listdir(path):
         fpath = os.path.join(path, filename)
         isdir = os.path.isdir(fpath)
 

sabnzbd/getipaddress.py

@@ -25,7 +25,7 @@ import socket
 import time
 import urllib.error
 import urllib.request
-from typing import Callable, Optional
+from typing import Callable
 
 import socks
 
@@ -33,10 +33,9 @@ import sabnzbd
 import sabnzbd.cfg
 from sabnzbd.encoding import ubtou
 from sabnzbd.happyeyeballs import happyeyeballs, family_type
-from sabnzbd.constants import DEF_NETWORKING_SHORT_TIMEOUT
 
 
-def timeout(max_timeout: int):
+def timeout(max_timeout: float):
     """Timeout decorator, parameter in seconds."""
 
     def timeout_decorator(item: Callable) -> Callable:
@@ -57,29 +56,29 @@ def timeout(max_timeout: int):
     return timeout_decorator
 
 
-@timeout(DEF_NETWORKING_SHORT_TIMEOUT)
+@timeout(3.0)
 def addresslookup(myhost):
     return socket.getaddrinfo(myhost, 80)
 
 
-@timeout(DEF_NETWORKING_SHORT_TIMEOUT)
+@timeout(3.0)
 def addresslookup4(myhost):
     return socket.getaddrinfo(myhost, 80, socket.AF_INET)
 
 
-@timeout(DEF_NETWORKING_SHORT_TIMEOUT)
+@timeout(3.0)
 def addresslookup6(myhost):
     return socket.getaddrinfo(myhost, 80, socket.AF_INET6)
 
 
-def active_socks5_proxy() -> Optional[str]:
+def active_socks5_proxy():
     """Return the active proxy"""
     if socket.socket == socks.socksocket:
         return "%s:%s" % socks.socksocket.default_proxy[1:3]
     return None
 
 
-def dnslookup() -> bool:
+def dnslookup():
     """Perform a basic DNS lookup"""
     start = time.time()
     try:
@@ -91,7 +90,7 @@ def dnslookup() -> bool:
     return result
 
 
-def local_ipv4() -> Optional[str]:
+def local_ipv4():
     try:
         with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s_ipv4:
             # Option: use 100.64.1.1 (IANA-Reserved IPv4 Prefix for Shared Address Space)
@@ -104,17 +103,12 @@ def local_ipv4() -> Optional[str]:
     return ipv4
 
 
-def public_ip(family: int = socket.AF_UNSPEC) -> Optional[str]:
+def public_ip(family=socket.AF_UNSPEC):
     """
     Reports the client's public IP address (IPv4 or IPv6, if specified by family), as reported by selftest host
     """
     start = time.time()
-    if resolvehostaddress := happyeyeballs(
-        sabnzbd.cfg.selftest_host(),
-        port=443,
-        timeout=DEF_NETWORKING_SHORT_TIMEOUT,
-        family=family,
-    ):
+    if resolvehostaddress := happyeyeballs(sabnzbd.cfg.selftest_host(), port=443, family=family):
         resolvehostip = resolvehostaddress.ipaddress
     else:
         logging.debug("Error resolving my IP address: resolvehost not found")
@@ -132,7 +126,7 @@ def public_ip(family: int = socket.AF_UNSPEC) -> Optional[str]:
         req = urllib.request.Request(resolveurl)
         req.add_header("Host", sabnzbd.cfg.selftest_host())
         req.add_header("User-Agent", "SABnzbd/%s" % sabnzbd.__version__)
-        with urllib.request.urlopen(req, timeout=DEF_NETWORKING_SHORT_TIMEOUT) as open_req:
+        with urllib.request.urlopen(req, timeout=2) as open_req:
             client_ip = ubtou(open_req.read().strip())
 
         # Make sure it's a valid IPv4 or IPv6 address
@@ -152,11 +146,11 @@ def public_ip(family: int = socket.AF_UNSPEC) -> Optional[str]:
     return client_ip
 
 
-def public_ipv4() -> Optional[str]:
+def public_ipv4():
     return public_ip(family=socket.AF_INET)
 
 
-def local_ipv6() -> Optional[str]:
+def local_ipv6():
     """
     return IPv6 address on local LAN interface. So a first check if there is IPv6 connectivity
     """
@@ -173,8 +167,8 @@ def local_ipv6() -> Optional[str]:
     return ipv6_address
 
 
-def public_ipv6() -> Optional[str]:
-    if (local_address := local_ipv6()) and not sabnzbd.misc.ip_in_subnet(local_address, "fe80::/10"):
+def public_ipv6():
+    if local_address := local_ipv6():
         if public_address := public_ip(family=socket.AF_INET6):
             return public_address
         elif not sabnzbd.misc.is_lan_addr(local_address):

sabnzbd/happyeyeballs.py

@@ -34,7 +34,7 @@ from typing import Tuple, Union, Optional
 from more_itertools import roundrobin
 
 import sabnzbd.cfg as cfg
-from sabnzbd.constants import DEF_NETWORKING_TIMEOUT
+from sabnzbd.constants import DEF_TIMEOUT
 from sabnzbd.decorators import cache_maintainer
 
 # How long to delay between connection attempts? The RFC suggests 250ms, but this is
@@ -118,12 +118,7 @@ def do_socket_connect(result_queue: queue.Queue, addrinfo: AddrInfo, timeout: in
 
 @cache_maintainer(clear_time=10)
 @functools.lru_cache(maxsize=None)
-def happyeyeballs(
-    host: str,
-    port: int,
-    timeout: int = DEF_NETWORKING_TIMEOUT,
-    family=socket.AF_UNSPEC,
-) -> Optional[AddrInfo]:
+def happyeyeballs(host: str, port: int, timeout: int = DEF_TIMEOUT, family=socket.AF_UNSPEC) -> Optional[AddrInfo]:
     """Return the fastest result of getaddrinfo() based on RFC 6555/8305 (Happy Eyeballs),
     including IPv6 addresses if desired. Returns None in case no addresses were returned
     by getaddrinfo or if no connection could be made to any of the addresses.

sabnzbd/interface.py

@@ -80,7 +80,7 @@ from sabnzbd.constants import (
     GUESSIT_SORT_TYPES,
     VALID_NZB_FILES,
     VALID_ARCHIVES,
-    DEF_NETWORKING_TEST_TIMEOUT,
+    DEF_TEST_TIMEOUT,
 )
 from sabnzbd.lang import list_languages
 from sabnzbd.api import (
@@ -395,8 +395,9 @@ def Raiser(root: str = "", **kwargs):
     if kwargs:
         root = "%s?%s" % (root, urllib.parse.urlencode(kwargs))
 
-    # Add the leading /sabnzbd/ (or what the user set)
-    root = cfg.url_base() + root
+    # Optionally add the leading /sabnzbd/ (or what the user set)
+    if not root.startswith(cfg.url_base()):
+        root = cherrypy.request.script_name + root
 
     # Log the redirect
     if cfg.api_logging():
@@ -433,7 +434,6 @@ class MainPage:
 
             info["cpumodel"] = get_cpu_name()
             info["cpusimd"] = sabnzbd.decoder.SABCTOOLS_SIMD
-            info["docker"] = "Docker" if sabnzbd.DOCKER else ""
 
             # Have logout only with HTML and if inet=5, only when we are external
             info["have_logout"] = (
@@ -577,7 +577,7 @@ class Wizard:
 def get_access_info():
     """Build up a list of url's that sabnzbd can be accessed from"""
     # Access_url is used to provide the user a link to SABnzbd depending on the host
-    web_host = cfg.web_host()
+    cherryhost = cfg.cherryhost()
     host = socket.gethostname().lower()
     logging.info("hostname is", host)
     socks = [host]
@@ -587,7 +587,7 @@ def get_access_info():
     except:
         addresses = []
 
-    if web_host == "0.0.0.0":
+    if cherryhost == "0.0.0.0":
         # Grab a list of all ips for the hostname
         for addr in addresses:
             address = addr[4][0]
@@ -595,7 +595,7 @@ def get_access_info():
             if ":" not in address and address not in socks:
                 socks.append(address)
         socks.insert(0, "localhost")
-    elif web_host == "::":
+    elif cherryhost == "::":
         # Grab a list of all ips for the hostname
         for addr in addresses:
             address = addr[4][0]
@@ -605,8 +605,8 @@ def get_access_info():
                 if address not in socks:
                     socks.append(address)
         socks.insert(0, "localhost")
-    elif web_host:
-        socks = [web_host]
+    elif cherryhost:
+        socks = [cherryhost]
 
     # Add the current requested URL as the base
     access_url = urllib.parse.urljoin(cherrypy.request.base, cfg.url_base())
@@ -617,9 +617,9 @@ def get_access_info():
             if cfg.enable_https() and cfg.https_port():
                 url = "https://%s:%s%s" % (sock, cfg.https_port(), cfg.url_base())
             elif cfg.enable_https():
-                url = "https://%s:%s%s" % (sock, cfg.web_port(), cfg.url_base())
+                url = "https://%s:%s%s" % (sock, cfg.cherryport(), cfg.url_base())
             else:
-                url = "http://%s:%s%s" % (sock, cfg.web_port(), cfg.url_base())
+                url = "http://%s:%s%s" % (sock, cfg.cherryport(), cfg.url_base())
             urls.append(url)
 
     # Return a unique list
@@ -641,7 +641,7 @@ class LoginPage:
 
         # Check if there's even a username/password set
         if check_login():
-            raise Raiser("/")
+            raise Raiser(cherrypy.request.script_name + "/")
 
         # Check login info
         if kwargs.get("username") == cfg.username() and kwargs.get("password") == cfg.password():
@@ -650,7 +650,7 @@ class LoginPage:
             # Log the success
             logging.info("Successful login from %s", cherrypy.request.remote_label)
             # Redirect
-            raise Raiser("/")
+            raise Raiser(cherrypy.request.script_name + "/")
         elif kwargs.get("username") or kwargs.get("password"):
             info["error"] = T("Authentication failed, check username/password.")
             # Warn about the potential security problem
@@ -1144,9 +1144,7 @@ def handle_server(kwargs, root=None, new_svr=False):
         kwargs["connections"] = "1"
 
     if kwargs.get("enable") == "1":
-        if not happyeyeballs(
-            host, int_conv(port), int_conv(kwargs.get("timeout"), default=DEF_NETWORKING_TEST_TIMEOUT)
-        ):
+        if not happyeyeballs(host, int_conv(port), int_conv(kwargs.get("timeout"), default=DEF_TEST_TIMEOUT)):
             return badParameterResponse(T('Server address "%s:%s" is not valid.') % (host, port), ajax)
 
     # Default server name is just the host name
@@ -2158,10 +2156,8 @@ class ConfigNotify:
 
         for section in NOTIFY_OPTIONS:
             for option in NOTIFY_OPTIONS[section]:
-                conf[option] = config.get_config(section, option)()
-
-        # Use get_string to make sure lists are displayed correctly
-        conf["email_to"] = cfg.email_to.get_string()
+                # Use get_string to make sure lists are displayed correctly
+                conf[option] = config.get_config(section, option).get_string()
 
         return template_filtered_response(
             file=os.path.join(sabnzbd.WEB_DIR_CONFIG, "config_notify.tmpl"),

sabnzbd/internetspeed.py

@@ -30,7 +30,6 @@ from typing import Dict
 
 import sabctools
 import sabnzbd
-from sabnzbd.constants import DEF_NETWORKING_SHORT_TIMEOUT
 from sabnzbd.happyeyeballs import happyeyeballs, family_type
 
 TEST_HOSTNAME = "sabnzbd.org"
@@ -38,6 +37,7 @@ TEST_PORT = 443
 TEST_FILE = "/tests/internetspeed/100MB.bin"
 TEST_FILE_SIZE = 100 * 1024 * 1024
 TEST_REQUEST = f"GET {TEST_FILE} HTTP/1.1\nHost: {TEST_HOSTNAME}\nUser-Agent: SABnzbd/{sabnzbd.__version__}\n\n"
+SOCKET_TIMEOUT = 3
 BUFFER_SIZE = 5 * 1024 * 1024  # Each connection will allocate its own buffer, so mind the memory usage!
 
 NR_CONNECTIONS = 5
@@ -75,45 +75,33 @@ def internetspeed_worker(secure_sock: ssl.SSLSocket, socket_speed: Dict[ssl.SSLS
         pass
 
 
-def internetspeed_interal(family: int = socket.AF_UNSPEC) -> float:
+def internetspeed_interal(test_time_limit: int = TIME_LIMIT, family: int = socket.AF_UNSPEC) -> float:
     """Measure internet speed from a test-download using our optimized SSL-code"""
 
     context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH)
     socket_speed = {}
 
     try:
-        if not (addrinfo := happyeyeballs(TEST_HOSTNAME, TEST_PORT, DEF_NETWORKING_SHORT_TIMEOUT, family)):
-            # no addrinfo from happyeyeballs, so no connection was possible
-            return 0.0  # no speed at all
-
+        addrinfo = happyeyeballs(TEST_HOSTNAME, TEST_PORT, SOCKET_TIMEOUT, family)
         for _ in range(NR_CONNECTIONS):
             sock = socket.socket(addrinfo.family, addrinfo.type)
-            sock.settimeout(DEF_NETWORKING_SHORT_TIMEOUT)
+            sock.settimeout(SOCKET_TIMEOUT)
             sock.connect(addrinfo.sockaddr)
             secure_sock = context.wrap_socket(sock, server_hostname=TEST_HOSTNAME)
             secure_sock.setblocking(False)
             socket_speed[secure_sock] = 0
 
         for secure_sock in socket_speed:
-            threading.Thread(
-                target=internetspeed_worker,
-                args=(secure_sock, socket_speed),
-                daemon=True,
-            ).start()
+            threading.Thread(target=internetspeed_worker, args=(secure_sock, socket_speed), daemon=True).start()
     except Exception:
         logging.info("Internet Bandwidth connection failure", exc_info=True)
         return 0.0
 
     # We let the workers finish
-    time.sleep(TIME_LIMIT + 0.5)
+    time.sleep(test_time_limit + 0.5)
 
     speed = sum(socket_speed.values()) / 1024 / 1024
-    logging.debug(
-        "Internet Bandwidth (%s) = %.2f MB/s - %.2f Mbps",
-        family_type(family),
-        speed,
-        speed * 8.05,
-    )
+    logging.debug("Internet Bandwidth (%s) = %.2f MB/s - %.2f Mbps", family_type(family), speed, speed * 8.05)
     return speed
 
 

sabnzbd/misc.py

@@ -167,9 +167,10 @@ def calc_age(date: datetime.datetime, trans: bool = False) -> str:
 
 def safe_lower(txt: Any) -> str:
     """Return lowercased string. Return '' for None"""
-    if txt := str_conv(txt):
+    if txt:
         return txt.lower()
-    return ""
+    else:
+        return ""
 
 
 def is_none(inp: Any) -> bool:
@@ -218,18 +219,17 @@ def cat_pp_script_sanitizer(
     script: Optional[str] = None,
 ) -> Tuple[Optional[Union[int, str]], Optional[str], Optional[str]]:
     """Basic sanitizer from outside input to a bit more predictable values"""
-    # * and Default are valid values
-    if safe_lower(cat) in ("", "none"):
-        cat = None
-
     # Cannot use "not pp" because pp can also be 0
-    if safe_lower(pp) in ("", "-1", "none"):
+    if pp in ("", "-1"):
         pp = None
 
     # Check for valid script is performed in NzbObject init
-    if not script or safe_lower(script) == "default":
+    if not script or script.lower() == "default":
         script = None
 
+    if not cat or cat.lower() in ("default", "*"):
+        cat = None
+
     return cat, pp, script
 
 
@@ -281,7 +281,7 @@ def cat_to_opts(cat, pp=None, script=None, priority=None) -> Tuple[str, int, str
 def pp_to_opts(pp: Optional[int]) -> Tuple[bool, bool, bool]:
     """Convert numeric processing options to (repair, unpack, delete)"""
     # Convert the pp to an int
-    pp = int_conv(pp)
+    pp = sabnzbd.interface.int_conv(pp)
     if pp == 0:
         return False, False, False
     if pp == 1:
@@ -882,18 +882,7 @@ def format_time_string(seconds: float) -> str:
     return " ".join(completestr)
 
 
-def str_conv(value: Any, default: str = "") -> str:
-    """Safe conversion to str (None will be converted to empty string)
-    Returns empty string or requested default value"""
-    if value is None:
-        return default
-    try:
-        return str(value)
-    except:
-        return default
-
-
-def int_conv(value: Any, default: int = 0) -> int:
+def int_conv(value: Any, default: Any = 0) -> int:
     """Safe conversion to int (can handle None)
     Returns 0 or requested default value"""
     try:
@@ -902,12 +891,6 @@ def int_conv(value: Any, default: int = 0) -> int:
         return default
 
 
-def bool_conv(value: Any) -> bool:
-    """Safe conversion to bool (can handle None)
-    Returns False in case of None or non-convertable value"""
-    return bool(int_conv(value))
-
-
 def create_https_certificates(ssl_cert, ssl_key):
     """Create self-signed HTTPS certificates and store in paths 'ssl_cert' and 'ssl_key'"""
     try:

sabnzbd/newsunpack.py

@@ -63,7 +63,6 @@ from sabnzbd.filesystem import (
     SEVENMULTI_RE,
     is_size,
     get_basename,
-    listdir_normalized,
 )
 from sabnzbd.nzbstuff import NzbObject
 import sabnzbd.cfg as cfg
@@ -1021,7 +1020,7 @@ def par2_repair(nzo: NzbObject, setname: str) -> Tuple[bool, bool]:
         return False, True
 
     parfile = os.path.join(nzo.download_path, parfile_nzf.filename)
-    old_dir_content = listdir_normalized(nzo.download_path)
+    old_dir_content = os.listdir(nzo.download_path)
     used_joinables = ()
     joinables = ()
     used_for_repair = ()
@@ -1081,7 +1080,7 @@ def par2_repair(nzo: NzbObject, setname: str) -> Tuple[bool, bool]:
     try:
         if cfg.enable_par_cleanup():
             deletables = []
-            new_dir_content = listdir_normalized(nzo.download_path)
+            new_dir_content = os.listdir(nzo.download_path)
 
             # If Multipar or par2cmdline repairs a broken part of a joinable, it doesn't list it as such.
             # So we need to manually add all joinables of the set to the list of used joinables.

sabnzbd/newswrapper.py

@@ -30,14 +30,14 @@ from typing import Optional, Tuple, Union
 
 import sabnzbd
 import sabnzbd.cfg
-from sabnzbd.constants import DEF_NETWORKING_TIMEOUT, NNTP_BUFFER_SIZE, NTTP_MAX_BUFFER_SIZE
+from sabnzbd.constants import DEF_TIMEOUT, NNTP_BUFFER_SIZE
 from sabnzbd.encoding import utob, ubtou
 from sabnzbd.happyeyeballs import AddrInfo
 from sabnzbd.decorators import synchronized, DOWNLOADER_LOCK
 from sabnzbd.misc import int_conv
 
 # Set pre-defined socket timeout
-socket.setdefaulttimeout(DEF_NETWORKING_TIMEOUT)
+socket.setdefaulttimeout(DEF_TIMEOUT)
 
 
 class NNTPPermanentError(Exception):
@@ -230,10 +230,6 @@ class NewsWrapper:
 
     def increase_data_buffer(self):
         """Resize the buffer in the extremely unlikely case that it overflows"""
-        # Sanity check before we go any further
-        if len(self.data) > NTTP_MAX_BUFFER_SIZE:
-            raise BufferError("Maximum data buffer size exceeded")
-
         # Input needs to be integer, floats don't work
         new_buffer = sabctools.bytearray_malloc(len(self.data) + NNTP_BUFFER_SIZE // 2)
         new_buffer[: len(self.data)] = self.data