Set version to 3.2.0

draft release

.github/workflows/black.yml

@@ -19,4 +19,3 @@ jobs:
             --line-length=120
             --target-version=py36
             --check
-            --diff

.github/workflows/build_release.yml

@@ -73,7 +73,7 @@ jobs:
       # We need the official Python, because the GA ones only support newer macOS versions
       # The deployment target is picked up by the Python build tools automatically
       # If updated, make sure to also set LSMinimumSystemVersion in SABnzbd.spec
-      PYTHON_VERSION: 3.9.5
+      PYTHON_VERSION: 3.9.2
       MACOSX_DEPLOYMENT_TARGET: 10.9
     steps:
     - uses: actions/checkout@v2

.github/workflows/translations.yml

@@ -24,9 +24,6 @@ jobs:
           tx pull --all --force --parallel
         env:
           TX_TOKEN: ${{ secrets.TX_TOKEN }}
-      - name: Compile translations to validate them
-        run: |
-          python3 tools/make_mo.py
       - name: Push translatable and translated texts back to repo
         uses: stefanzweifel/git-auto-commit-action@v4.5.1
         with:

.gitignore

@@ -31,9 +31,6 @@ SABnzbd-*/
 *.wp[ru]
 .idea
 
-# VScode
-.vscode/
-
 # Testing folders
 .cache
 .xprocess

INSTALL.txt

@@ -1,4 +1,4 @@
-                            SABnzbd 3.3.0
+                            SABnzbd 3.2.0
 
 -------------------------------------------------------------------------------
 0) LICENSE

ISSUES.txt

@@ -14,13 +14,13 @@
   For these the server blocking method is not very favourable.
   There is an INI-only option that will limit blocks to 1 minute.
       no_penalties = 1
-  See: https://sabnzbd.org/wiki/configuration/3.3/special
+  See: https://sabnzbd.org/wiki/configuration/3.2/special
 
 - Some third-party utilties try to probe SABnzbd API in such a way that you will
   often see warnings about unauthenticated access.
   If you are sure these probes are harmless, you can suppress the warnings by
   setting the option "api_warnings" to 0.
-  See: https://sabnzbd.org/wiki/configuration/3.3/special
+  See: https://sabnzbd.org/wiki/configuration/3.2/special
 
 - On macOS you may encounter downloaded files with foreign characters.
   The par2 repair may fail when the files were created on a Windows system.

PKG-INFO

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

README.mkd

@@ -1,48 +1,67 @@
-Release Notes - SABnzbd 3.3.0 Release Candidate 2
+Release Notes - SABnzbd 3.2.0
 =========================================================
 
-## Changes and bugfixes since 3.3.0 Release Candidate 1
-- Failure to start on some platforms.
-- Stability improvement to encrypted RAR-detection.
-- Allow missing extensions in `Unwanted extensions` detection.
-- Removed Special setting `max_art_opt`.
-- Prevent jobs getting stuck at 99% due to unreliable servers.
+## Changes since 3.1.1
+- Python 3.6 is the minimum required version. 
+- The Windows installer can only be used on 64bit Windows 8.1 and 
+  above. For 32bit systems or older Windows versions, the 
+  standalone 32bit legacy version can be used.
+- Post-processing can be aborted at any stage, including scripts.
+- Improvements in the downloader to reduce CPU-load.
+- Increased garbage collection rate to reduce memory usage.
+- Custom date ranges for server graphs can be selected.
+- Keep track of article fetching success-rate of each server.
+- Added option to add download quota warning for each server.
+- Added option to add expiration warning for each server.
+- Added `Minimum Free Space for Completed Download Folder` option.
+- Added option to `Auto resume` for both `Minimum Free Space` settings.
+- Added `Auto` option for Glitter that enables `Night` style 
+  based on system settings. Default for new installations.
+- Multiple additional Queue and History columns can be added.
+- Added option to always use full-screen width.
+- Additional interface settings can be stored server-side.
+- Right-to-Left support (Hebrew) for Glitter and Config.
+- Using SSDP, SABnzbd instances are now listed in `Network` on Windows.
+- Improvements to parsing of job name and filenames listed in the NZB.
+- RSS titles can be edited.
+- Prospective par2 will add blocks from all sets in a job.
+- Sanitize all filenames to a maximum of 245 characters.
+- Show commit hash when running from `git` sources.
+- Notify through Notifications if a new version is available.
+- Program shutdown time reduced to almost instant.
+- Added `10 GB` test download.
+- IPv6 is no longer preferred in HappyEyeballs address selection.
+- API-calls `queue` and `history` can now be filtered by `nzo_id`.
+- Windows: `Temporary Download` job folders no longer have a maximum length.
+- Windows/macOS: Update UnRar to 6.0.0 and MultiPar to 1.3.1.3.
 
-## Changes since 3.2.1
-- The `External internet access` will automatically detect local network
-  and no longer requires local network ranges to be defined. Custom ranges 
-  can still be defined through `local_ranges` in Special settings.
-- Allow setting `inet_exposure` from the command line.
-- Support prefix and netmask for Special setting `local_ranges`.
-- The `Unwanted extensions` detection can be set to `Whitelist`-mode. 
-  This will block or pause all jobs with non-matching extensions.
-- Servers article statistics are shown in K, G, M-notation.
-- Resolution added as a pattern key (`%r`) for Sorting.
-- Optimized performance of par2 file parsing.
-- CPU usage optimizations in the download process.
-- Revised handling of categories, scripts, and priorities when adding NZB's.
-- Download statistics are also shown when no History is shown.
-- Confirm rename if Direct Unpack is active for the job.
-- Obfuscated-RAR detection will always be performed.
-- All requests will be logged, not just API calls.
-- Windows/macOS: Update UnRar to 6.0.1.
-- Windows: Update Multipar to 1.3.1.7 (adds faster verification).
-
-## Bugfixes since 3.2.1
-- Prevent failed post-processing if job name ends in multiple dots or spaces.
-- Failing articles could result in jobs being stuck at 99%.
-- Jobs could be stuck in the queue or duplicate if they had missing articles.
-- CRC/yEnc errors would be counted twice as bad articles.
-- Some NZB files would incorrectly be marked as empty.
-- API-call `history` would not filter active post-processing by `nzo_ids`.
-- Login page could be accessed even if `External internet access` was set
-  to `No access`. Any other calls would still be blocked.
-- Ignore duplicate files inside messy NZB's.
-- Windows: `Deobfuscate final filenames` could fail to deobfuscate.
-- macOS: Disk space would be incorrect for very large disks.
+## Bugfixes since 3.1.1
+- Memory could leak after jobs were removed from the queue.
+- The active browser URL is used during the wizard.
+- Repairing or Retrying jobs could result in a crash.  
+- API-call `reset_quota` returned nothing.
+- New categories were not always forced to lowercase.
+- Broken downloads could result in a crash during RAR-renaming  
+- Improved obfuscation detection for `Deobfuscate final filenames`.
+- Keep original priority of duplicate jobs.
+- Increase the maximum number of connections per server to `1000`.
+- Update encryption check to handle partially assembled files.
+- Don't activate Windows notifications when running as a service.
+- Command-line option `--console` did not work.
+- Crash in API-call to delete history items for nonexistent `nzo_id`.
+- Prevent repetition of unwanted extension warnings.
+- Correct notification category for failed URL fetches.
+- Improvements to the `Add NZB` modal window.
+- Sort script drop-down list alphabetically.
+- Default Bandwidth percentage was not set to `100`.
+- Direct Unpack stability fixes.
+- macOS: Program shutdown could fail.
+- macOS: Tray text was misaligned on macOS 11 (Big Sur).
+- Windows: Improved handling of some MultiPar output.
+- Windows: Program restart failed.
 
 ## Upgrade notices
-- The download statistics file `totals10.sab` is updated in 3.2.x 
+- The download statistics file `totals10.sab` is updated in this 
   version. If you downgrade to 3.1.x or lower, detailed download 
   statistics will be lost.
 

SABnzbd.py

@@ -19,7 +19,7 @@ import sys
 
 if sys.hexversion < 0x03060000:
     print("Sorry, requires Python 3.6 or above")
-    print("You can read more at: https://sabnzbd.org/wiki/installation/install-off-modules")
+    print("You can read more at: https://sabnzbd.org/python3")
     sys.exit(1)
 
 import logging
@@ -48,7 +48,7 @@ try:
 except ImportError as e:
     print("Not all required Python modules are available, please check requirements.txt")
     print("Missing module:", e.name)
-    print("You can read more at: https://sabnzbd.org/wiki/installation/install-off-modules")
+    print("You can read more at: https://sabnzbd.org/python3")
     print("If you still experience problems, remove all .pyc files in this folder and subfolders")
     sys.exit(1)
 
@@ -62,11 +62,13 @@ from sabnzbd.misc import (
     exit_sab,
     split_host,
     create_https_certificates,
+    windows_variant,
     ip_extract,
     set_serv_parms,
     get_serv_parms,
     get_from_url,
     upload_file_to_sabnzbd,
+    is_ipv4_addr,
     is_localhost,
     is_lan_addr,
 )
@@ -78,7 +80,6 @@ import sabnzbd.downloader
 import sabnzbd.notifier as notifier
 import sabnzbd.zconfig
 from sabnzbd.getipaddress import localipv4, publicipv4, ipv6
-from sabnzbd.utils.getperformance import getpystone, getcpu
 import sabnzbd.utils.ssdp as ssdp
 
 try:
@@ -89,13 +90,9 @@ try:
     import win32service
     import win32ts
     import pywintypes
-    import servicemanager
-    from win32com.shell import shell, shellcon
-
-    from sabnzbd.utils.apireg import get_connection_info, set_connection_info, del_connection_info
-    import sabnzbd.sabtray
 
     win32api.SetConsoleCtrlHandler(sabnzbd.sig_handler, True)
+    from sabnzbd.utils.apireg import get_connection_info, set_connection_info, del_connection_info
 except ImportError:
     if sabnzbd.WIN32:
         print("Sorry, requires Python module PyWin32.")
@@ -106,13 +103,13 @@ LOG_FLAG = False
 
 
 def guard_loglevel():
-    """Callback function for guarding loglevel"""
+    """ Callback function for guarding loglevel """
     global LOG_FLAG
     LOG_FLAG = True
 
 
 def warning_helpful(*args, **kwargs):
-    """Wrapper to ignore helpfull warnings if desired"""
+    """ Wrapper to ignore helpfull warnings if desired """
     if sabnzbd.cfg.helpfull_warnings():
         return logging.warning(*args, **kwargs)
     return logging.info(*args, **kwargs)
@@ -127,42 +124,29 @@ class GUIHandler(logging.Handler):
     """
 
     def __init__(self, size):
-        """Initializes the handler"""
+        """ Initializes the handler """
         logging.Handler.__init__(self)
         self._size: int = size
         self.store: List[Dict[str, Any]] = []
 
     def emit(self, record: logging.LogRecord):
-        """Emit a record by adding it to our private queue"""
+        """ Emit a record by adding it to our private queue """
         # If % is part of the msg, this could fail
         try:
             parsed_msg = record.msg % record.args
         except TypeError:
             parsed_msg = record.msg + str(record.args)
 
-        warning = {
-            "type": record.levelname,
-            "text": parsed_msg,
-            "time": int(time.time()),
-            "origin": "%s%d" % (record.filename, record.lineno),
-        }
+        if record.levelno == logging.WARNING:
+            sabnzbd.notifier.send_notification(T("Warning"), parsed_msg, "warning")
+        else:
+            sabnzbd.notifier.send_notification(T("Error"), parsed_msg, "error")
 
         # Append traceback, if available
+        warning = {"type": record.levelname, "text": parsed_msg, "time": int(time.time())}
         if record.exc_info:
             warning["text"] = "%s\n%s" % (warning["text"], traceback.format_exc())
 
-        # Do not notify the same notification within 1 minute from the same source
-        # 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_TIMEOUT > time.time()
-            for stored_warning in self.store
-        ):
-            if record.levelno == logging.WARNING:
-                sabnzbd.notifier.send_notification(T("Warning"), parsed_msg, "warning")
-            else:
-                sabnzbd.notifier.send_notification(T("Error"), parsed_msg, "error")
-
         # Loose the oldest record
         if len(self.store) >= self._size:
             self.store.pop(0)
@@ -175,7 +159,7 @@ class GUIHandler(logging.Handler):
         return len(self.store)
 
     def content(self):
-        """Return an array with last records"""
+        """ Return an array with last records """
         return self.store
 
 
@@ -186,36 +170,35 @@ def print_help():
     print("Options marked [*] are stored in the config file")
     print()
     print("Options:")
-    print("  -f  --config-file <ini>     Location of config file")
-    print("  -s  --server <srv:port>     Listen on server:port [*]")
-    print("  -t  --templates <templ>     Template directory [*]")
+    print("  -f  --config-file <ini>  Location of config file")
+    print("  -s  --server <srv:port>  Listen on server:port [*]")
+    print("  -t  --templates <templ>  Template directory [*]")
     print()
-    print("  -l  --logging <-1..2>       Set logging level (-1=off, 0=least,2= most) [*]")
-    print("  -w  --weblogging            Enable cherrypy access logging")
+    print("  -l  --logging <-1..2>     Set logging level (-1=off, 0= least, 2= most) [*]")
+    print("  -w  --weblogging         Enable cherrypy access logging")
     print()
-    print("  -b  --browser <0..1>        Auto browser launch (0= off, 1= on) [*]")
+    print("  -b  --browser <0..1>     Auto browser launch (0= off, 1= on) [*]")
     if sabnzbd.WIN32:
-        print("  -d  --daemon                Use when run as a service")
+        print("  -d  --daemon             Use when run as a service")
     else:
-        print("  -d  --daemon                Fork daemon process")
-        print("      --pid <path>            Create a PID file in the given folder (full path)")
-        print("      --pidfile <path>        Create a PID file with the given name (full path)")
+        print("  -d  --daemon             Fork daemon process")
+        print("      --pid <path>         Create a PID file in the given folder (full path)")
+        print("      --pidfile <path>     Create a PID file with the given name (full path)")
     print()
-    print("  -h  --help                  Print this message")
-    print("  -v  --version               Print version information")
-    print("  -c  --clean                 Remove queue, cache and logs")
-    print("  -p  --pause                 Start in paused mode")
-    print("      --repair                Add orphaned jobs from the incomplete folder to the queue")
-    print("      --repair-all            Try to reconstruct the queue from the incomplete folder")
-    print("                              with full data reconstruction")
-    print("      --https <port>          Port to use for HTTPS server")
-    print("      --ipv6_hosting <0|1>    Listen on IPv6 address [::1] [*]")
-    print("      --inet_exposure <0..5>  Set external internet access [*]")
-    print("      --no-login              Start with username and password reset")
-    print("      --log-all               Log all article handling (for developers)")
-    print("      --disable-file-log      Logging is only written to console")
-    print("      --console               Force logging to console")
-    print("      --new                   Run a new instance of SABnzbd")
+    print("  -h  --help               Print this message")
+    print("  -v  --version            Print version information")
+    print("  -c  --clean              Remove queue, cache and logs")
+    print("  -p  --pause              Start in paused mode")
+    print("      --repair             Add orphaned jobs from the incomplete folder to the queue")
+    print("      --repair-all         Try to reconstruct the queue from the incomplete folder")
+    print("                           with full data reconstruction")
+    print("      --https <port>       Port to use for HTTPS server")
+    print("      --ipv6_hosting <0|1> Listen on IPv6 address [::1] [*]")
+    print("      --no-login           Start with username and password reset")
+    print("      --log-all            Log all article handling (for developers)")
+    print("      --disable-file-log   Logging is only written to console")
+    print("      --console            Force logging to console")
+    print("      --new                Run a new instance of SABnzbd")
     print()
     print("NZB (or related) file:")
     print("  NZB or compressed NZB file, with extension .nzb, .zip, .rar, .7z, .gz, or .bz2")
@@ -241,7 +224,7 @@ GNU GENERAL PUBLIC LICENSE Version 2 or (at your option) any later version.
 
 
 def daemonize():
-    """Daemonize the process, based on various StackOverflow answers"""
+    """ Daemonize the process, based on various StackOverflow answers """
     try:
         pid = os.fork()
         if pid > 0:
@@ -283,7 +266,7 @@ def daemonize():
 
 
 def abort_and_show_error(browserhost, cherryport, err=""):
-    """Abort program because of CherryPy troubles"""
+    """ Abort program because of CherryPy troubles """
     logging.error(T("Failed to start web-interface") + " : " + str(err))
     if not sabnzbd.DAEMON:
         if "49" in err:
@@ -295,7 +278,7 @@ def abort_and_show_error(browserhost, cherryport, err=""):
 
 
 def identify_web_template(key, defweb, wdir):
-    """Determine a correct web template set, return full template path"""
+    """ Determine a correct web template set, return full template path """
     if wdir is None:
         try:
             wdir = fix_webname(key())
@@ -326,7 +309,7 @@ def identify_web_template(key, defweb, wdir):
 
 
 def check_template_scheme(color, web_dir):
-    """Check existence of color-scheme"""
+    """ Check existence of color-scheme """
     if color and os.path.exists(os.path.join(web_dir, "static", "stylesheets", "colorschemes", color + ".css")):
         return color
     elif color and os.path.exists(os.path.join(web_dir, "static", "stylesheets", "colorschemes", color)):
@@ -352,8 +335,8 @@ def fix_webname(name):
         return name
 
 
-def get_user_profile_paths():
-    """Get the default data locations on Windows"""
+def get_user_profile_paths(vista_plus):
+    """ Get the default data locations on Windows"""
     if sabnzbd.DAEMON:
         # In daemon mode, do not try to access the user profile
         # just assume that everything defaults to the program dir
@@ -368,15 +351,22 @@ def get_user_profile_paths():
         return
     elif sabnzbd.WIN32:
         try:
+            from win32com.shell import shell, shellcon
+
             path = shell.SHGetFolderPath(0, shellcon.CSIDL_LOCAL_APPDATA, None, 0)
             sabnzbd.DIR_LCLDATA = os.path.join(path, DEF_WORKDIR)
             sabnzbd.DIR_HOME = os.environ["USERPROFILE"]
         except:
             try:
-                root = os.environ["AppData"]
-                user = os.environ["USERPROFILE"]
-                sabnzbd.DIR_LCLDATA = "%s\\%s" % (root.replace("\\Roaming", "\\Local"), DEF_WORKDIR)
-                sabnzbd.DIR_HOME = user
+                if vista_plus:
+                    root = os.environ["AppData"]
+                    user = os.environ["USERPROFILE"]
+                    sabnzbd.DIR_LCLDATA = "%s\\%s" % (root.replace("\\Roaming", "\\Local"), DEF_WORKDIR)
+                    sabnzbd.DIR_HOME = user
+                else:
+                    root = os.environ["USERPROFILE"]
+                    sabnzbd.DIR_LCLDATA = "%s\\%s" % (root, DEF_WORKDIR)
+                    sabnzbd.DIR_HOME = root
             except:
                 pass
 
@@ -405,7 +395,7 @@ def get_user_profile_paths():
 
 
 def print_modules():
-    """Log all detected optional or external modules"""
+    """ Log all detected optional or external modules """
     if sabnzbd.decoder.SABYENC_ENABLED:
         # Yes, we have SABYenc, and it's the correct version, so it's enabled
         logging.info("SABYenc module (v%s)... found!", sabnzbd.decoder.SABYENC_VERSION)
@@ -482,7 +472,7 @@ def print_modules():
 
 
 def all_localhosts():
-    """Return all unique values of localhost in order of preference"""
+    """ Return all unique values of localhost in order of preference """
     ips = ["127.0.0.1"]
     try:
         # Check whether IPv6 is available and enabled
@@ -510,7 +500,7 @@ def all_localhosts():
 
 
 def check_resolve(host):
-    """Return True if 'host' resolves"""
+    """ Return True if 'host' resolves """
     try:
         socket.getaddrinfo(host, None)
     except socket.error:
@@ -598,7 +588,7 @@ def get_webhost(cherryhost, cherryport, https_port):
         browserhost = localhost
 
     else:
-        # If on APIPA, use numerical IP, to help FireFoxers
+        # If on Vista and/or APIPA, use numerical IP, to help FireFoxers
         if ipv6 and ipv4:
             cherryhost = hostip
         browserhost = cherryhost
@@ -653,7 +643,7 @@ def get_webhost(cherryhost, cherryport, https_port):
 
 
 def attach_server(host, port, cert=None, key=None, chain=None):
-    """Define and attach server, optionally HTTPS"""
+    """ Define and attach server, optionally HTTPS """
     if sabnzbd.cfg.ipv6_hosting() or "::1" not in host:
         http_server = cherrypy._cpserver.Server()
         http_server.bind_addr = (host, port)
@@ -666,7 +656,7 @@ def attach_server(host, port, cert=None, key=None, chain=None):
 
 
 def is_sabnzbd_running(url):
-    """Return True when there's already a SABnzbd instance running."""
+    """ Return True when there's already a SABnzbd instance running. """
     try:
         url = "%s&mode=version" % url
         # Do this without certificate verification, few installations will have that
@@ -679,7 +669,7 @@ def is_sabnzbd_running(url):
 
 
 def find_free_port(host, currentport):
-    """Return a free port, 0 when nothing is free"""
+    """ Return a free port, 0 when nothing is free """
     n = 0
     while n < 10 and currentport <= 49151:
         try:
@@ -776,9 +766,10 @@ def commandline_handler():
                 "server=",
                 "templates",
                 "ipv6_hosting=",
-                "inet_exposure=",
+                "template2",
                 "browser=",
                 "config-file=",
+                "force",
                 "disable-file-log",
                 "version",
                 "https=",
@@ -832,7 +823,7 @@ def commandline_handler():
 
 
 def get_f_option(opts):
-    """Return value of the -f option"""
+    """ Return value of the -f option """
     for opt, arg in opts:
         if opt == "-f":
             return arg
@@ -860,6 +851,8 @@ def main():
     console_logging = False
     no_file_log = False
     web_dir = None
+    vista_plus = False
+    win64 = False
     repair = 0
     no_login = False
     sabnzbd.RESTART_ARGS = [sys.argv[0]]
@@ -867,7 +860,6 @@ def main():
     pid_file = None
     new_instance = False
     ipv6_hosting = None
-    inet_exposure = None
 
     _service, sab_opts, _serv_opts, upload_nzbs = commandline_handler()
 
@@ -947,8 +939,6 @@ def main():
             new_instance = True
         elif opt == "--ipv6_hosting":
             ipv6_hosting = arg
-        elif opt == "--inet_exposure":
-            inet_exposure = arg
 
     sabnzbd.MY_FULLNAME = os.path.normpath(os.path.abspath(sabnzbd.MY_FULLNAME))
     sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME)
@@ -975,18 +965,17 @@ def main():
     logger.setLevel(logging.WARNING)
     logger.addHandler(gui_log)
 
-    # Detect CPU architecture and Windows variant
-    # Use .machine as .processor is not always filled
-    cpu_architecture = platform.uname().machine
+    # Detect Windows variant
     if sabnzbd.WIN32:
-        sabnzbd.WIN64 = cpu_architecture == "AMD64"
+        vista_plus, win64 = windows_variant()
+        sabnzbd.WIN64 = win64
 
     if inifile:
         # INI file given, simplest case
         inifile = evaluate_inipath(inifile)
     else:
         # No ini file given, need profile data
-        get_user_profile_paths()
+        get_user_profile_paths(vista_plus)
         # Find out where INI file is
         inifile = os.path.abspath(os.path.join(sabnzbd.DIR_LCLDATA, DEF_INI_FILE))
 
@@ -1168,19 +1157,24 @@ def main():
             ).strip()
         except:
             pass
-    logging.info("Commit = %s", sabnzbd.__baseline__)
-
+    logging.info("Commit: %s", sabnzbd.__baseline__)
     logging.info("Full executable path = %s", sabnzbd.MY_FULLNAME)
-    logging.info("Arguments = %s", sabnzbd.CMDLINE)
+    if sabnzbd.WIN32:
+        suffix = ""
+        if win64:
+            suffix = "(win64)"
+        try:
+            logging.info("Platform = %s %s", platform.platform(), suffix)
+        except:
+            logging.info("Platform = %s <unknown>", suffix)
+    else:
+        logging.info("Platform = %s", os.name)
     logging.info("Python-version = %s", sys.version)
-    logging.info("Dockerized = %s", sabnzbd.DOCKER)
-    logging.info("CPU architecture = %s", cpu_architecture)
-
-    try:
-        logging.info("Platform = %s - %s", os.name, platform.platform())
-    except:
-        # Can fail on special platforms (like Snapcraft or embedded)
-        pass
+    logging.info("Arguments = %s", sabnzbd.CMDLINE)
+    if sabnzbd.DOCKER:
+        logging.info("Running inside a docker container")
+    else:
+        logging.info("Not inside a docker container")
 
     # Find encoding; relevant for external processing activities
     logging.info("Preferred encoding = %s", sabnzbd.encoding.CODEPAGE)
@@ -1204,8 +1198,8 @@ def main():
 
         try:
             os.environ["SSL_CERT_FILE"] = certifi.where()
-            logging.info("Certifi version = %s", certifi.__version__)
-            logging.info("Loaded additional certificates from %s", os.environ["SSL_CERT_FILE"])
+            logging.info("Certifi version: %s", certifi.__version__)
+            logging.info("Loaded additional certificates from: %s", os.environ["SSL_CERT_FILE"])
         except:
             # Sometimes the certificate file is blocked
             logging.warning(T("Could not load additional certificates from certifi package"))
@@ -1214,16 +1208,38 @@ def main():
     # Extra startup info
     if sabnzbd.cfg.log_level() > 1:
         # List the number of certificates available (can take up to 1.5 seconds)
-        logging.debug("Available certificates = %s", repr(ssl.create_default_context().cert_store_stats()))
+        ctx = ssl.create_default_context()
+        logging.debug("Available certificates: %s", repr(ctx.cert_store_stats()))
 
-        # List networking
-        logging.debug("Local IPv4 address = %s", localipv4())
-        logging.debug("Public IPv4 address = %s", publicipv4())
-        logging.debug("IPv6 address = %s", ipv6())
+        mylocalipv4 = localipv4()
+        if mylocalipv4:
+            logging.debug("My local IPv4 address = %s", mylocalipv4)
+        else:
+            logging.debug("Could not determine my local IPv4 address")
+
+        mypublicipv4 = publicipv4()
+        if mypublicipv4:
+            logging.debug("My public IPv4 address = %s", mypublicipv4)
+        else:
+            logging.debug("Could not determine my public IPv4 address")
+
+        myipv6 = ipv6()
+        if myipv6:
+            logging.debug("My IPv6 address = %s", myipv6)
+        else:
+            logging.debug("Could not determine my IPv6 address")
 
         # Measure and log system performance measured by pystone and - if possible - CPU model
-        logging.debug("CPU Pystone available performance = %s", getpystone())
-        logging.debug("CPU model = %s", getcpu())
+        from sabnzbd.utils.getperformance import getpystone, getcpu
+
+        pystoneperf = getpystone()
+        if pystoneperf:
+            logging.debug("CPU Pystone available performance = %s", pystoneperf)
+        else:
+            logging.debug("CPU Pystone available performance could not be calculated")
+        cpumodel = getcpu()  # Linux only
+        if cpumodel:
+            logging.debug("CPU model = %s", cpumodel)
 
     logging.info("Using INI file %s", inifile)
 
@@ -1244,6 +1260,8 @@ def main():
     # Handle the several tray icons
     if sabnzbd.cfg.win_menu() and not sabnzbd.DAEMON and not sabnzbd.WIN_SERVICE:
         if sabnzbd.WIN32:
+            import sabnzbd.sabtray
+
             sabnzbd.WINTRAY = sabnzbd.sabtray.SABTrayThread()
         elif sabnzbd.LINUX_POWER and os.environ.get("DISPLAY"):
             try:
@@ -1332,10 +1350,6 @@ def main():
         sabnzbd.cfg.username.set("")
         sabnzbd.cfg.password.set("")
 
-    # Overwrite inet_exposure from command-line for VPS-setups
-    if inet_exposure:
-        sabnzbd.cfg.inet_exposure.set(inet_exposure)
-
     mime_gzip = (
         "text/*",
         "application/javascript",
@@ -1606,9 +1620,10 @@ def main():
 
 
 if sabnzbd.WIN32:
+    import servicemanager
 
     class SABnzbd(win32serviceutil.ServiceFramework):
-        """Win32 Service Handler"""
+        """ Win32 Service Handler """
 
         _svc_name_ = "SABnzbd"
         _svc_display_name_ = "SABnzbd Binary Newsreader"
@@ -1672,7 +1687,7 @@ def handle_windows_service():
     Returns True when any service commands were detected or
     when we have started as a service.
     """
-    # Detect if running as Windows Service
+    # Detect if running as Windows Service (only Vista and above!)
     # Adapted from https://stackoverflow.com/a/55248281/5235502
     # Only works when run from the exe-files
     if hasattr(sys, "frozen") and win32ts.ProcessIdToSessionId(win32api.GetCurrentProcessId()) == 0:

builder/package.py

@@ -71,14 +71,14 @@ def safe_remove(path):
 
 
 def delete_files_glob(name):
-    """Delete one file or set of files from wild-card spec"""
+    """ Delete one file or set of files from wild-card spec """
     for f in glob.glob(name):
         if os.path.exists(f):
             os.remove(f)
 
 
 def run_external_command(command):
-    """Wrapper to ease the use of calling external programs"""
+    """ Wrapper to ease the use of calling external programs """
     process = subprocess.Popen(command, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     output, _ = process.communicate()
     ret = process.wait()
@@ -90,7 +90,7 @@ def run_external_command(command):
 
 
 def run_git_command(parms):
-    """Run git command, raise error if it failed"""
+    """ Run git command, raise error if it failed """
     return run_external_command(["git"] + parms)
 
 

builder/requirements.txt

@@ -1,5 +1,5 @@
 # Basic build requirements
-pyinstaller==4.2
+pyinstaller
 setuptools
 pkginfo
 certifi

interfaces/Config/templates/config.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Config"#-->
-<!--#set global $help_uri="configuration/3.3/configure"#-->
+<!--#set global $help_uri="configuration/3.2/configure"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#from sabnzbd.encoding import CODEPAGE#-->

interfaces/Config/templates/config_cat.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Categories"#-->
-<!--#set global $help_uri="configuration/3.3/categories"#-->
+<!--#set global $help_uri="configuration/3.2/categories"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
     <div class="section">

interfaces/Config/templates/config_folders.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Folders"#-->
-<!--#set global $help_uri="configuration/3.3/folders"#-->
+<!--#set global $help_uri="configuration/3.2/folders"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">

interfaces/Config/templates/config_general.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="General"#-->
-<!--#set global $help_uri="configuration/3.3/general"#-->
+<!--#set global $help_uri="configuration/3.2/general"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -131,7 +131,12 @@
                                 <option value="5" <!--#if $inet_exposure == 5 then 'selected="selected"' else ""#-->>$T('inet-ui') - $T('inet-external_login')</option>
                             </optgroup>
                         </select>
-                    <span class="desc">$T('explain-inet_exposure')</span>
+                    <span class="desc">$T('explain-inet_exposure').replace('. ','.<br><span class="label label-warning">'+$T('warning').upper()+'</span> ')</span>
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="local_ranges">$T('opt-local_ranges')</label>
+                    <input type="text" name="local_ranges" id="local_ranges" value="$local_ranges" />
+                    <span class="desc">$T('explain-local_ranges')</span>
                 </div>
                 <div class="field-pair">
                     <label class="config" for="apikey_display">$T('opt-apikey')</label>
@@ -255,18 +260,17 @@
 
     // Highlight in case user is not safe
     // So when exposed to internet and no password, no external limit or no username/password
-    var safeCheck = \$('#host, #inet_exposure, #${pid}_wu, #${pid}_wp')
+    var safeCheck = \$('#host, #local_ranges, #inet_exposure, #${pid}_wu, #${pid}_wp')
     function checkSafety() {
         if(\$('#host').val() != 'localhost' && \$('#host').val() != '127.0.0.1') {
             // No limitation on local-network
-            if(\$('#inet_exposure').val() > 3) {
+            if(!\$('#local_ranges').val() || \$('#inet_exposure').val() > 3) {
                 // And no username and password?
                 if(!\$('#${pid}_wu').val() || !\$('#${pid}_wp').val()) {
                     // Add warning icon if not there already
                     if(!\$('.host-warning').length) {
                         safeCheck.after('<span class="glyphicon glyphicon-alert host-warning"></span>')
                         \$('.host-warning').tooltip({'title': '$T('checkSafety')'})
-                        safeCheck.addClass('host-warning-highlight')
                     }
                     return
                 }

interfaces/Config/templates/config_notify.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Email"#-->
-<!--#set global $help_uri="configuration/3.3/notifications"#-->
+<!--#set global $help_uri="configuration/3.2/notifications"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#def show_notify_checkboxes($section_label)#-->

interfaces/Config/templates/config_rss.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="RSS"#-->
-<!--#set global $help_uri="configuration/3.3/rss"#-->
+<!--#set global $help_uri="configuration/3.2/rss"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <!--#import html#-->
 <div class="colmask">
@@ -10,7 +10,7 @@
             <p>$T('explain-RSS')</p>
             <form action="add_rss_feed" method="post" autocomplete="off">
                 <input type="hidden" name="apikey" value="$apikey" />
-                <table class="catTable addRssTable">
+                <table class="catTable">
                     <tr>
                         <th>&nbsp;</th>
                         <th>$T('name')</th>
@@ -21,10 +21,10 @@
                         <td>
                             <input type="checkbox" name="enable" value="1" checked />
                         </td>
-                        <td class="new-feed-title">
-                            <input type="text" name="feed" value="$feed" />
+                        <td>
+                            <input type="text" name="feed" class="smaller_input" value="$feed" />
                         </td>
-                        <td class="new-feed-url">
+                        <td>
                             <input type="text" name="uri" placeholder="$T('addMultipleFeeds')" />
                         </td>
                         <td class="nowrap">

interfaces/Config/templates/config_scheduling.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Scheduling"#-->
-<!--#set global $help_uri="configuration/3.3/scheduling"#-->
+<!--#set global $help_uri="configuration/3.2/scheduling"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <%

interfaces/Config/templates/config_server.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Servers"#-->
-<!--#set global $help_uri="configuration/3.3/servers"#-->
+<!--#set global $help_uri="configuration/3.2/servers"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#import json#-->
@@ -144,7 +144,7 @@
 
             <div class="section <!--#if int($server['enable']) == 0 then 'server-disabled' else ""#-->">
                 <div class="col2 <!--#if int($server['enable']) == 0 then 'server-disabled' else ""#-->">
-                    <h3 title="$server['displayname']">$server['displayname'] <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                    <h3>$server['displayname'] <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
                     <!--#if int($server['enable']) != 0 #-->
                         <!--#if $last_prio != $server['priority'] and $cur_prio_color+1 < len($prio_colors) #-->
                             <!--#set $cur_prio_color = $cur_prio_color+1 #-->
@@ -273,9 +273,6 @@
                                 <b>$T('srv-article-availability'):</b><br/>
                                 $T('selectedDates'): <span id="server-article-value-${cur}"></span>
                             </p>
-                            <!--#if $server['expire_date']#-->
-                            <p><b>$T('srv-expire_date'):</b> $(server['expire_date'])</p>
-                            <!--#end if#-->
                             <!--#if $server['quota']#-->
                             <p><b>$T('quota-left'):</b> $(server['quota_left'])B</p>
                             <!--#end if#-->
@@ -388,8 +385,7 @@
 
             // If values were missing
             if(!isNaN(articleRatio)) {
-                // Use filesize to convert to unit-display
-                \$('#server-article-value-' + server_id).text('$T("srv-articles-tried")'.replace('%f', articleRatio).replace('%d', filesize(totalArticlesTriedThisRange, {unix: true, round: 0, spacer: "", base: 1})))
+                \$('#server-article-value-' + server_id).text('$T("srv-articles-tried")'.replace('%f', articleRatio).replace('%d', totalArticlesTriedThisRange))
             } else {
                 \$('#server-article-value-' + server_id).text('$T("notAvailable")')
             }

interfaces/Config/templates/config_sorting.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Sorting"#-->
-<!--#set global $help_uri="configuration/3.3/sorting"#-->
+<!--#set global $help_uri="configuration/3.2/sorting"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -130,11 +130,6 @@
                                     <td>%e_n</td>
                                     <td>$T('ep-us-name')</td>
                                 </tr>
-                                <tr>
-                                    <td class="align-right"><b>$T('Resolution'):</b></td>
-                                    <td>%r</td>
-                                    <td>1080p</td>
-                                </tr>
                                 <tr>
                                     <td class="align-right"><b>$T('fileExt'):</b></td>
                                     <td>%ext</td>
@@ -250,11 +245,6 @@
                                     <td>%y</td>
                                     <td>2009</td>
                                 </tr>
-                                <tr>
-                                    <td class="align-right"><b>$T('Resolution'):</b></td>
-                                    <td>%r</td>
-                                    <td>1080p</td>
-                                </tr>
                                 <tr>
                                     <td class="align-right"><b>$T('extension'):</b></td>
                                     <td>%ext</td>
@@ -417,11 +407,6 @@
                                     <td>%0decade</td>
                                     <td>2000</td>
                                 </tr>
-                                <tr>
-                                    <td class="align-right"><b>$T('Resolution'):</b></td>
-                                    <td>%r</td>
-                                    <td>1080p</td>
-                                </tr>
                                 <tr>
                                     <td class="align-right"><b>$T('orgFilename'):</b></td>
                                     <td>%fn</td>

interfaces/Config/templates/config_special.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Special"#-->
-<!--#set global $help_uri="configuration/3.3/special"#-->
+<!--#set global $help_uri="configuration/3.2/special"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">

interfaces/Config/templates/config_switches.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Switches"#-->
-<!--#set global $help_uri="configuration/3.3/switches"#-->
+<!--#set global $help_uri="configuration/3.2/switches"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -120,10 +120,6 @@
                     </div>
                     <div class="field-pair">
                         <label class="config" for="unwanted_extensions">$T('opt-unwanted_extensions')</label>
-                        <select name="unwanted_extensions_mode" id="unwanted_extensions_mode">
-                            <option value="0" <!--#if int($unwanted_extensions_mode) == 0 then 'selected="selected"' else ""#--> >$T('unwanted_extensions_blacklist')</option>
-                            <option value="1" <!--#if int($unwanted_extensions_mode) == 1 then 'selected="selected"' else ""#--> >$T('unwanted_extensions_whitelist')</option>
-                        </select>
                         <input type="text" name="unwanted_extensions" id="unwanted_extensions" value="$unwanted_extensions"/>
                         <span class="desc">$T('explain-unwanted_extensions')</span>
                     </div>
@@ -140,8 +136,8 @@
                         <label class="config" for="auto_sort">$T('opt-auto_sort')</label>
                         <select name="auto_sort" id="auto_sort">
                             <option value="">$T('default')</option>
-                            <option value="avg_age desc" <!--#if $auto_sort == "avg_age desc" then 'selected="selected"' else ""#--> >$T('Glitter-sortAgeAsc')</option>
-                            <option value="avg_age asc" <!--#if $auto_sort == "avg_age asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortAgeDesc')</option>
+                            <option value="avg_age asc" <!--#if $auto_sort == "avg_age asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortAgeAsc')</option>
+                            <option value="avg_age desc" <!--#if $auto_sort == "avg_age desc" then 'selected="selected"' else ""#--> >$T('Glitter-sortAgeDesc')</option>
                             <option value="name asc" <!--#if $auto_sort == "name asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortNameAsc')</option>
                             <option value="name desc" <!--#if $auto_sort == "name desc" then 'selected="selected"' else ""#--> >$T('Glitter-sortNameDesc')</option>
                             <option value="size asc" <!--#if $auto_sort == "size asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortSizeAsc')</option>

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

@@ -162,6 +162,7 @@ input[type="checkbox"]+.desc {
     float: none;
     overflow: hidden;
     min-width: 555px;
+    position: relative;
 }
 .Key tr:nth-child(odd),
 .tab-pane tr:nth-child(odd),
@@ -550,16 +551,6 @@ tr.separator {
     padding-right: 13px;
 }
 /* --  */
-.RSS .addRssTable,
-.RSS .addRssTable input[type="text"] {
-    width: 100%;
-}
-.RSS .addRssTable .new-feed-title {
-    max-width: 250px;
-}
-.RSS .addRssTable .new-feed-url {
-    width: 70%;
-}
 h2.activeRSS {
     margin-bottom: 10px;
 }
@@ -569,12 +560,12 @@ h2.activeRSS {
     text-decoration: underline !important;
 }
 .favicon {
-    background-position: center center !important;
-    background-size: 22px 22px;
+    background-position: center center!important;
+    background-size: 16px 16px;
     opacity: 1;
     top: -1px;
-    height: 22px;
-    width: 22px;
+    height: 16px;
+    width: 16px;
     float: left;
     margin: 0 6px 0 2px;
     text-align: center;
@@ -594,7 +585,6 @@ h2.activeRSS {
 }
 #subscriptions {
     border: 1px solid #E5E5E5;
-    width: 100%;
 }
 .data-row {
     border-top: 1px solid #E5E5E5;
@@ -606,7 +596,6 @@ h2.activeRSS {
 #subscriptions .chk {
     padding: 8px 5px 5px;
     vertical-align: middle;
-    width: 40px;
 }
 #subscriptions .title {
     font-weight: bold;
@@ -614,11 +603,10 @@ h2.activeRSS {
     width: auto;
 }
 #subscriptions .favicon {
-    margin-left: 7px;
-    margin-top: -2px;
+    margin-left: 8px;
 }
-#subscriptions .glyphicon {
-    margin-top: 3px;
+.ie6 .subscription-title {
+    width: 20em;
 }
 .subscription-title,
 .subscription-title:hover {
@@ -1103,10 +1091,6 @@ input[type="checkbox"] {
     font-size: 1.2em;
 }
 
-.host-warning-highlight {
-    border-color: #F0AD4E !important;
-}
-
 .fileBrowser .glyphicon {
     margin-right: 2px;
     top: 1px;
@@ -1197,10 +1181,6 @@ html[dir="rtl"] .modal-header .close {
     float: left;
 }
 
-html[dir="rtl"] .field-pair {
-    position: relative;
-}
-
 html[dir="rtl"] .Sorting .presets.float-left,
 html[dir="rtl"] .checkbox-days {
     float: none;

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

@@ -264,13 +264,13 @@ function do_restart() {
     $.ajax({ url: '../../config/restart?apikey=' + sabSession,
         complete: function() {
             // Keep counter of failures
-            var loopCounter = 0;
+            var failureCounter = 0;
 
             // Now we try until we can connect
-            setInterval(function() {
-                loopCounter = loopCounter+1;
-                // We skip the first one so we give it time to shutdown
-                if(loopCounter < 2) {
+            var refreshInterval = setInterval(function() {
+                // We skip the first one
+                if(failureCounter == 0) {
+                    failureCounter = failureCounter+1;
                     return
                 }
                 $.ajax({ url: urlTotal,
@@ -279,16 +279,17 @@ function do_restart() {
                         location.href = urlTotal;
                     },
                     error: function(status, text) {
-                        // Too many failures and we give up
-                        if(loopCounter >= 10) {
+                        failureCounter = failureCounter+1;
+                        // Too many failuers and we give up
+                        if(failureCounter >= 6) {
                             // If the port has changed 'Access-Control-Allow-Origin' header will not allow
-                            // us to check if the server is back up. So after 10 failures (20 sec) we redirect
+                            // us to check if the server is back up. So after 7 failures we redirect
                             // anyway in the hopes it works anyway..
                             location.href = urlTotal;
                         }
                     }
                 })
-            }, 2000)
+            }, 4000)
 
             // Exception if we go from HTTPS to HTTP
             // (this is not allowed by browsers and all of the above will be ignored)

interfaces/Glitter/templates/include_history.tmpl

@@ -224,10 +224,4 @@
         <span data-bind="text: history.downloadedMonth"></span>B $T('Glitter-thisMonth')
         <span data-bind="text: history.downloadedTotal"></span>B $T('Glitter-total')
     </div>
-</div>
-<div class="info-container history-info" data-bind="visible: !hasHistory() && !displayTabbed()" style="display: none">
-    <span class="glyphicon glyphicon-save"></span>
-    <span data-bind="text: history.downloadedToday"></span>B $T('Glitter-today')
-    <span data-bind="text: history.downloadedMonth"></span>B $T('Glitter-thisMonth')
-    <span data-bind="text: history.downloadedTotal"></span>B $T('Glitter-total')
 </div>

interfaces/Glitter/templates/include_overlays.tmpl

@@ -86,34 +86,34 @@
                 <div class="tab-content">
                     <div class="tab-pane fade in active" id="options-status">
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-localIP4') &nbsp; </div>
+                            <div class="col-sm-6">$T('dashboard-localIP4')</div>
                             <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.localipv4() ? '$T('dashboard-connectionError')' : statusInfo.localipv4(), css: { 'options-bad-status' : !statusInfo.localipv4() }"></div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-publicIP4') &nbsp; </div>
+                            <div class="col-sm-6">$T('dashboard-publicIP4')</div>
                             <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.publicipv4() ? '$T('dashboard-connectionError')' : statusInfo.publicipv4(), css: { 'options-bad-status ' : !statusInfo.publicipv4() }"></div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-IP6') &nbsp; </div>
+                            <div class="col-sm-6">$T('dashboard-IP6')</div>
                             <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: statusInfo.ipv6"></div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-NameserverDNS') &nbsp; </div>
+                            <div class="col-sm-6">$T('dashboard-NameserverDNS')</div>
                             <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.dnslookup() ? '$T('dashboard-connectionError')' : statusInfo.dnslookup(), css: { 'options-bad-status' : (statusInfo.dnslookup() != 'OK') }"></div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <hr/>
                         <div class="row">
-                            <div class="col-sm-6">$T('cache') &nbsp; </div>
+                            <div class="col-sm-6">$T('cache')</div>
                             <div class="col-sm-6">
                                 <span data-bind="text: cacheSize"></span> (<span data-bind="text: cacheArticles"></span> $T('Glitter-articles'))
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-systemPerformance') &nbsp; </div>
+                            <div class="col-sm-6">$T('dashboard-systemPerformance')</div>
                             <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.pystone"></span>
                                 <a href="#" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
@@ -122,7 +122,7 @@
                             <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>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-downloadDirSpeed') &nbsp; </div>
+                            <div class="col-sm-6">$T('dashboard-downloadDirSpeed')</div>
                             <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.downloaddirspeed()"></span> MB/s
                                 <a href="#" class="diskspeed-button" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
@@ -131,7 +131,7 @@
                             <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>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-completeDirSpeed') &nbsp; </div>
+                            <div class="col-sm-6">$T('dashboard-completeDirSpeed')</div>
                             <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.completedirspeed()"></span> MB/s
                                 <a href="#" class="diskspeed-button" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
@@ -140,7 +140,7 @@
                             <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>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-internetBandwidth') &nbsp; </div>
+                            <div class="col-sm-6">$T('dashboard-internetBandwidth')</div>
                             <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.internetbandwidth()"></span> MB/s
                                 <a href="#" class="diskspeed-button" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
@@ -149,7 +149,7 @@
                             <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>
                         <div class="row test-download">
-                            <div class="col-sm-6">$T('dashboard-testDownload') &nbsp; </div>
+                            <div class="col-sm-6">$T('dashboard-testDownload')</div>
                             <div class="col-sm-6">
                                 <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="100MB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 100 MB</a>
                                 <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="1000MB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 1 GB</a>

interfaces/Glitter/templates/include_queue.tmpl

@@ -109,7 +109,7 @@
                     <form data-bind="submit: editingNameSubmit">
                         <input type="text" data-bind="value: nameForEdit, visible: editingName(), hasfocus: editingName" />
                     </form>
-                    <div class="name-icons direct-unpack hover-button" data-bind="visible: direct_unpack() && !editingName()">
+                    <div class="name-icons direct-unpack hover-button" data-bind="visible: direct_unpack">
                         <span class="glyphicon glyphicon-compressed"></span> <span data-bind="text: direct_unpack"></span>
                     </div>
                     <div class="name-options" data-bind="visible: !editingName(), css: { disabled: isGrabbing() }">

interfaces/Glitter/templates/main.tmpl

@@ -52,17 +52,15 @@
             var glitterTranslate = new Object();
             glitterTranslate.paused = "$T('post-Paused')";
             glitterTranslate.left = "$T('Glitter-left')";
-            glitterTranslate.clearWarn = "$T('confirm')";
+            glitterTranslate.clearWarn = "$T('Glitter-confirmClearWarnings')";
             glitterTranslate.pausePromptFail = "$T('Glitter-pausePromptFail')"
             glitterTranslate.pauseFor = "$T('pauseFor')"
             glitterTranslate.minutes = "$T('mins')"
             glitterTranslate.shutdown = "$T('shutdownOK?')";
             glitterTranslate.restart = "$T('explain-Restart') $T('explain-needNewLogin')".replace(/\<br(\s*\/|)\>/g, '\n');
             glitterTranslate.repair = "$T('explain-Repair')".replace(/<br \/>/g, "\n").replace(/&quot;/g,'"');
-            glitterTranslate.deleteMsg = "$T('nzo-delete')";
-            glitterTranslate.removeDown = "$T('confirm')";
-            glitterTranslate.removeDow1 = "$T('confirm')";
-            glitterTranslate.renameAbort = "$T('Glitter-confirmAbortDirectUnpack')\n$T('confirm')";
+            glitterTranslate.removeDown = "$T('Glitter-confirmClearDownloads')";
+            glitterTranslate.removeDow1 = "$T('Glitter-confirmClear1Download')";
             glitterTranslate.retryAll = "$T('link-retryAll')?";
             glitterTranslate.fetch = "$T('Glitter-fetch')";
             glitterTranslate.encrypted = "$T('Glitter-encrypted')";

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

@@ -421,7 +421,7 @@ function HistoryModel(parent, data) {
     // Delete button
     self.deleteSlot = function(item, event) {
         // Confirm?
-        if(!self.parent.parent.confirmDeleteHistory() || confirm(glitterTranslate.deleteMsg + ":\n" + item.historyStatus.name() + "\n\n" + glitterTranslate.removeDow1)) {
+        if(!self.parent.parent.confirmDeleteHistory() || confirm(glitterTranslate.removeDow1)) {
             // Are we still processing and it can be stopped?
             if(item.processingDownload() == 2) {
                 callAPI({

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

@@ -652,9 +652,6 @@ function QueueModel(parent, data) {
         // Anything change or empty?
         if(!newName || self.name() == newName) return;
 
-        // Rename would abort Direct Unpack, so ask if user is sure
-        if(self.direct_unpack() && !confirm(glitterTranslate.renameAbort)) return;
-
         // Send rename
         callAPI({
                 mode: 'queue',
@@ -727,7 +724,7 @@ function QueueModel(parent, data) {
     // Remove 1 download from queue
     self.removeDownload = function(item, event) {
         // Confirm and remove
-        if(!self.parent.parent.confirmDeleteQueue() || confirm(glitterTranslate.deleteMsg + ":\n" + item.name() + "\n\n" + glitterTranslate.removeDow1)) {
+        if(!self.parent.parent.confirmDeleteQueue() || confirm(glitterTranslate.removeDow1)) {
             var itemToDelete = this;
 
             // Show notification

interfaces/Glitter/templates/static/stylesheets/colorschemes/Night.css

@@ -55,10 +55,6 @@ legend,
     opacity: 0.7;
 }
 
-.form-control[disabled] {
-    opacity: 0.65;
-}
-
 .progress {
     background-color: #DADADA;
 }
@@ -130,10 +126,6 @@ select.form-control,
 .main-content .btn-default,
 .modal-body .btn-default,
 .modal-footer .btn-default,
-.btn-default.disabled:hover,
-.btn-default.disabled:active,
-.btn-default.disabled:focus,
-.form-control[disabled],
 #modal-options .options-function-box .input-group-addon {
     background-color: #555555;
     color: #EBEBEB;
@@ -165,8 +157,6 @@ tbody>tr:last-child td,
 input,
 input.form-control,
 .input-group-addon,
-.search-box input:focus,
-.search-box input:valid,
 select.form-control,
 #modal-options .table-server-connections th,
 .main-content .btn-default,

interfaces/Plush/templates/status.tmpl

@@ -91,7 +91,40 @@
 
 
   <div id="tabs-connections">
+  <a href="refresh_conn?apikey=$apikey" class="juiButton">$T('Plush-button-refresh')</a>
   <a href="disconnect?apikey=$apikey" class="juiButton">$T('link-forceDisc')</a>
+  <hr>
+  <!--#if $servers#-->
+    <!--#set $count=0#-->
+    <!--#for $server in $servers#-->
+      <!--#set $count=$count+1#-->
+      <p>$T('swtag-server'): <strong>$server[0]</strong></p>
+      <p>$T('Priority') = $server[7]&nbsp;&nbsp;<!--#if int($server[8]) != 0#-->$T('optional').capitalize()<!--#else#-->$T('enabled').capitalize()<!--#end if#--></p>
+      <p># $T('connections'): $server[2]</p>
+      <!--#if not $server[5]#-->
+        <a href="./unblock_server?server=$server[0]&apikey=$apikey" class="juiButton">$T('server-blocked')</a>
+        &nbsp;&nbsp;$server[6]
+      <!--#end if#-->
+      <!--#if $server[3]#-->
+        <table class="rssTable">
+          <tr>
+            <th>$T('article-id')</th>
+            <th>$T('filename')</th>
+            <th>$T('file-set')</th>
+          </tr>
+        <!--#set $odd = False#-->
+        <!--#for $thrd in $server[3]#-->
+        <!--#set $odd = not $odd#-->
+          <tr class="<!--#if $odd then "odd" else "even"#-->">
+            <td>$thrd[1]</td><td>$thrd[2]</td><td>$thrd[3]</td></tr>
+        <!--#end for#-->
+        </table>
+      <!--#end if#-->
+      <br/><hr/><br/>
+    <!--#end for#-->
+  <!--#else#-->
+    <p>$T('none')</p>
+  <!--#end if#-->
   </div>
 
   <div id="tabs-dashboard">

linux/sabnzbd@.service

@@ -18,7 +18,7 @@ After=network-online.target
 
 [Service]
 Environment="PYTHONIOENCODING=utf-8"
-ExecStart=/opt/sabnzbd/SABnzbd.py --disable-file-log --logging 1 --browser 0
+ExecStart=/opt/sabnzbd/SABnzbd.py --logging 1 --browser 0
 User=%I
 Type=simple
 Restart=on-failure

po/email/SABemail.pot

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\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

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

po/email/da.po

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

po/email/de.po

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

po/email/es.po

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

po/email/fi.po

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

po/email/fr.po

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

po/email/he.po

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

po/email/nb.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\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://www.transifex.com/sabnzbd/teams/111101/nb/)\n"

po/email/nl.po

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

po/email/pl.po

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

po/email/pt_BR.po

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

po/email/ro.po

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

po/email/ru.po

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

po/email/sr.po

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

po/email/sv.po

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

po/email/zh_CN.po

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

po/main/SABnzbd.pot

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"
@@ -567,15 +567,6 @@ msgstr ""
 msgid "Failed moving %s to %s"
 msgstr ""
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr ""
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -605,7 +596,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr ""
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr ""
@@ -1124,6 +1114,10 @@ msgstr ""
 msgid "%s -> Unknown encoding"
 msgstr ""
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -2990,12 +2984,20 @@ msgstr ""
 msgid "API Key QR Code"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid "You can set access rights for systems outside your local network. Requires List of local network ranges to be defined."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3260,7 +3262,7 @@ msgid "Action when unwanted extension detected"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
+msgid "Action when an unwanted extension is detected in RAR files"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3268,15 +3270,7 @@ msgid "Unwanted extensions"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
+msgid "List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -4555,10 +4549,6 @@ msgstr ""
 msgid "View Script Log"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "LocalStorage (cookies) are disabled in your browser, interface settings will be lost after you close the browser!"
 msgstr ""

po/main/cs.po

@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Pavel C <quoing_transifex@mess.cz>, 2021\n"
 "Language-Team: Czech (https://www.transifex.com/sabnzbd/teams/111101/cs/)\n"
@@ -596,15 +596,6 @@ msgstr "Chyba vytváření (%s)"
 msgid "Failed moving %s to %s"
 msgstr "Chyba přesunu %s do %s"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr ""
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr "Odmítnuté spojení s hostem \"%s\" z:"
@@ -646,7 +637,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Přihlášené selhalo, zkontrolujte jméno a heslo."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "Nezdařený pokus o přihlášení od %s"
@@ -1188,6 +1178,10 @@ msgstr "NZB přidáno do fronty"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Neznámé kódování"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3102,12 +3096,23 @@ msgstr "Generovat nový klíč"
 msgid "API Key QR Code"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3403,25 +3408,16 @@ msgid "Action when unwanted extension detected"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
+msgid "Action when an unwanted extension is detected in RAR files"
 msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -4738,10 +4734,6 @@ msgstr ""
 msgid "View Script Log"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/da.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Danish (https://www.transifex.com/sabnzbd/teams/111101/da/)\n"
@@ -607,15 +607,6 @@ msgstr "Oprettelse af (%s) mislykkedes"
 msgid "Failed moving %s to %s"
 msgstr "Det lykkedes ikke at flytte %s til %s"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr ""
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -657,7 +648,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Godkendelse mislykkedes, kontrollere brugernavn/adgangskode."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "Mislykkede login forsøg fra %s"
@@ -1197,6 +1187,10 @@ msgstr "NZB tilføjet i køen"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Ukendt kodning"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s => mangler fra alle servere, afviser"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3159,13 +3153,28 @@ msgstr "Generere Ny Nøgle"
 msgid "API Key QR Code"
 msgstr "API nøgle QR kode"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr "Liste over lokale netværk intervaller"
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr ""
+"Alle lokale netværksadresser starter med disse præfikser (ofte "
+"\"192.168.1.\")"
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Eksterne internetadgang"
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
 msgstr ""
+"Du kan angive adgangsrettigheder for systemer uden for dit lokale netværk. "
+"Kræver liste over lokale netværks intervaller, skal defineres."
 
 #: sabnzbd/skintext.py
 msgid "No access"
@@ -3486,26 +3495,18 @@ msgid "Action when unwanted extension detected"
 msgstr "Aktion når uønsket extension er fundet"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
-msgstr ""
+msgid "Action when an unwanted extension is detected in RAR files"
+msgstr "Aktion når uønsket extension er fundet i RAR fil"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Uønsket extension"
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
+"Vis alle uønskede extensions. For eksempel: <b>exe</b> or <b>exe, com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -4851,10 +4852,6 @@ msgstr "Skjul/vis komplette filer"
 msgid "View Script Log"
 msgstr "Vis scriptlog"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/de.po

@@ -3,17 +3,16 @@
 #   team@sabnzbd.org
 # 
 # Translators:
+# Safihre <safihre@sabnzbd.org>, 2020
 # C E <githubce@eiselt.ch>, 2020
 # Nikolai Bohl <n.kay01@gmail.com>, 2020
 # reloxx13 <reloxx@interia.pl>, 2021
-# Ben Hecht <benjamin.hecht@me.com>, 2021
-# Safihre <safihre@sabnzbd.org>, 2021
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
-"Last-Translator: Safihre <safihre@sabnzbd.org>, 2021\n"
+"Last-Translator: reloxx13 <reloxx@interia.pl>, 2021\n"
 "Language-Team: German (https://www.transifex.com/sabnzbd/teams/111101/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -335,7 +334,7 @@ msgstr "Server-Adresse wird benötigt"
 
 #: sabnzbd/cfg.py
 msgid "%s is not a valid script"
-msgstr "%s ist kein gültiges Script"
+msgstr ""
 
 #. Warning message
 #: sabnzbd/config.py
@@ -517,12 +516,12 @@ msgstr "Wird beendet …"
 #. Warning message
 #: sabnzbd/downloader.py
 msgid "Server %s is expiring in %s day(s)"
-msgstr "Server %s läuft in %s tag(en) ab"
+msgstr ""
 
 #. Warning message
 #: sabnzbd/downloader.py
 msgid "Server %s has used the specified quota"
-msgstr "Server %s hat die angegebene Quote verbraucht"
+msgstr ""
 
 #: sabnzbd/emailer.py
 msgid "Failed to connect to mail server"
@@ -629,15 +628,6 @@ msgstr "Erstellen von %s fehlgeschlagen"
 msgid "Failed moving %s to %s"
 msgstr "Verschieben von %s nach %s fehlgeschlagen"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr "Versuch das Verzeichnis %s zu erstellen wurde blockiert"
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr "Abgelehnte Verbindung von:"
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr "Verbindung vom Host \"%s\" abgelehnt von:"
@@ -680,7 +670,6 @@ msgid "Authentication failed, check username/password."
 msgstr ""
 "Authentifizierung fehlgeschlagen. Überprüfen Sie Benutzername und Passwort."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "Fehlerhafter Login Versuch von %s"
@@ -1235,6 +1224,10 @@ msgstr "NZB zur Warteschlange hinzugefügt"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Unbekannte Kodierung"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s wurde auf keinem Server gefunden und daher übersprungen"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3239,14 +3232,28 @@ msgstr "Neuen Schlüssel generieren"
 msgid "API Key QR Code"
 msgstr "API-Key OR-Code"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr "Liste der lokalen Netzwerkadressenbereiche"
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr ""
+"Alle lokalen Netzwerkadressen starten mit diesen Präfixen (oft "
+"\"192.168.1.1\")"
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Externer Internetzugriff"
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
 msgstr ""
-"Du kannst Zugriffsrechte für Systeme ausserhalb deines Netzwerkes setzen."
+"Du kannst Zugriffsrechte für Systeme ausserhalb deines Netzwerkes setzen. "
+"Benötigt die Definition einer Liste von lokalen Netzwerkbereichen."
 
 #: sabnzbd/skintext.py
 msgid "No access"
@@ -3585,26 +3592,19 @@ msgid "Action when unwanted extension detected"
 msgstr "Aktion bei ungewollter Dateienendung"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
-msgstr "Aktion bei ungewollter Dateienendung"
+msgid "Action when an unwanted extension is detected in RAR files"
+msgstr "Aktion bei ungewollter Dateiendung innerhalb RAR-Archiven"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Ungewollte Dateiendungen"
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr "Blacklist"
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr "Whitelist"
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
+"Liste aller ungewollter Dateiendungen. Zum Beispiel: <b>exe</b> or <b>exe, "
+"com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -4177,12 +4177,12 @@ msgstr "Download erzwingen"
 #. Config->RSS edit button
 #: sabnzbd/skintext.py
 msgid "Edit"
-msgstr "Bearbeiten"
+msgstr ""
 
 #. Config->RSS when will be the next RSS scan
 #: sabnzbd/skintext.py
 msgid "Next scan at"
-msgstr "Nächster scan um"
+msgstr ""
 
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
@@ -4976,10 +4976,6 @@ msgstr "Vollendete Dateien anzeigen/verstecken"
 msgid "View Script Log"
 msgstr "Skript-Protokoll anzeigen"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/es.po

@@ -9,7 +9,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: 1024mb <angelb2203@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/sabnzbd/teams/111101/es/)\n"
@@ -628,15 +628,6 @@ msgstr "Error al crear (%s)"
 msgid "Failed moving %s to %s"
 msgstr "Error al mover %s a %s"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr ""
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr "Se deniega la conexión con el nombre de equipo \"%s\" desde:"
@@ -678,7 +669,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Autenticación fallida, compruebe el usuario o la contraseña."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "Intento fallido de inicio de sesión desde %s"
@@ -1240,6 +1230,10 @@ msgstr "NZB añadido a la cola"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Codificación desconocida"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s => faltando de todos servidores, desechando"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3241,13 +3235,28 @@ msgstr "Generar nueva clave"
 msgid "API Key QR Code"
 msgstr "Código QR de la clave API"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr "Lista de rangos de red local"
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr ""
+"Todas las direcciones de red locales comienzan con estos prefijos (a menudo "
+"\" 192.168.1 . \" )"
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Acceso a internet externa"
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
 msgstr ""
+"Puede configurar los derechos de acceso para los sistemas fuera de su red "
+"local. Es necesario definir los rangos de la lista de red local."
 
 #: sabnzbd/skintext.py
 msgid "No access"
@@ -3574,26 +3583,19 @@ msgid "Action when unwanted extension detected"
 msgstr "Acción al detectar extensiones no deseadas"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
-msgstr ""
+msgid "Action when an unwanted extension is detected in RAR files"
+msgstr "Acción cuando se detecta una extensión no deseada en archivos RAR"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "extensiones no deseadas"
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
+"Enumerar todas las extensiones no deseadas . Por ejemplo : < b> exe < / b > "
+"o < b> exe, com < / b >"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -4968,10 +4970,6 @@ msgstr "Ocultar/Mostrar ficheros completados"
 msgid "View Script Log"
 msgstr "Ver bitacora de Scripts"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/fi.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Finnish (https://www.transifex.com/sabnzbd/teams/111101/fi/)\n"
@@ -603,15 +603,6 @@ msgstr "Kohteen (%s) luominen epäonnistui"
 msgid "Failed moving %s to %s"
 msgstr "Kohteen %s siirtäminen kohteeseen %s epäonnistui"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr ""
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -653,7 +644,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Varmennus epäonnistui, tarkista käyttäjänimi/salasana."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr ""
@@ -1190,6 +1180,10 @@ msgstr "NZB lisätty jonoon"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Tuntematon koodaus"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s => puuttuu kaikilta palvelimilta, hylätään"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3158,12 +3152,25 @@ msgstr "Luo uusi avain"
 msgid "API Key QR Code"
 msgstr "API avaimen QR-koodi"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr "Lista paikallisista verkko-osoitealueista"
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr ""
+"Kaikki paikalliset verkko-osoitteet alkavat näillä etuliitteillä (yleensä "
+"\"192.168.1.\")"
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Ulkoinen ohjelman käyttö"
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3485,26 +3492,19 @@ msgid "Action when unwanted extension detected"
 msgstr "Toiminto kun havaitaan ei toivottu tiedostopääte"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
-msgstr ""
+msgid "Action when an unwanted extension is detected in RAR files"
+msgstr "Toiminto kun ei toivottu tiedostopääte havaitaan RAR arkistossa"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Ei toivotut tiedostopäätteet"
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
+"Lista ei toivotuista tiedostopäätteistä. Esimerkiksi: <b>exe</b> tai <b>exe,"
+" com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -4853,10 +4853,6 @@ msgstr "Piilota/näytä valmistuneet tiedostot"
 msgid "View Script Log"
 msgstr "Näytä skriptien loki"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/fr.po

@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Fred L <88com88@gmail.com>, 2021\n"
 "Language-Team: French (https://www.transifex.com/sabnzbd/teams/111101/fr/)\n"
@@ -630,15 +630,6 @@ msgstr "Échec lors de la création de (%s)"
 msgid "Failed moving %s to %s"
 msgstr "Échec lors du déplacement de %s vers %s"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr "Tentative bloquée de création du répertoire %s"
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr "Connexion refusée de:"
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr "Connexion refusée avec le nom d'hôte \"%s\" à partir de :"
@@ -680,7 +671,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Echec d'authentification, vérifiez les identifiant/mot de passe."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "Echec de la tentative de connexion de %s"
@@ -1237,6 +1227,10 @@ msgstr "NZB ajouté à la file d'attente"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Encodage inconnu"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s => absent de tous les serveurs, rejeté"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3240,15 +3234,28 @@ msgstr "Générer une nouvelle clé"
 msgid "API Key QR Code"
 msgstr "Clé API code QR"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr "Liste des plages de réseau local"
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr ""
+"Toutes les adresses de réseau local commencent par ces préfixes (souvent "
+"\"192.168.1.\" )"
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Accès Internet externe"
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
 msgstr ""
-"Vous pouvez définir des droits d'accès pour les systèmes en dehors de votre "
-"réseau local."
+"Vous pouvez définir les droits d'accès pour les systèmes en dehors de votre "
+"réseau local. Requiert la liste des plages de réseaux locaux à définir."
 
 #: sabnzbd/skintext.py
 msgid "No access"
@@ -3587,28 +3594,19 @@ msgid "Action when unwanted extension detected"
 msgstr "Action si une extension indésirable est détecté"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
-msgstr "Action lorsqu'une extension indésirable est détectée"
+msgid "Action when an unwanted extension is detected in RAR files"
+msgstr "Action si une extension indésirable est détecté dans les fichiers RAR"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Extensions indésirables"
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr "Liste noire"
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr "Liste blanche"
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
-"Sélectionnez un mode et listez toutes les extensions (non) souhaitées. Par "
-"exemple: <b>exe</b> ou <b>exe, com</b>"
+"Afficher toutes les extensions indésirables. Par exemple :  <b>exe</b> or "
+"<b>exe, com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -4187,12 +4185,12 @@ msgstr "Forcer le téléchargement"
 #. Config->RSS edit button
 #: sabnzbd/skintext.py
 msgid "Edit"
-msgstr "Modifier"
+msgstr ""
 
 #. Config->RSS when will be the next RSS scan
 #: sabnzbd/skintext.py
 msgid "Next scan at"
-msgstr "Prochain scan à"
+msgstr ""
 
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
@@ -4990,10 +4988,6 @@ msgstr "Afficher/masquer les fichiers terminés"
 msgid "View Script Log"
 msgstr "Afficher le journal des scripts"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr "Renommer la tâche annulera la Décompression Directe."
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/he.po

@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: ION, 2021\n"
 "Language-Team: Hebrew (https://www.transifex.com/sabnzbd/teams/111101/he/)\n"
@@ -600,15 +600,6 @@ msgstr "נכשל בעשייה (%s)"
 msgid "Failed moving %s to %s"
 msgstr "נכשל בהעברת %s אל %s"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr "ניסיון נחסם ליצור תיקייה %s"
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr "חיבור מסורב מאת:"
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr "חיבור מסורב עם שם המארח \"%s\" מאת:"
@@ -648,7 +639,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "אימות נכשל, בדוק שם משתמש/סיסמה."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "ניסיון כניסה בלתי מוצלח מן %s"
@@ -1189,6 +1179,10 @@ msgstr "NZB התווסף לתור"
 msgid "%s -> Unknown encoding"
 msgstr "קידוד בלתי ידוע -> %s"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s => חסר מכל השרתים, משליך"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3158,13 +3152,26 @@ msgstr "חולל מפתח חדש"
 msgid "API Key QR Code"
 msgstr "קוד QR של מפתח API"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr "רשימה של טווחי רשת מקומית"
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr "כל כתובות הרשת המקומית מתחילות במקדמים אלו (לעיתים \"192.168.1\")."
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "גישת אינטרנט חיצונית"
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
-msgstr "אתה יכול להגדיר זכויות גישה עבור מערכות מחוץ אל הרשת המקומית שלך."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
+msgstr ""
+"אתה יכול לקבוע זכויות גישה עבור מערכות מחוץ לרשת המקומית שלך. דורש שרשימה של"
+" טווחי רשת מקומית תהיה מוגדרת."
 
 #: sabnzbd/skintext.py
 msgid "No access"
@@ -3480,28 +3487,18 @@ msgid "Action when unwanted extension detected"
 msgstr "פעולה כאשר סיומת בלתי רצויה מתגלה"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
-msgstr "פעולה כאשר סיומת בלתי רצויה מתגלה"
+msgid "Action when an unwanted extension is detected in RAR files"
+msgstr "פעולה כאשר סיומת בלתי רצויה מתגלה בקבצי RAR"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "סיומות בלתי רצויות"
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr "רשימה שחורה"
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr "רשימה לבנה"
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
-"בחר מצב וכתוב את כל הסיומות הבלתי רצויות. לדוגמה: <b>exe</b> או <b>exe, "
-"com</b>"
+"רשום את כל הסיומות הבלתי רצויות. לדוגמה: <b>exe</b> או <b>exe, com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -4844,10 +4841,6 @@ msgstr "הסתר/הראה קבצים שלמים"
 msgid "View Script Log"
 msgstr "הצג יומן תסריטים"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr "שינוי השם של העבודה יבטל פריקה ישירה."
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/nb.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/sabnzbd/teams/111101/nb/)\n"
@@ -599,15 +599,6 @@ msgstr "Opprettelse av (%s) mislyktes"
 msgid "Failed moving %s to %s"
 msgstr "Kunne ikke flytte %s til %s"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr ""
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -649,7 +640,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Godkjenning mislyktes, kontroller brukernavn og passord."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "Mislykket påloggingsforsøk fra %s"
@@ -1187,6 +1177,10 @@ msgstr "NZB er lagt til i køen"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Ukjent koding"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s => mangler på alle servere, fjerner"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3146,12 +3140,24 @@ msgstr "Generer Ny Nøkkel"
 msgid "API Key QR Code"
 msgstr "API-nøkkel QR-kode"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr "Liste over lokale nettverksområder"
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr ""
+"Alle lokale nettverksadresser starter med disse prefix (ofte \"192.168.1.\")"
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Ekstern internettilgang"
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3468,26 +3474,19 @@ msgid "Action when unwanted extension detected"
 msgstr "Handling når uønsket filtype oppdaget"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
-msgstr ""
+msgid "Action when an unwanted extension is detected in RAR files"
+msgstr "Handling når uønsket filtype blir oppdaget i RAR filer."
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Uønsket filtyper"
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
+"Skriv alle uønskende filtyper. For eksempel: <b>exe</b>  eller <b>exe, "
+"com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -4825,10 +4824,6 @@ msgstr "Skjul/vis fullførte filer"
 msgid "View Script Log"
 msgstr "Se skriptlogg"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/nl.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2021\n"
 "Language-Team: Dutch (https://www.transifex.com/sabnzbd/teams/111101/nl/)\n"
@@ -619,15 +619,6 @@ msgstr "Aanmaken (%s) mislukt"
 msgid "Failed moving %s to %s"
 msgstr "Verplaatsen van %s naar %s mislukt"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr "Poging om map %s aan te maken geblokkeerd"
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr "Verbinding geweigerd van: "
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr "Verbinding met hostnaam \"%s\" geweigerd van:"
@@ -669,7 +660,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Inloggen mislukt, controleer gebruikersnaam en wachtwoord."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "Mislukte login progin bij %s"
@@ -1219,6 +1209,10 @@ msgstr "Download aan wachtrij toegevoegd"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Onbekende codering"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s => ontbreekt op alle servers, overslaan"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3210,14 +3204,28 @@ msgstr "Maak een nieuwe sleutel"
 msgid "API Key QR Code"
 msgstr "QR-code van de API-sleutel"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr "Lijst van lokale netwerk bereiken"
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr ""
+"Alle lokale netwerk adressen die beginnen met deze reeks (vaak "
+"\"192.168.1.\")"
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Externe toegang"
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
 msgstr ""
 "Je kunt toegangsrechten instellen voor systemen buiten je lokale netwerk. "
+"Hiervoor geef je een lijst van netwerk-bereiken in."
 
 #: sabnzbd/skintext.py
 msgid "No access"
@@ -3543,28 +3551,20 @@ msgid "Action when unwanted extension detected"
 msgstr "Actie bij ontdekken van ongewenste extensie"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
-msgstr "Actie bij ontdekken van een ongewenste extensie"
+msgid "Action when an unwanted extension is detected in RAR files"
+msgstr ""
+"Actie wanneer een ongewenste extensie wordt gevonden in een RAR-bestand"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Ongewenste extensies"
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr "Blacklist"
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr "Whitelist"
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
-"Kies een stand en voer een lijst van alle (on)gewenste extensies in. "
-"Voorbeeld: <b>exe</b> or <b>exe, com</b>"
+"Lijst van alle ongewenste extensies. Voorbeeld: <b>exe</b> or <b>exe, "
+"com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -4138,12 +4138,12 @@ msgstr "Forceer download"
 #. Config->RSS edit button
 #: sabnzbd/skintext.py
 msgid "Edit"
-msgstr "Wijzigen"
+msgstr ""
 
 #. Config->RSS when will be the next RSS scan
 #: sabnzbd/skintext.py
 msgid "Next scan at"
-msgstr "Wordt uitgevoerd om"
+msgstr ""
 
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
@@ -4937,10 +4937,6 @@ msgstr "Toon/verberg voltooide bestanden"
 msgid "View Script Log"
 msgstr "Toon Script resultaat"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr "Als je de naam wijzigt zal het Direct Uitpakken gestopt worden."
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/pl.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Polish (https://www.transifex.com/sabnzbd/teams/111101/pl/)\n"
@@ -598,15 +598,6 @@ msgstr "Nie udało się utworzyć (%s)"
 msgid "Failed moving %s to %s"
 msgstr "Nie udało się przenieść %s do %s"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr ""
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -648,7 +639,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Błąd połączenia, sprawdź nazwę użytkownika i hasło."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr ""
@@ -1188,6 +1178,10 @@ msgstr "NZB dodany do kolejki"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Nieznane kodowanie"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s => nie znaleziono na żadnym serwerze, porzucam"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3149,12 +3143,25 @@ msgstr "Utwórz nowy klucz"
 msgid "API Key QR Code"
 msgstr "Kod QR klucza API"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr "Lista zakresów sieci lokalnych"
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr ""
+"Wszystkie lokalne adresy sieciowe zaczynają się od tych prefiksów (często "
+"\"192.168.1.\")"
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Dostęp z zewnątrz"
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3473,26 +3480,20 @@ msgid "Action when unwanted extension detected"
 msgstr "Działanie dla niepożądanych rozszerzeń"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
+msgid "Action when an unwanted extension is detected in RAR files"
 msgstr ""
+"Działanie, które zostanie podjęte po wykryciu w pliku RAR niepożądanego "
+"rozszerzenia"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Niepożądane rozszerzenia"
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
+"Lista niepożądanych rozszerzeń. Przykład: <b>exe</b> lub <b>exe, com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -4833,10 +4834,6 @@ msgstr "Pokaż/ukryj ukończone pliki"
 msgid "View Script Log"
 msgstr "Zobacz log skryptu"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/pt_BR.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/sabnzbd/teams/111101/pt_BR/)\n"
@@ -602,15 +602,6 @@ msgstr "Falha ao criar (%s)"
 msgid "Failed moving %s to %s"
 msgstr "Falha ao mover %s para %s"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr ""
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -652,7 +643,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Falha de autenticação, verifique usuário / senha."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr ""
@@ -1189,6 +1179,10 @@ msgstr "NZB adicionado à fila"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Codificação desconhecida"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s => faltando em todos os servidores. Descartando"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3154,12 +3148,25 @@ msgstr "Gerar Nova Chave"
 msgid "API Key QR Code"
 msgstr "API Key QR Code"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr "Lista de intervalos de rede local"
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr ""
+"Todas os endereços da rede local começam com esse prefixo (geralmente "
+"\"192.168.1.\")"
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Acesso externo da Internet"
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3477,26 +3484,19 @@ msgid "Action when unwanted extension detected"
 msgstr "Ação quando extensão indesejada for detectada"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
-msgstr ""
+msgid "Action when an unwanted extension is detected in RAR files"
+msgstr "Ação quando uma extensão indesejada é detectada em arquivos RAR"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Extensões indesejadas"
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
+"Lista todas as extensões indesejadas. Por exemplo: <b>exe</b> ou <b>exe, "
+"com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -4837,10 +4837,6 @@ msgstr "Esconder/Exibir arquivos completos"
 msgid "View Script Log"
 msgstr "Exibir Log do Script"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/ro.po

@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Eduard Baniceru <war4peace@gmail.com>, 2021\n"
 "Language-Team: Romanian (https://www.transifex.com/sabnzbd/teams/111101/ro/)\n"
@@ -616,15 +616,6 @@ msgstr "Facere nereuşită (%s)"
 msgid "Failed moving %s to %s"
 msgstr "Mutare %s în %s nereuşită"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr ""
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr "Conectare refuzată cu gazda „%s” de la:"
@@ -666,7 +657,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Autentificare nereuşită, verifică nume utilizator/parolă."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "Încercare de conectare nereușită de la %s"
@@ -1215,6 +1205,10 @@ msgstr "NZB adăugat în coadă"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Codificare Necunoscută"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s => lipsă de pe toate serverele, ignorare"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3181,12 +3175,23 @@ msgstr "Generează o Cheie Nouă"
 msgid "API Key QR Code"
 msgstr "Cheie API sau Cod QR"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr "Listă de rețele locale"
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr "Toate rețelele locale încep cu acest prefixe (de regulă \"192.168.1.\")"
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Acces extern la internet"
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3503,26 +3508,19 @@ msgid "Action when unwanted extension detected"
 msgstr "Acțiune când se detectează o extensie nedorită"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
-msgstr ""
+msgid "Action when an unwanted extension is detected in RAR files"
+msgstr "Acțiune când se detectează  extensie nedorită într-un fișier RAR"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Extensii nedorite"
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
+"Listă cu toate extensiile nedorite. De exemplu: <b>exe</b> or <b>exe, "
+"com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -4863,10 +4861,6 @@ msgstr "Ascunde/arată fișierele finalizate"
 msgid "View Script Log"
 msgstr "Vezi Jurnal Script"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/ru.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Russian (https://www.transifex.com/sabnzbd/teams/111101/ru/)\n"
@@ -598,15 +598,6 @@ msgstr "Не удалось создать (%s)"
 msgid "Failed moving %s to %s"
 msgstr "Не удалось переместить %s в %s"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr ""
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -648,7 +639,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Ошибка проверки подлинности. Проверьте имя и пароль."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr ""
@@ -1189,6 +1179,10 @@ msgstr "NZB-файл добавлен в очередь"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> неизвестная кодировка"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s => отсутствует на всех серверах, отброшен"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3147,12 +3141,23 @@ msgstr "Создать новый ключ"
 msgid "API Key QR Code"
 msgstr "QR-код ключа API"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3471,25 +3476,16 @@ msgid "Action when unwanted extension detected"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
+msgid "Action when an unwanted extension is detected in RAR files"
 msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -4831,10 +4827,6 @@ msgstr ""
 msgid "View Script Log"
 msgstr "Просмотреть журнал сценария"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/sr.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Serbian (https://www.transifex.com/sabnzbd/teams/111101/sr/)\n"
@@ -597,15 +597,6 @@ msgstr "Neuspešno kreiranje (%s)"
 msgid "Failed moving %s to %s"
 msgstr "Neuspešno premeštanje %s u %s"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr ""
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -645,7 +636,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Аутентификација погрешна, проверити име/лозинку."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr ""
@@ -1183,6 +1173,10 @@ msgstr "NZB додат у ред"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Непознато енкодирање"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s => фали на свим серверима, одбацивање"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3134,12 +3128,25 @@ msgstr "Генериши нов кључ"
 msgid "API Key QR Code"
 msgstr "QR Код АПИ кључа"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr "Lista lokalnih mrežnih raspona"
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr ""
+"Sve lokalne mrežne adrese počinju sa sledećim prefiksima (najčešće "
+"\"192.168.1.\")"
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Екстерни приступ интернету"
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3457,26 +3464,18 @@ msgid "Action when unwanted extension detected"
 msgstr "Radnja kada je otkrivena neželjena ekstenzija"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
-msgstr ""
+msgid "Action when an unwanted extension is detected in RAR files"
+msgstr "Radnja kada je otkrivena neželjena ekstenzija u RAR datotekama"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Neželjene ekstenzije"
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
+"Lista svih neželjenih ekstenzija. Na primer: <b>exe</b> or <b>exe, com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -4810,10 +4809,6 @@ msgstr "Sakrij/prikaži sve završene datoteke"
 msgid "View Script Log"
 msgstr "Види извештај скрипта"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/sv.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Swedish (https://www.transifex.com/sabnzbd/teams/111101/sv/)\n"
@@ -597,15 +597,6 @@ msgstr "Skapande av (%s) misslyckades"
 msgid "Failed moving %s to %s"
 msgstr "Det gick inte att flyta %s till %s"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr ""
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -647,7 +638,6 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Autentisering misslyckades, kontrollera användarnamn och lösenord."
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr ""
@@ -1187,6 +1177,10 @@ msgstr "NZB tillagd i kön"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Okänd kodning"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s => saknas från alla servrar, kastar"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3145,12 +3139,25 @@ msgstr "Generera Ny Nyckel"
 msgid "API Key QR Code"
 msgstr "API- eller QR-kod"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr "Lista av lokala nätverksomfång"
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr ""
+"Alla lokala nätverksadresser startar med dessa prefixer (ofta "
+"\"192.168.1.\")"
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Extern internetåtkomst"
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3466,26 +3473,18 @@ msgid "Action when unwanted extension detected"
 msgstr "Händelse när oönskad filändelse hittad"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
-msgstr ""
+msgid "Action when an unwanted extension is detected in RAR files"
+msgstr "Händelse när en oönskad filändelse är hittad i RAR-filer."
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Oönskade filändelser"
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
+"Lista alla oönskade filändelser. Till Exempel: <b>exe</b> or <b>exe, com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -4822,10 +4821,6 @@ msgstr "Visa/göm färdiga filer"
 msgid "View Script Log"
 msgstr "Visa skriptlogg"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/main/zh_CN.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/sabnzbd/teams/111101/zh_CN/)\n"
@@ -594,15 +594,6 @@ msgstr "创建失败 (%s)"
 msgid "Failed moving %s to %s"
 msgstr "将 %s 移动到 %s 失败"
 
-#. Error message
-#: sabnzbd/filesystem.py
-msgid "Blocked attempt to create directory %s"
-msgstr ""
-
-#: sabnzbd/interface.py
-msgid "Refused connection from:"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -638,7 +629,6 @@ msgstr "缺身份认证信息，请在第三方程序中输入“配置”->“
 msgid "Authentication failed, check username/password."
 msgstr "身份认证失败，请检查用户名/密码。"
 
-#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "%s 中有失败的登陆请求"
@@ -1173,6 +1163,10 @@ msgstr "NZB 已添加到队列"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> 未知编码"
 
+#: sabnzbd/nzbstuff.py
+msgid "%s => missing from all servers, discarding"
+msgstr "%s => 所有服务器均缺失，正在舍弃"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
@@ -3113,13 +3107,24 @@ msgstr "生成新的 Key"
 msgid "API Key QR Code"
 msgstr "API Key QR 码"
 
+#: sabnzbd/skintext.py
+msgid "List of local network ranges"
+msgstr "本地网段列表"
+
+#: sabnzbd/skintext.py
+msgid ""
+"All local network addresses start with these prefixes (often \"192.168.1.\")"
+msgstr "本地网络地址以这些前缀开头 (通常为“192.168.1.”)"
+
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "外部互联网访问"
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network."
-msgstr ""
+msgid ""
+"You can set access rights for systems outside your local network. Requires "
+"List of local network ranges to be defined."
+msgstr "您可以设定非本地网络的访问权限。要求定义本地网络列表。"
 
 #: sabnzbd/skintext.py
 msgid "No access"
@@ -3415,26 +3420,17 @@ msgid "Action when unwanted extension detected"
 msgstr "侦测到不需要的扩展名时的操作"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected"
-msgstr ""
+msgid "Action when an unwanted extension is detected in RAR files"
+msgstr "RAR 文件中侦测到不需要的扩展名时的操作"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "不需要的扩展名"
 
-#: sabnzbd/skintext.py
-msgid "Blacklist"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Whitelist"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
-"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
-" <b>exe, com</b>"
-msgstr ""
+"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
+msgstr "所有不需要扩展名的列表。例如: <b>exe</b> 或 <b>exe, com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -4756,10 +4752,6 @@ msgstr "隐藏/显示已完成文件"
 msgid "View Script Log"
 msgstr "查看脚本日志"
 
-#: sabnzbd/skintext.py
-msgid "Renaming the job will abort Direct Unpack."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "LocalStorage (cookies) are disabled in your browser, interface settings will"

po/nsis/SABnsis.pot

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\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

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

po/nsis/da.po

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

po/nsis/de.po

@@ -4,13 +4,12 @@
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# Ben Hecht <benjamin.hecht@me.com>, 2021
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
-"Last-Translator: Ben Hecht <benjamin.hecht@me.com>, 2021\n"
+"Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: German (https://www.transifex.com/sabnzbd/teams/111101/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,8 +51,6 @@ msgid ""
 "The installer only supports Windows 8.1 and above, use the standalone legacy"
 " version to run on older Windows version."
 msgstr ""
-"Der Installer unterstützt nur Windows 8.1 und höher. Benutze die Standalone "
-"Version für ältere Windows Versionen."
 
 #: builder/win/NSIS_Installer.nsi
 msgid "This will uninstall SABnzbd from your system"

po/nsis/es.po

@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\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://www.transifex.com/sabnzbd/teams/111101/es/)\n"

po/nsis/fi.po

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

po/nsis/fr.po

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

po/nsis/he.po

@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: ION, 2021\n"
 "Language-Team: Hebrew (https://www.transifex.com/sabnzbd/teams/111101/he/)\n"

po/nsis/nb.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"Project-Id-Version: SABnzbd-3.2.0-develop\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://www.transifex.com/sabnzbd/teams/111101/nb/)\n"

po/nsis/nl.po

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

po/nsis/pl.po

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

po/nsis/pt_BR.po

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

po/nsis/ro.po

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

po/nsis/ru.po

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

po/nsis/sr.po

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

po/nsis/sv.po

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

po/nsis/zh_CN.po

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

sabnzbd/__init__.py

@@ -21,7 +21,6 @@ import datetime
 import tempfile
 import pickle
 import ctypes
-import ctypes.util
 import gzip
 import time
 import socket
@@ -36,7 +35,7 @@ from typing import Any, AnyStr
 # Determine platform flags
 ##############################################################################
 WIN32 = DARWIN = FOUNDATION = WIN64 = DOCKER = False
-KERNEL32 = LIBC = MACOSLIBC = None
+KERNEL32 = LIBC = None
 
 if os.name == "nt":
     WIN32 = True
@@ -57,12 +56,12 @@ elif os.name == "posix":
     except:
         pass
 
-    # See if we have the GNU glibc malloc_trim() memory release function
+    # See if we have Linux memory functions
     try:
         LIBC = ctypes.CDLL("libc.so.6")
-        LIBC.malloc_trim(0)  # try the malloc_trim() call, which is a GNU extension
+        LIBC.malloc_trim(0)
     except:
-        # No malloc_trim(), probably because no glibc
+        # No malloc_trim(), probably because no libc
         LIBC = None
         pass
 
@@ -71,7 +70,6 @@ elif os.name == "posix":
         DARWIN = True
         # 12 = Sierra, 11 = ElCaptain, 10 = Yosemite, 9 = Mavericks, 8 = MountainLion
         DARWIN_VERSION = int(platform.mac_ver()[0].split(".")[1])
-        MACOSLIBC = ctypes.CDLL(ctypes.util.find_library("c"), use_errno=True)  # the MacOS C library
         try:
             import Foundation
             import sabnzbd.utils.sleepless as sleepless
@@ -80,7 +78,6 @@ elif os.name == "posix":
         except:
             pass
 
-
 # Imported to be referenced from other files directly
 from sabnzbd.version import __version__, __baseline__
 
@@ -452,13 +449,13 @@ def halt():
 
 
 def notify_shutdown_loop():
-    """Trigger the main loop to wake up"""
+    """ Trigger the main loop to wake up"""
     with sabnzbd.SABSTOP_CONDITION:
         sabnzbd.SABSTOP_CONDITION.notify()
 
 
 def shutdown_program():
-    """Stop program after halting and saving"""
+    """ Stop program after halting and saving """
     if not sabnzbd.SABSTOP:
         logging.info("[%s] Performing SABnzbd shutdown", misc.caller_name())
         sabnzbd.halt()
@@ -468,7 +465,7 @@ def shutdown_program():
 
 
 def trigger_restart(timeout=None):
-    """Trigger a restart by setting a flag an shutting down CP"""
+    """ Trigger a restart by setting a flag an shutting down CP """
     # Sometimes we need to wait a bit to send good-bye to the browser
     if timeout:
         time.sleep(timeout)
@@ -482,22 +479,22 @@ def trigger_restart(timeout=None):
 # Misc Wrappers
 ##############################################################################
 def new_limit():
-    """Callback for article cache changes"""
+    """ Callback for article cache changes """
     sabnzbd.ArticleCache.new_limit(cfg.cache_limit.get_int())
 
 
 def guard_restart():
-    """Callback for config options requiring a restart"""
+    """ Callback for config options requiring a restart """
     sabnzbd.RESTART_REQ = True
 
 
 def guard_top_only():
-    """Callback for change of top_only option"""
+    """ Callback for change of top_only option """
     sabnzbd.NzbQueue.set_top_only(cfg.top_only())
 
 
 def guard_pause_on_pp():
-    """Callback for change of pause-download-on-pp"""
+    """ Callback for change of pause-download-on-pp """
     if cfg.pause_on_post_processing():
         pass  # Not safe to idle downloader, because we don't know
         # if post-processing is active now
@@ -506,17 +503,17 @@ def guard_pause_on_pp():
 
 
 def guard_quota_size():
-    """Callback for change of quota_size"""
+    """ Callback for change of quota_size """
     sabnzbd.BPSMeter.change_quota()
 
 
 def guard_quota_dp():
-    """Callback for change of quota_day or quota_period"""
+    """ Callback for change of quota_day or quota_period """
     sabnzbd.Scheduler.restart()
 
 
 def guard_language():
-    """Callback for change of the interface language"""
+    """ Callback for change of the interface language """
     sabnzbd.lang.set_language(cfg.language())
     sabnzbd.api.clear_trans_cache()
 
@@ -534,12 +531,12 @@ def set_https_verification(value):
 
 
 def guard_https_ver():
-    """Callback for change of https verification"""
+    """ Callback for change of https verification """
     set_https_verification(cfg.enable_https_verification())
 
 
 def add_url(url, pp=None, script=None, cat=None, priority=None, nzbname=None, password=None):
-    """Add NZB based on a URL, attributes optional"""
+    """ Add NZB based on a URL, attributes optional """
     if "http" not in url:
         return
     if not pp or pp == "-1":
@@ -568,7 +565,7 @@ def add_url(url, pp=None, script=None, cat=None, priority=None, nzbname=None, pa
 
 
 def save_state():
-    """Save all internal bookkeeping to disk"""
+    """ Save all internal bookkeeping to disk """
     config.save_config()
     sabnzbd.ArticleCache.flush_articles()
     sabnzbd.NzbQueue.save()
@@ -580,14 +577,14 @@ def save_state():
 
 
 def pause_all():
-    """Pause all activities than cause disk access"""
+    """ Pause all activities than cause disk access """
     sabnzbd.PAUSED_ALL = True
     sabnzbd.Downloader.pause()
     logging.debug("PAUSED_ALL active")
 
 
 def unpause_all():
-    """Resume all activities"""
+    """ Resume all activities """
     sabnzbd.PAUSED_ALL = False
     sabnzbd.Downloader.resume()
     logging.debug("PAUSED_ALL inactive")
@@ -599,20 +596,20 @@ def unpause_all():
 
 
 def backup_exists(filename: str) -> bool:
-    """Return True if backup exists and no_dupes is set"""
+    """ Return True if backup exists and no_dupes is set """
     path = cfg.nzb_backup_dir.get_path()
     return path and os.path.exists(os.path.join(path, filename + ".gz"))
 
 
 def backup_nzb(filename: str, data: AnyStr):
-    """Backup NZB file"""
+    """ Backup NZB file """
     path = cfg.nzb_backup_dir.get_path()
     if path:
         save_compressed(path, filename, data)
 
 
 def save_compressed(folder: str, filename: str, data: AnyStr):
-    """Save compressed NZB file in folder"""
+    """ Save compressed NZB file in folder """
     if filename.endswith(".nzb"):
         filename += ".gz"
     else:
@@ -728,7 +725,7 @@ def add_nzbfile(
 
 
 def enable_server(server):
-    """Enable server (scheduler only)"""
+    """ Enable server (scheduler only) """
     try:
         config.get_config("servers", server).enable.set(1)
     except:
@@ -739,7 +736,7 @@ def enable_server(server):
 
 
 def disable_server(server):
-    """Disable server (scheduler only)"""
+    """ Disable server (scheduler only) """
     try:
         config.get_config("servers", server).enable.set(0)
     except:
@@ -750,7 +747,7 @@ def disable_server(server):
 
 
 def system_shutdown():
-    """Shutdown system after halting download and saving bookkeeping"""
+    """ Shutdown system after halting download and saving bookkeeping """
     logging.info("Performing system shutdown")
 
     Thread(target=halt).start()
@@ -766,7 +763,7 @@ def system_shutdown():
 
 
 def system_hibernate():
-    """Hibernate system"""
+    """ Hibernate system """
     logging.info("Performing system hybernation")
     if sabnzbd.WIN32:
         powersup.win_hibernate()
@@ -777,7 +774,7 @@ def system_hibernate():
 
 
 def system_standby():
-    """Standby system"""
+    """ Standby system """
     logging.info("Performing system standby")
     if sabnzbd.WIN32:
         powersup.win_standby()
@@ -788,7 +785,7 @@ def system_standby():
 
 
 def restart_program():
-    """Restart program (used by scheduler)"""
+    """ Restart program (used by scheduler) """
     logging.info("Scheduled restart request")
     # Just set the stop flag, because stopping CherryPy from
     # the scheduler is not reliable
@@ -831,7 +828,7 @@ def change_queue_complete_action(action, new=True):
 
 
 def run_script(script):
-    """Run a user script (queue complete only)"""
+    """ Run a user script (queue complete only) """
     script_path = filesystem.make_script_path(script)
     if script_path:
         try:
@@ -842,7 +839,7 @@ def run_script(script):
 
 
 def keep_awake():
-    """If we still have work to do, keep Windows/macOS system awake"""
+    """ If we still have work to do, keep Windows/macOS system awake """
     if KERNEL32 or FOUNDATION:
         if sabnzbd.cfg.keep_awake():
             ES_CONTINUOUS = 0x80000000
@@ -890,7 +887,7 @@ def get_new_id(prefix, folder, check_list=None):
 
 
 def save_data(data, _id, path, do_pickle=True, silent=False):
-    """Save data to a diskfile"""
+    """ Save data to a diskfile """
     if not silent:
         logging.debug("[%s] Saving data for %s in %s", misc.caller_name(), _id, path)
     path = os.path.join(path, _id)
@@ -917,7 +914,7 @@ def save_data(data, _id, path, do_pickle=True, silent=False):
 
 
 def load_data(data_id, path, remove=True, do_pickle=True, silent=False):
-    """Read data from disk file"""
+    """ Read data from disk file """
     path = os.path.join(path, data_id)
 
     if not os.path.exists(path):
@@ -949,7 +946,7 @@ def load_data(data_id, path, remove=True, do_pickle=True, silent=False):
 
 
 def remove_data(_id: str, path: str):
-    """Remove admin file"""
+    """ Remove admin file """
     path = os.path.join(path, _id)
     try:
         if os.path.exists(path):
@@ -959,19 +956,19 @@ def remove_data(_id: str, path: str):
 
 
 def save_admin(data: Any, data_id: str):
-    """Save data in admin folder in specified format"""
+    """ Save data in admin folder in specified format """
     logging.debug("[%s] Saving data for %s", misc.caller_name(), data_id)
     save_data(data, data_id, cfg.admin_dir.get_path())
 
 
 def load_admin(data_id: str, remove=False, silent=False) -> Any:
-    """Read data in admin folder in specified format"""
+    """ Read data in admin folder in specified format """
     logging.debug("[%s] Loading data for %s", misc.caller_name(), data_id)
     return load_data(data_id, cfg.admin_dir.get_path(), remove=remove, silent=silent)
 
 
 def request_repair():
-    """Request a full repair on next restart"""
+    """ Request a full repair on next restart """
     path = os.path.join(cfg.admin_dir.get_path(), REPAIR_REQUEST)
     try:
         with open(path, "w") as f:
@@ -981,7 +978,7 @@ def request_repair():
 
 
 def check_repair_request():
-    """Return True if repair request found, remove afterwards"""
+    """ Return True if repair request found, remove afterwards """
     path = os.path.join(cfg.admin_dir.get_path(), REPAIR_REQUEST)
     if os.path.exists(path):
         try:
@@ -1044,7 +1041,7 @@ def check_all_tasks():
 
 
 def pid_file(pid_path=None, pid_file=None, port=0):
-    """Create or remove pid file"""
+    """ Create or remove pid file """
     if not sabnzbd.WIN32:
         if pid_path and pid_path.startswith("/"):
             sabnzbd.DIR_PID = os.path.join(pid_path, "sabnzbd-%d.pid" % port)
@@ -1077,14 +1074,14 @@ def check_incomplete_vs_complete():
 
 
 def wait_for_download_folder():
-    """Wait for download folder to become available"""
+    """ Wait for download folder to become available """
     while not cfg.download_dir.test_path():
         logging.debug('Waiting for "incomplete" folder')
         time.sleep(2.0)
 
 
 def test_ipv6():
-    """Check if external IPv6 addresses are reachable"""
+    """ Check if external IPv6 addresses are reachable """
     if not cfg.selftest_host():
         # User disabled the test, assume active IPv6
         return True
@@ -1112,7 +1109,7 @@ def test_ipv6():
 
 
 def test_cert_checking():
-    """Test quality of certificate validation"""
+    """ Test quality of certificate validation """
     # User disabled the test, assume proper SSL certificates
     if not cfg.selftest_host():
         return True
@@ -1139,7 +1136,7 @@ def test_cert_checking():
 
 
 def history_updated():
-    """To make sure we always have a fresh history"""
+    """ To make sure we always have a fresh history """
     sabnzbd.LAST_HISTORY_UPDATE += 1
     # Never go over the limit
     if sabnzbd.LAST_HISTORY_UPDATE + 1 >= sys.maxsize:

sabnzbd/api.py

@@ -29,7 +29,7 @@ import json
 import cherrypy
 import locale
 from threading import Thread
-from typing import Tuple, Optional, List
+from typing import List, Tuple
 
 import sabnzbd
 from sabnzbd.constants import (
@@ -59,7 +59,7 @@ from sabnzbd.misc import (
     opts_to_pp,
 )
 from sabnzbd.filesystem import diskspace, get_ext, clip_path, remove_all, list_scripts
-from sabnzbd.encoding import xml_name, utob
+from sabnzbd.encoding import xml_name
 from sabnzbd.utils.servertests import test_nntp_server_dict
 from sabnzbd.getipaddress import localipv4, publicipv4, ipv6, addresslookup
 from sabnzbd.database import build_history_info, unpack_history_info, HistoryDB
@@ -86,7 +86,26 @@ _MSG_BAD_SERVER_PARMS = "Incorrect server settings"
 
 
 def api_handler(kwargs):
-    """API Dispatcher"""
+    """ API Dispatcher """
+    if cfg.api_logging():
+        # Was it proxy forwarded?
+        xff = cherrypy.request.headers.get("X-Forwarded-For")
+        if xff:
+            logging.debug(
+                "API-call from %s (X-Forwarded-For: %s) [%s] %s",
+                cherrypy.request.remote.ip,
+                xff,
+                cherrypy.request.headers.get("User-Agent", "??"),
+                kwargs,
+            )
+        else:
+            logging.debug(
+                "API-call from %s [%s] %s",
+                cherrypy.request.remote.ip,
+                cherrypy.request.headers.get("User-Agent", "??"),
+                kwargs,
+            )
+
     # Clean-up the arguments
     for vr in ("mode", "output", "name"):
         if vr in kwargs and isinstance(kwargs[vr], list):
@@ -96,18 +115,23 @@ def api_handler(kwargs):
     output = kwargs.get("output", "")
     name = kwargs.get("name", "")
 
+    if mode not in ("version", "auth"):
+        msg = sabnzbd.interface.check_apikey(kwargs)
+        if msg:
+            return report(output, msg)
+
     response = _api_table.get(mode, (_api_undefined, 2))[0](name, output, kwargs)
     return response
 
 
 def _api_get_config(name, output, kwargs):
-    """API: accepts output, keyword, section"""
+    """ API: accepts output, keyword, section """
     _, data = config.get_dconfig(kwargs.get("section"), kwargs.get("keyword"))
     return report(output, keyword="config", data=data)
 
 
 def _api_set_config(name, output, kwargs):
-    """API: accepts output, keyword, section"""
+    """ API: accepts output, keyword, section """
     if cfg.configlock():
         return report(output, _MSG_CONFIG_LOCKED)
     if kwargs.get("section") == "servers":
@@ -126,7 +150,7 @@ def _api_set_config(name, output, kwargs):
 
 
 def _api_set_config_default(name, output, kwargs):
-    """API: Reset requested config variables back to defaults. Currently only for misc-section"""
+    """ API: Reset requested config variables back to defaults. Currently only for misc-section """
     if cfg.configlock():
         return report(output, _MSG_CONFIG_LOCKED)
     keywords = kwargs.get("keyword", [])
@@ -141,7 +165,7 @@ def _api_set_config_default(name, output, kwargs):
 
 
 def _api_del_config(name, output, kwargs):
-    """API: accepts output, keyword, section"""
+    """ API: accepts output, keyword, section """
     if cfg.configlock():
         return report(output, _MSG_CONFIG_LOCKED)
     if del_from_section(kwargs):
@@ -151,13 +175,13 @@ def _api_del_config(name, output, kwargs):
 
 
 def _api_queue(name, output, kwargs):
-    """API: Dispatcher for mode=queue"""
+    """ API: Dispatcher for mode=queue """
     value = kwargs.get("value", "")
     return _api_queue_table.get(name, (_api_queue_default, 2))[0](output, value, kwargs)
 
 
 def _api_queue_delete(output, value, kwargs):
-    """API: accepts output, value"""
+    """ API: accepts output, value """
     if value.lower() == "all":
         removed = sabnzbd.NzbQueue.remove_all(kwargs.get("search"))
         return report(output, keyword="", data={"status": bool(removed), "nzo_ids": removed})
@@ -171,7 +195,7 @@ def _api_queue_delete(output, value, kwargs):
 
 
 def _api_queue_delete_nzf(output, value, kwargs):
-    """API: accepts value(=nzo_id), value2(=nzf_id)"""
+    """ API: accepts value(=nzo_id), value2(=nzf_id) """
     value2 = kwargs.get("value2")
     if value and value2:
         removed = sabnzbd.NzbQueue.remove_nzf(value, value2, force_delete=True)
@@ -181,7 +205,7 @@ def _api_queue_delete_nzf(output, value, kwargs):
 
 
 def _api_queue_rename(output, value, kwargs):
-    """API: accepts output, value(=old name), value2(=new name), value3(=password)"""
+    """ API: accepts output, value(=old name), value2(=new name), value3(=password) """
     value2 = kwargs.get("value2")
     value3 = kwargs.get("value3")
     if value and value2:
@@ -192,19 +216,19 @@ def _api_queue_rename(output, value, kwargs):
 
 
 def _api_queue_change_complete_action(output, value, kwargs):
-    """API: accepts output, value(=action)"""
+    """ API: accepts output, value(=action) """
     sabnzbd.change_queue_complete_action(value)
     return report(output)
 
 
 def _api_queue_purge(output, value, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     removed = sabnzbd.NzbQueue.remove_all(kwargs.get("search"))
     return report(output, keyword="", data={"status": bool(removed), "nzo_ids": removed})
 
 
 def _api_queue_pause(output, value, kwargs):
-    """API: accepts output, value(=list of nzo_id)"""
+    """ API: accepts output, value(=list of nzo_id) """
     if value:
         items = value.split(",")
         handled = sabnzbd.NzbQueue.pause_multiple_nzo(items)
@@ -214,7 +238,7 @@ def _api_queue_pause(output, value, kwargs):
 
 
 def _api_queue_resume(output, value, kwargs):
-    """API: accepts output, value(=list of nzo_id)"""
+    """ API: accepts output, value(=list of nzo_id) """
     if value:
         items = value.split(",")
         handled = sabnzbd.NzbQueue.resume_multiple_nzo(items)
@@ -224,7 +248,7 @@ def _api_queue_resume(output, value, kwargs):
 
 
 def _api_queue_priority(output, value, kwargs):
-    """API: accepts output, value(=nzo_id), value2(=priority)"""
+    """ API: accepts output, value(=nzo_id), value2(=priority) """
     value2 = kwargs.get("value2")
     if value and value2:
         try:
@@ -242,7 +266,7 @@ def _api_queue_priority(output, value, kwargs):
 
 
 def _api_queue_sort(output, value, kwargs):
-    """API: accepts output, sort, dir"""
+    """ API: accepts output, sort, dir """
     sort = kwargs.get("sort")
     direction = kwargs.get("dir", "")
     if sort:
@@ -253,7 +277,7 @@ def _api_queue_sort(output, value, kwargs):
 
 
 def _api_queue_default(output, value, kwargs):
-    """API: accepts output, sort, dir, start, limit"""
+    """ API: accepts output, sort, dir, start, limit """
     start = int_conv(kwargs.get("start"))
     limit = int_conv(kwargs.get("limit"))
     search = kwargs.get("search")
@@ -264,7 +288,7 @@ def _api_queue_default(output, value, kwargs):
 
 
 def _api_queue_rating(output, value, kwargs):
-    """API: accepts output, value(=nzo_id), type, setting, detail"""
+    """ API: accepts output, value(=nzo_id), type, setting, detail """
     vote_map = {"up": sabnzbd.Rating.VOTE_UP, "down": sabnzbd.Rating.VOTE_DOWN}
     flag_map = {
         "spam": sabnzbd.Rating.FLAG_SPAM,
@@ -296,17 +320,17 @@ def _api_queue_rating(output, value, kwargs):
 
 
 def _api_options(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     return options_list(output)
 
 
 def _api_translate(name, output, kwargs):
-    """API: accepts output, value(=acronym)"""
+    """ API: accepts output, value(=acronym) """
     return report(output, keyword="value", data=T(kwargs.get("value", "")))
 
 
 def _api_addfile(name, output, kwargs):
-    """API: accepts name, output, pp, script, cat, priority, nzbname"""
+    """ API: accepts name, output, pp, script, cat, priority, nzbname """
     # Normal upload will send the nzb in a kw arg called name or nzbfile
     if not name or isinstance(name, str):
         name = kwargs.get("nzbfile", None)
@@ -332,7 +356,7 @@ def _api_addfile(name, output, kwargs):
 
 
 def _api_retry(name, output, kwargs):
-    """API: accepts name, output, value(=nzo_id), nzbfile(=optional NZB), password (optional)"""
+    """ API: accepts name, output, value(=nzo_id), nzbfile(=optional NZB), password (optional) """
     value = kwargs.get("value")
     # Normal upload will send the nzb in a kw arg called nzbfile
     if name is None or isinstance(name, str):
@@ -348,7 +372,7 @@ def _api_retry(name, output, kwargs):
 
 
 def _api_cancel_pp(name, output, kwargs):
-    """API: accepts name, output, value(=nzo_id)"""
+    """ API: accepts name, output, value(=nzo_id) """
     nzo_id = kwargs.get("value")
     if sabnzbd.PostProcessor.cancel_pp(nzo_id):
         return report(output, keyword="", data={"status": True, "nzo_id": nzo_id})
@@ -357,7 +381,7 @@ def _api_cancel_pp(name, output, kwargs):
 
 
 def _api_addlocalfile(name, output, kwargs):
-    """API: accepts name, output, pp, script, cat, priority, nzbname"""
+    """ API: accepts name, output, pp, script, cat, priority, nzbname """
     if name:
         if os.path.exists(name):
             pp = kwargs.get("pp")
@@ -395,7 +419,7 @@ def _api_addlocalfile(name, output, kwargs):
 
 
 def _api_switch(name, output, kwargs):
-    """API: accepts output, value(=first id), value2(=second id)"""
+    """ API: accepts output, value(=first id), value2(=second id) """
     value = kwargs.get("value")
     value2 = kwargs.get("value2")
     if value and value2:
@@ -407,7 +431,7 @@ def _api_switch(name, output, kwargs):
 
 
 def _api_change_cat(name, output, kwargs):
-    """API: accepts output, value(=nzo_id), value2(=category)"""
+    """ API: accepts output, value(=nzo_id), value2(=category) """
     value = kwargs.get("value")
     value2 = kwargs.get("value2")
     if value and value2:
@@ -422,7 +446,7 @@ def _api_change_cat(name, output, kwargs):
 
 
 def _api_change_script(name, output, kwargs):
-    """API: accepts output, value(=nzo_id), value2(=script)"""
+    """ API: accepts output, value(=nzo_id), value2(=script) """
     value = kwargs.get("value")
     value2 = kwargs.get("value2")
     if value and value2:
@@ -437,7 +461,7 @@ def _api_change_script(name, output, kwargs):
 
 
 def _api_change_opts(name, output, kwargs):
-    """API: accepts output, value(=nzo_id), value2(=pp)"""
+    """ API: accepts output, value(=nzo_id), value2(=pp) """
     value = kwargs.get("value")
     value2 = kwargs.get("value2")
     result = 0
@@ -447,13 +471,13 @@ def _api_change_opts(name, output, kwargs):
 
 
 def _api_fullstatus(name, output, kwargs):
-    """API: full history status"""
+    """ API: full history status"""
     status = build_status(skip_dashboard=kwargs.get("skip_dashboard", 1), output=output)
     return report(output, keyword="status", data=status)
 
 
 def _api_history(name, output, kwargs):
-    """API: accepts output, value(=nzo_id), start, limit, search, nzo_ids"""
+    """ API: accepts output, value(=nzo_id), start, limit, search, nzo_ids """
     value = kwargs.get("value", "")
     start = int_conv(kwargs.get("start"))
     limit = int_conv(kwargs.get("limit"))
@@ -470,9 +494,6 @@ def _api_history(name, output, kwargs):
     if categories and not isinstance(categories, list):
         categories = [categories]
 
-    if nzo_ids and not isinstance(nzo_ids, list):
-        nzo_ids = nzo_ids.split(",")
-
     if not limit:
         limit = cfg.history_limit()
 
@@ -517,7 +538,7 @@ def _api_history(name, output, kwargs):
 
 
 def _api_get_files(name, output, kwargs):
-    """API: accepts output, value(=nzo_id)"""
+    """ API: accepts output, value(=nzo_id) """
     value = kwargs.get("value")
     if value:
         return report(output, keyword="files", data=build_file_list(value))
@@ -526,7 +547,7 @@ def _api_get_files(name, output, kwargs):
 
 
 def _api_addurl(name, output, kwargs):
-    """API: accepts name, output, pp, script, cat, priority, nzbname"""
+    """ API: accepts name, output, pp, script, cat, priority, nzbname """
     pp = kwargs.get("pp")
     script = kwargs.get("script")
     cat = kwargs.get("cat")
@@ -544,27 +565,27 @@ def _api_addurl(name, output, kwargs):
 
 
 def _api_pause(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     sabnzbd.Scheduler.plan_resume(0)
     sabnzbd.Downloader.pause()
     return report(output)
 
 
 def _api_resume(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     sabnzbd.Scheduler.plan_resume(0)
     sabnzbd.unpause_all()
     return report(output)
 
 
 def _api_shutdown(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     sabnzbd.shutdown_program()
     return report(output)
 
 
 def _api_warnings(name, output, kwargs):
-    """API: accepts name, output"""
+    """ API: accepts name, output """
     if name == "clear":
         return report(output, keyword="warnings", data=sabnzbd.GUIHANDLER.clear())
     elif name == "show":
@@ -575,22 +596,22 @@ def _api_warnings(name, output, kwargs):
 
 
 def _api_get_cats(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     return report(output, keyword="categories", data=list_cats(False))
 
 
 def _api_get_scripts(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     return report(output, keyword="scripts", data=list_scripts())
 
 
 def _api_version(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     return report(output, keyword="version", data=sabnzbd.__version__)
 
 
 def _api_auth(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     auth = "None"
     if not cfg.disable_key():
         auth = "badkey"
@@ -608,7 +629,7 @@ def _api_auth(name, output, kwargs):
 
 
 def _api_restart(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     logging.info("Restart requested by API")
     # Do the shutdown async to still send goodbye to browser
     Thread(target=sabnzbd.trigger_restart, kwargs={"timeout": 1}).start()
@@ -616,7 +637,7 @@ def _api_restart(name, output, kwargs):
 
 
 def _api_restart_repair(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     logging.info("Queue repair requested by API")
     sabnzbd.request_repair()
     # Do the shutdown async to still send goodbye to browser
@@ -625,26 +646,26 @@ def _api_restart_repair(name, output, kwargs):
 
 
 def _api_disconnect(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     sabnzbd.Downloader.disconnect()
     return report(output)
 
 
 def _api_osx_icon(name, output, kwargs):
-    """API: accepts output, value"""
+    """ API: accepts output, value """
     value = kwargs.get("value", "1").strip()
     cfg.osx_menu.set(value != "0")
     return report(output)
 
 
 def _api_rescan(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     sabnzbd.NzbQueue.scan_jobs(all_jobs=False, action=True)
     return report(output)
 
 
 def _api_eval_sort(name, output, kwargs):
-    """API: evaluate sorting expression"""
+    """ API: evaluate sorting expression """
     name = kwargs.get("name", "")
     value = kwargs.get("value", "")
     title = kwargs.get("title")
@@ -657,43 +678,43 @@ def _api_eval_sort(name, output, kwargs):
 
 
 def _api_watched_now(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     sabnzbd.DirScanner.scan()
     return report(output)
 
 
 def _api_resume_pp(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     sabnzbd.PostProcessor.paused = False
     return report(output)
 
 
 def _api_pause_pp(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     sabnzbd.PostProcessor.paused = True
     return report(output)
 
 
 def _api_rss_now(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     # Run RSS scan async, because it can take a long time
     sabnzbd.Scheduler.force_rss()
     return report(output)
 
 
 def _api_retry_all(name, output, kwargs):
-    """API: Retry all failed items in History"""
+    """ API: Retry all failed items in History """
     return report(output, keyword="status", data=retry_all_jobs())
 
 
 def _api_reset_quota(name, output, kwargs):
-    """Reset quota left"""
+    """ Reset quota left """
     sabnzbd.BPSMeter.reset_quota(force=True)
     return report(output)
 
 
 def _api_test_email(name, output, kwargs):
-    """API: send a test email, return result"""
+    """ API: send a test email, return result """
     logging.info("Sending test email")
     pack = {"download": ["action 1", "action 2"], "unpack": ["action 1", "action 2"]}
     res = sabnzbd.emailer.endjob(
@@ -715,61 +736,61 @@ def _api_test_email(name, output, kwargs):
 
 
 def _api_test_windows(name, output, kwargs):
-    """API: send a test to Windows, return result"""
+    """ API: send a test to Windows, return result """
     logging.info("Sending test notification")
     res = sabnzbd.notifier.send_windows("SABnzbd", T("Test Notification"), "other")
     return report(output, error=res)
 
 
 def _api_test_notif(name, output, kwargs):
-    """API: send a test to Notification Center, return result"""
+    """ API: send a test to Notification Center, return result """
     logging.info("Sending test notification")
     res = sabnzbd.notifier.send_notification_center("SABnzbd", T("Test Notification"), "other")
     return report(output, error=res)
 
 
 def _api_test_osd(name, output, kwargs):
-    """API: send a test OSD notification, return result"""
+    """ API: send a test OSD notification, return result """
     logging.info("Sending OSD notification")
     res = sabnzbd.notifier.send_notify_osd("SABnzbd", T("Test Notification"))
     return report(output, error=res)
 
 
 def _api_test_prowl(name, output, kwargs):
-    """API: send a test Prowl notification, return result"""
+    """ API: send a test Prowl notification, return result """
     logging.info("Sending Prowl notification")
     res = sabnzbd.notifier.send_prowl("SABnzbd", T("Test Notification"), "other", force=True, test=kwargs)
     return report(output, error=res)
 
 
 def _api_test_pushover(name, output, kwargs):
-    """API: send a test Pushover notification, return result"""
+    """ API: send a test Pushover notification, return result """
     logging.info("Sending Pushover notification")
     res = sabnzbd.notifier.send_pushover("SABnzbd", T("Test Notification"), "other", force=True, test=kwargs)
     return report(output, error=res)
 
 
 def _api_test_pushbullet(name, output, kwargs):
-    """API: send a test Pushbullet notification, return result"""
+    """ API: send a test Pushbullet notification, return result """
     logging.info("Sending Pushbullet notification")
     res = sabnzbd.notifier.send_pushbullet("SABnzbd", T("Test Notification"), "other", force=True, test=kwargs)
     return report(output, error=res)
 
 
 def _api_test_nscript(name, output, kwargs):
-    """API: execute a test notification script, return result"""
+    """ API: execute a test notification script, return result """
     logging.info("Executing notification script")
     res = sabnzbd.notifier.send_nscript("SABnzbd", T("Test Notification"), "other", force=True, test=kwargs)
     return report(output, error=res)
 
 
 def _api_undefined(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     return report(output, _MSG_NOT_IMPLEMENTED)
 
 
 def _api_browse(name, output, kwargs):
-    """Return tree of local path"""
+    """ Return tree of local path """
     compact = kwargs.get("compact")
 
     if compact and compact == "1":
@@ -783,14 +804,14 @@ def _api_browse(name, output, kwargs):
 
 
 def _api_config(name, output, kwargs):
-    """API: Dispatcher for "config" """
+    """ API: Dispatcher for "config" """
     if cfg.configlock():
         return report(output, _MSG_CONFIG_LOCKED)
     return _api_config_table.get(name, (_api_config_undefined, 2))[0](output, kwargs)
 
 
 def _api_config_speedlimit(output, kwargs):
-    """API: accepts output, value(=speed)"""
+    """ API: accepts output, value(=speed) """
     value = kwargs.get("value")
     if not value:
         value = "0"
@@ -799,12 +820,12 @@ def _api_config_speedlimit(output, kwargs):
 
 
 def _api_config_get_speedlimit(output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     return report(output, keyword="speedlimit", data=sabnzbd.Downloader.get_limit())
 
 
 def _api_config_set_colorscheme(output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output"""
     value = kwargs.get("value")
     if value:
         cfg.web_color.set(value)
@@ -814,21 +835,21 @@ def _api_config_set_colorscheme(output, kwargs):
 
 
 def _api_config_set_pause(output, kwargs):
-    """API: accepts output, value(=pause interval)"""
+    """ API: accepts output, value(=pause interval) """
     value = kwargs.get("value")
     sabnzbd.Scheduler.plan_resume(int_conv(value))
     return report(output)
 
 
 def _api_config_set_apikey(output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     cfg.api_key.set(config.create_api_key())
     config.save_config()
     return report(output, keyword="apikey", data=cfg.api_key())
 
 
 def _api_config_set_nzbkey(output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     cfg.nzb_key.set(config.create_api_key())
     config.save_config()
     return report(output, keyword="nzbkey", data=cfg.nzb_key())
@@ -849,7 +870,7 @@ def _api_config_regenerate_certs(output, kwargs):
 
 
 def _api_config_test_server(output, kwargs):
-    """API: accepts output, server-params"""
+    """ API: accepts output, server-params """
     result, msg = test_nntp_server_dict(kwargs)
     response = {"result": result, "message": msg}
     if output:
@@ -859,12 +880,12 @@ def _api_config_test_server(output, kwargs):
 
 
 def _api_config_undefined(output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     return report(output, _MSG_NOT_IMPLEMENTED)
 
 
 def _api_server_stats(name, output, kwargs):
-    """API: accepts output"""
+    """ API: accepts output """
     sum_t, sum_m, sum_w, sum_d = sabnzbd.BPSMeter.get_sums()
     stats = {"total": sum_t, "month": sum_m, "week": sum_w, "day": sum_d, "servers": {}}
 
@@ -924,27 +945,27 @@ _api_table = {
     "version": (_api_version, 1),
     "auth": (_api_auth, 1),
     "restart": (_api_restart, 3),
-    "restart_repair": (_api_restart_repair, 3),
+    "restart_repair": (_api_restart_repair, 2),
     "disconnect": (_api_disconnect, 2),
     "osx_icon": (_api_osx_icon, 3),
     "gc_stats": (_api_gc_stats, 3),
     "rescan": (_api_rescan, 2),
-    "eval_sort": (_api_eval_sort, 3),
+    "eval_sort": (_api_eval_sort, 2),
     "watched_now": (_api_watched_now, 2),
     "resume_pp": (_api_resume_pp, 2),
     "pause_pp": (_api_pause_pp, 2),
     "rss_now": (_api_rss_now, 2),
-    "browse": (_api_browse, 3),
+    "browse": (_api_browse, 2),
     "retry_all": (_api_retry_all, 2),
-    "reset_quota": (_api_reset_quota, 3),
-    "test_email": (_api_test_email, 3),
-    "test_windows": (_api_test_windows, 3),
-    "test_notif": (_api_test_notif, 3),
-    "test_osd": (_api_test_osd, 3),
-    "test_pushover": (_api_test_pushover, 3),
-    "test_pushbullet": (_api_test_pushbullet, 3),
-    "test_prowl": (_api_test_prowl, 3),
-    "test_nscript": (_api_test_nscript, 3),
+    "reset_quota": (_api_reset_quota, 2),
+    "test_email": (_api_test_email, 2),
+    "test_windows": (_api_test_windows, 2),
+    "test_notif": (_api_test_notif, 2),
+    "test_osd": (_api_test_osd, 2),
+    "test_pushover": (_api_test_pushover, 2),
+    "test_pushbullet": (_api_test_pushbullet, 2),
+    "test_prowl": (_api_test_prowl, 2),
+    "test_nscript": (_api_test_nscript, 2),
 }
 
 _api_queue_table = {
@@ -964,24 +985,23 @@ _api_config_table = {
     "speedlimit": (_api_config_speedlimit, 2),
     "set_speedlimit": (_api_config_speedlimit, 2),
     "get_speedlimit": (_api_config_get_speedlimit, 2),
+    "set_colorscheme": (_api_config_set_colorscheme, 2),
     "set_pause": (_api_config_set_pause, 2),
-    "set_colorscheme": (_api_config_set_colorscheme, 3),
     "set_apikey": (_api_config_set_apikey, 3),
     "set_nzbkey": (_api_config_set_nzbkey, 3),
     "regenerate_certs": (_api_config_regenerate_certs, 3),
-    "test_server": (_api_config_test_server, 3),
+    "test_server": (_api_config_test_server, 2),
 }
 
 
-def api_level(mode: str, name: str) -> int:
-    """Return access level required for this API call"""
-    if mode == "queue" and name in _api_queue_table:
-        return _api_queue_table[name][1]
-    if mode == "config" and name in _api_config_table:
-        return _api_config_table[name][1]
-    if mode in _api_table:
-        return _api_table[mode][1]
-    # It is invalid if it's none of these, but that's is handled somewhere else
+def api_level(cmd, name):
+    """ Return access level required for this API call """
+    if cmd in _api_table:
+        return _api_table[cmd][1]
+    if name == "queue" and cmd in _api_queue_table:
+        return _api_queue_table[cmd][1]
+    if name == "config" and cmd in _api_config_table:
+        return _api_config_table[cmd][1]
     return 4
 
 
@@ -1002,7 +1022,7 @@ def report(output, error=None, keyword="value", data=None):
                 info = data
             else:
                 info = {keyword: data}
-        response = utob(json.dumps(info))
+        response = json.dumps(info).encode("utf-8")
 
     elif output == "xml":
         if not keyword:
@@ -1091,7 +1111,7 @@ class xml_factory:
 
 
 def handle_server_api(output, kwargs):
-    """Special handler for API-call 'set_config' [servers]"""
+    """ Special handler for API-call 'set_config' [servers] """
     name = kwargs.get("keyword")
     if not name:
         name = kwargs.get("name")
@@ -1109,7 +1129,7 @@ def handle_server_api(output, kwargs):
 
 
 def handle_rss_api(output, kwargs):
-    """Special handler for API-call 'set_config' [rss]"""
+    """ Special handler for API-call 'set_config' [rss] """
     name = kwargs.get("keyword")
     if not name:
         name = kwargs.get("name")
@@ -1143,7 +1163,7 @@ def handle_rss_api(output, kwargs):
 
 
 def handle_cat_api(output, kwargs):
-    """Special handler for API-call 'set_config' [categories]"""
+    """ Special handler for API-call 'set_config' [categories] """
     name = kwargs.get("keyword")
     if not name:
         name = kwargs.get("name")
@@ -1168,7 +1188,6 @@ def build_status(skip_dashboard=False, output=None):
     info["loglevel"] = str(cfg.log_level())
     info["folders"] = sabnzbd.NzbQueue.scan_jobs(all_jobs=False, action=False)
     info["configfn"] = config.get_filename()
-    info["warnings"] = sabnzbd.GUIHANDLER.content()
 
     # Dashboard: Speed of System
     info["cpumodel"] = getcpu()
@@ -1198,22 +1217,42 @@ def build_status(skip_dashboard=False, output=None):
             info["dnslookup"] = None
 
     info["servers"] = []
-    # Servers-list could be modified during iteration, so we need a copy
-    for server in sabnzbd.Downloader.servers[:]:
-        connected = sum(nw.connected for nw in server.idle_threads[:])
+    servers = sorted(sabnzbd.Downloader.servers[:], key=lambda svr: "%02d%s" % (svr.priority, svr.displayname.lower()))
+    for server in servers:
         serverconnections = []
-        for nw in server.busy_threads[:]:
+        connected = 0
+
+        for nw in server.idle_threads[:]:
+            if nw.connected:
+                connected += 1
+
+        for nw in server.busy_threads[:]:
+            article = nw.article
+            art_name = ""
+            nzf_name = ""
+            nzo_name = ""
+
+            if article:
+                nzf = article.nzf
+                nzo = nzf.nzo
+
+                art_name = article.article
+                # filename field is not always present
+                try:
+                    nzf_name = nzf.filename
+                except:  # attribute error
+                    nzf_name = nzf.subject
+                nzo_name = nzo.final_name
+
+            # For the templates or for JSON
+            if output:
+                thread_info = {"thrdnum": nw.thrdnum, "art_name": art_name, "nzf_name": nzf_name, "nzo_name": nzo_name}
+                serverconnections.append(thread_info)
+            else:
+                serverconnections.append((nw.thrdnum, art_name, nzf_name, nzo_name))
+
             if nw.connected:
                 connected += 1
-            if nw.article:
-                serverconnections.append(
-                    {
-                        "thrdnum": nw.thrdnum,
-                        "art_name": nw.article.article,
-                        "nzf_name": nw.article.nzf.filename,
-                        "nzo_name": nw.article.nzf.nzo.final_name,
-                    }
-                )
 
         if server.warning and not (connected or server.errormsg):
             connected = server.warning
@@ -1221,20 +1260,38 @@ def build_status(skip_dashboard=False, output=None):
         if server.request and not server.info:
             connected = T(" Resolving address").replace(" ", "")
 
-        server_info = {
-            "servername": server.displayname,
-            "serveractiveconn": connected,
-            "servertotalconn": server.threads,
-            "serverconnections": serverconnections,
-            "serverssl": server.ssl,
-            "serversslinfo": server.ssl_info,
-            "serveractive": server.active,
-            "servererror": server.errormsg,
-            "serverpriority": server.priority,
-            "serveroptional": server.optional,
-            "serverbps": to_units(sabnzbd.BPSMeter.server_bps.get(server.id, 0)),
-        }
-        info["servers"].append(server_info)
+        # For the templates or for JSON
+        if output:
+            server_info = {
+                "servername": server.displayname,
+                "serveractiveconn": connected,
+                "servertotalconn": server.threads,
+                "serverconnections": serverconnections,
+                "serverssl": server.ssl,
+                "serversslinfo": server.ssl_info,
+                "serveractive": server.active,
+                "servererror": server.errormsg,
+                "serverpriority": server.priority,
+                "serveroptional": server.optional,
+                "serverbps": to_units(sabnzbd.BPSMeter.server_bps.get(server.id, 0)),
+            }
+            info["servers"].append(server_info)
+        else:
+            info["servers"].append(
+                (
+                    server.displayname,
+                    "",
+                    connected,
+                    serverconnections,
+                    server.ssl,
+                    server.active,
+                    server.errormsg,
+                    server.priority,
+                    server.optional,
+                )
+            )
+
+    info["warnings"] = sabnzbd.GUIHANDLER.content()
 
     return info
 
@@ -1350,7 +1407,7 @@ def build_queue(start=0, limit=0, trans=False, output=None, search=None, nzo_ids
 
 
 def fast_queue() -> Tuple[bool, int, float, str]:
-    """Return paused, bytes_left, bpsnow, time_left"""
+    """ Return paused, bytes_left, bpsnow, time_left """
     bytes_left = sabnzbd.sabnzbd.NzbQueue.remaining()
     paused = sabnzbd.Downloader.paused
     bpsnow = sabnzbd.BPSMeter.bps
@@ -1372,7 +1429,7 @@ def build_file_list(nzo_id: str):
         for nzf in finished_files:
             jobs.append(
                 {
-                    "filename": nzf.filename,
+                    "filename": nzf.filename if nzf.filename else nzf.subject,
                     "mbleft": "%.2f" % (nzf.bytes_left / MEBI),
                     "mb": "%.2f" % (nzf.bytes / MEBI),
                     "bytes": "%.2f" % nzf.bytes,
@@ -1385,7 +1442,7 @@ def build_file_list(nzo_id: str):
         for nzf in active_files:
             jobs.append(
                 {
-                    "filename": nzf.filename,
+                    "filename": nzf.filename if nzf.filename else nzf.subject,
                     "mbleft": "%.2f" % (nzf.bytes_left / MEBI),
                     "mb": "%.2f" % (nzf.bytes / MEBI),
                     "bytes": "%.2f" % nzf.bytes,
@@ -1398,7 +1455,7 @@ def build_file_list(nzo_id: str):
         for nzf in queued_files:
             jobs.append(
                 {
-                    "filename": nzf.filename,
+                    "filename": nzf.filename if nzf.filename else nzf.subject,
                     "set": nzf.setname,
                     "mbleft": "%.2f" % (nzf.bytes_left / MEBI),
                     "mb": "%.2f" % (nzf.bytes / MEBI),
@@ -1430,7 +1487,7 @@ def options_list(output):
 
 
 def retry_job(job, new_nzb=None, password=None):
-    """Re enter failed job in the download queue"""
+    """ Re enter failed job in the download queue """
     if job:
         history_db = sabnzbd.get_db_connection()
         futuretype, url, pp, script, cat = history_db.get_other(job)
@@ -1447,7 +1504,7 @@ def retry_job(job, new_nzb=None, password=None):
 
 
 def retry_all_jobs():
-    """Re enter all failed jobs in the download queue"""
+    """ Re enter all failed jobs in the download queue """
     # Fetch all retryable folders from History
     items = sabnzbd.api.build_history()[0]
     nzo_ids = []
@@ -1458,14 +1515,14 @@ def retry_all_jobs():
 
 
 def del_job_files(job_paths):
-    """Remove files of each path in the list"""
+    """ Remove files of each path in the list """
     for path in job_paths:
         if path and clip_path(path).lower().startswith(cfg.download_dir.get_clipped_path().lower()):
             remove_all(path, recursive=True)
 
 
 def del_hist_job(job, del_files):
-    """Remove history element"""
+    """ Remove history element """
     if job:
         path = sabnzbd.PostProcessor.get_path(job)
         if path:
@@ -1477,7 +1534,7 @@ def del_hist_job(job, del_files):
 
 
 def Tspec(txt):
-    """Translate special terms"""
+    """ Translate special terms """
     if txt == "None":
         return T("None")
     elif txt in ("Default", "*"):
@@ -1506,14 +1563,14 @@ def Ttemplate(txt):
 
 
 def clear_trans_cache():
-    """Clean cache for skin translations"""
+    """ Clean cache for skin translations """
     global _SKIN_CACHE
     _SKIN_CACHE = {}
     sabnzbd.WEBUI_READY = True
 
 
 def build_header(webdir="", output=None, trans_functions=True):
-    """Build the basic header"""
+    """ Build the basic header """
     try:
         uptime = calc_age(sabnzbd.START)
     except:
@@ -1591,7 +1648,7 @@ def build_header(webdir="", output=None, trans_functions=True):
 
 
 def build_queue_header(search=None, nzo_ids=None, start=0, limit=0, output=None):
-    """Build full queue header"""
+    """ Build full queue header """
 
     header = build_header(output=output)
 
@@ -1628,14 +1685,7 @@ def build_queue_header(search=None, nzo_ids=None, start=0, limit=0, output=None)
     return header, qnfo.list, bytespersec, qnfo.q_fullsize, qnfo.bytes_left_previous_page
 
 
-def build_history(
-    start: int = 0,
-    limit: int = 0,
-    search: Optional[str] = None,
-    failed_only: int = 0,
-    categories: Optional[List[str]] = None,
-    nzo_ids: Optional[List[str]] = None,
-):
+def build_history(start=0, limit=0, search=None, failed_only=0, categories=None, nzo_ids=None):
     """Combine the jobs still in post-processing and the database history"""
     if not limit:
         limit = 1000000
@@ -1658,9 +1708,6 @@ def build_history(
             except:
                 logging.error(T("Failed to compile regex for search term: %s"), search_text)
 
-        if nzo_ids:
-            postproc_queue = [nzo for nzo in postproc_queue if nzo.nzo_id in nzo_ids]
-
     # Multi-page support for postproc items
     postproc_queue_size = len(postproc_queue)
     if start > postproc_queue_size:
@@ -1745,7 +1792,7 @@ def build_history(
 
 
 def get_active_history(queue, items):
-    """Get the currently in progress and active history queue."""
+    """ Get the currently in progress and active history queue. """
     for nzo in queue:
         item = {}
         (
@@ -1788,7 +1835,7 @@ def get_active_history(queue, items):
 
 
 def calc_timeleft(bytesleft, bps):
-    """Calculate the time left in the format HH:MM:SS"""
+    """ Calculate the time left in the format HH:MM:SS """
     try:
         if bytesleft <= 0:
             return "0:00:00"
@@ -1840,7 +1887,7 @@ def plural_to_single(kw, def_kw=""):
 
 
 def del_from_section(kwargs):
-    """Remove keyword in section"""
+    """ Remove keyword in section """
     section = kwargs.get("section", "")
     if section in ("servers", "rss", "categories"):
         keyword = kwargs.get("keyword")
@@ -1858,7 +1905,7 @@ def del_from_section(kwargs):
 
 
 def history_remove_failed():
-    """Remove all failed jobs from history, including files"""
+    """ Remove all failed jobs from history, including files """
     logging.info("Scheduled removal of all failed jobs")
     with HistoryDB() as history_db:
         del_job_files(history_db.get_failed_paths())
@@ -1866,7 +1913,7 @@ def history_remove_failed():
 
 
 def history_remove_completed():
-    """Remove all completed jobs from history"""
+    """ Remove all completed jobs from history """
     logging.info("Scheduled removal of all completed jobs")
     with HistoryDB() as history_db:
         history_db.remove_completed()

sabnzbd/articlecache.py

@@ -55,7 +55,7 @@ class ArticleCache:
         return ANFO(len(self.__article_table), abs(self.__cache_size), self.__cache_limit_org)
 
     def new_limit(self, limit: int):
-        """Called when cache limit changes"""
+        """ Called when cache limit changes """
         self.__cache_limit_org = limit
         if limit < 0:
             self.__cache_limit = self.__cache_upper_limit
@@ -70,20 +70,20 @@ class ArticleCache:
 
     @synchronized(ARTICLE_COUNTER_LOCK)
     def reserve_space(self, data_size: int):
-        """Reserve space in the cache"""
+        """ Reserve space in the cache """
         self.__cache_size += data_size
 
     @synchronized(ARTICLE_COUNTER_LOCK)
     def free_reserved_space(self, data_size: int):
-        """Remove previously reserved space"""
+        """ Remove previously reserved space """
         self.__cache_size -= data_size
 
     def space_left(self) -> bool:
-        """Is there space left in the set limit?"""
+        """ Is there space left in the set limit? """
         return self.__cache_size < self.__cache_limit
 
     def save_article(self, article: Article, data: bytes):
-        """Save article in cache, either memory or disk"""
+        """ Save article in cache, either memory or disk """
         nzo = article.nzf.nzo
         if nzo.is_gone():
             # Do not discard this article because the
@@ -115,7 +115,7 @@ class ArticleCache:
             self.__flush_article_to_disk(article, data)
 
     def load_article(self, article: Article):
-        """Load the data of the article"""
+        """ Load the data of the article """
         data = None
         nzo = article.nzf.nzo
 
@@ -145,7 +145,7 @@ class ArticleCache:
                 logging.debug("Failed to flush item from cache, probably already deleted or written to disk")
 
     def purge_articles(self, articles: List[Article]):
-        """Remove all saved articles, from memory and disk"""
+        """ Remove all saved articles, from memory and disk """
         logging.debug("Purging %s articles from the cache/disk", len(articles))
         for article in articles:
             if article in self.__article_table:

sabnzbd/assembler.py

@@ -30,14 +30,7 @@ from typing import Tuple, Optional, List
 
 import sabnzbd
 from sabnzbd.misc import get_all_passwords, match_str
-from sabnzbd.filesystem import (
-    set_permissions,
-    clip_path,
-    has_win_device,
-    diskspace,
-    get_filename,
-    has_unwanted_extension,
-)
+from sabnzbd.filesystem import set_permissions, clip_path, has_win_device, diskspace, get_filename, get_ext
 from sabnzbd.constants import Status, GIGI, MAX_ASSEMBLER_QUEUE
 import sabnzbd.cfg as cfg
 from sabnzbd.nzbstuff import NzbObject, NzbFile
@@ -266,7 +259,7 @@ SAFE_EXTS = (".mkv", ".mp4", ".avi", ".wmv", ".mpg", ".webm")
 
 
 def is_cloaked(nzo: NzbObject, path: str, names: List[str]) -> bool:
-    """Return True if this is likely to be a cloaked encrypted post"""
+    """ Return True if this is likely to be a cloaked encrypted post """
     fname = os.path.splitext(get_filename(path.lower()))[0]
     for name in names:
         name = get_filename(name.lower())
@@ -295,7 +288,7 @@ def is_cloaked(nzo: NzbObject, path: str, names: List[str]) -> bool:
 
 
 def check_encrypted_and_unwanted_files(nzo: NzbObject, filepath: str) -> Tuple[bool, Optional[str]]:
-    """Combines check for unwanted and encrypted files to save on CPU and IO"""
+    """ Combines check for unwanted and encrypted files to save on CPU and IO """
     encrypted = False
     unwanted = None
 
@@ -341,30 +334,29 @@ def check_encrypted_and_unwanted_files(nzo: NzbObject, filepath: str) -> Tuple[b
                                     zf.setpassword(password)
                                 except rarfile.Error:
                                     # On weird passwords the setpassword() will fail
-                                    # but the actual testrar() will work
+                                    # but the actual rartest() will work
                                     pass
                                 try:
                                     zf.testrar()
                                     password_hit = password
                                     break
-                                except rarfile.RarWrongPassword:
-                                    # This one really didn't work
-                                    pass
                                 except rarfile.RarCRCError as e:
                                     # CRC errors can be thrown for wrong password or
                                     # missing the next volume (with correct password)
-                                    if match_str(str(e), ("cannot find volume", "unexpected end of archive")):
-                                        # We assume this one worked!
+                                    if "cannot find volume" in str(e).lower():
                                         password_hit = password
                                         break
                                     # This one didn't work
                                     pass
-                                except:
-                                    # All the other errors we skip, they might be fixable in post-proc.
-                                    # For example starting from the wrong volume, or damaged files
-                                    # This will cause the check to be performed again for the next rar, might
-                                    # be disk-intensive! Could be removed later and just accept the password.
-                                    return encrypted, unwanted
+                                except Exception as e:
+                                    # Did we start from the right volume? Skip the checks for now.
+                                    if match_str(
+                                        str(e).lower(),
+                                        ("need to start extraction from a previous volume", "non-fatal error"),
+                                    ):
+                                        return encrypted, unwanted
+                                    # This one failed
+                                    pass
 
                         # Did any work?
                         if password_hit:
@@ -384,7 +376,7 @@ def check_encrypted_and_unwanted_files(nzo: NzbObject, filepath: str) -> Tuple[b
                 if cfg.unwanted_extensions() and cfg.action_on_unwanted_extensions():
                     for somefile in zf.namelist():
                         logging.debug("File contains: %s", somefile)
-                        if has_unwanted_extension(somefile):
+                        if get_ext(somefile).replace(".", "").lower() in cfg.unwanted_extensions():
                             logging.debug("Unwanted file %s", somefile)
                             unwanted = somefile
                 zf.close()

sabnzbd/bpsmeter.py

@@ -26,7 +26,6 @@ from typing import List, Dict, Optional
 
 import sabnzbd
 from sabnzbd.constants import BYTES_FILE_NAME, KIBI
-from sabnzbd.misc import to_units
 import sabnzbd.cfg as cfg
 
 DAY = float(24 * 60 * 60)
@@ -39,14 +38,14 @@ RE_HHMM = re.compile(r"(\d+):(\d+)\s*$")
 
 
 def tomorrow(t: float) -> float:
-    """Return timestamp for tomorrow (midnight)"""
+    """ Return timestamp for tomorrow (midnight) """
     now = time.localtime(t)
     ntime = (now[0], now[1], now[2], 0, 0, 0, now[6], now[7], now[8])
     return time.mktime(ntime) + DAY
 
 
 def this_week(t: float) -> float:
-    """Return timestamp for start of this week (monday)"""
+    """ Return timestamp for start of this week (monday) """
     while 1:
         tm = time.localtime(t)
         if tm.tm_wday == 0:
@@ -57,19 +56,19 @@ def this_week(t: float) -> float:
 
 
 def next_week(t: float) -> float:
-    """Return timestamp for start of next week (monday)"""
+    """ Return timestamp for start of next week (monday) """
     return this_week(t) + WEEK
 
 
 def this_month(t: float) -> float:
-    """Return timestamp for start of next month"""
+    """ Return timestamp for start of next month """
     now = time.localtime(t)
     ntime = (now[0], now[1], 1, 0, 0, 0, 0, 0, now[8])
     return time.mktime(ntime)
 
 
 def last_month_day(tm: time.struct_time) -> int:
-    """Return last day of this month"""
+    """ Return last day of this month """
     year, month = tm[:2]
     day = DAYS[month]
     # This simple formula for leap years is good enough
@@ -79,7 +78,7 @@ def last_month_day(tm: time.struct_time) -> int:
 
 
 def next_month(t: float) -> float:
-    """Return timestamp for start of next month"""
+    """ Return timestamp for start of next month """
     now = time.localtime(t)
     month = now.tm_mon + 1
     year = now.tm_year
@@ -91,38 +90,6 @@ def next_month(t: float) -> float:
 
 
 class BPSMeter:
-    __slots__ = (
-        "start_time",
-        "log_time",
-        "speed_log_time",
-        "last_update",
-        "bps",
-        "bps_list",
-        "server_bps",
-        "cached_amount",
-        "sum_cached_amount",
-        "day_total",
-        "week_total",
-        "month_total",
-        "grand_total",
-        "timeline_total",
-        "article_stats_tried",
-        "article_stats_failed",
-        "day_label",
-        "end_of_day",
-        "end_of_week",
-        "end_of_month",
-        "q_day",
-        "q_period",
-        "quota",
-        "left",
-        "have_quota",
-        "q_time",
-        "q_hour",
-        "q_minute",
-        "quota_enabled",
-    )
-
     def __init__(self):
         t = time.time()
         self.start_time = t
@@ -133,8 +100,6 @@ class BPSMeter:
         self.bps_list: List[int] = []
 
         self.server_bps: Dict[str, float] = {}
-        self.cached_amount: Dict[str, int] = {}
-        self.sum_cached_amount: int = 0
         self.day_total: Dict[str, int] = {}
         self.week_total: Dict[str, int] = {}
         self.month_total: Dict[str, int] = {}
@@ -160,7 +125,7 @@ class BPSMeter:
         self.quota_enabled: bool = True  # Scheduled quota enable/disable
 
     def save(self):
-        """Save admin to disk"""
+        """ Save admin to disk """
         sabnzbd.save_admin(
             (
                 self.last_update,
@@ -182,7 +147,7 @@ class BPSMeter:
         )
 
     def defaults(self):
-        """Get the latest data from the database and assign to a fake server"""
+        """ Get the latest data from the database and assign to a fake server """
         logging.debug("Setting default BPS meter values")
         with sabnzbd.database.HistoryDB() as history_db:
             grand, month, week = history_db.get_history_size()
@@ -199,7 +164,7 @@ class BPSMeter:
         self.quota = self.left = cfg.quota_size.get_float()
 
     def read(self):
-        """Read admin from disk, return True when pause is needed"""
+        """ Read admin from disk, return True when pause is needed """
         res = False
         quota = self.left = cfg.quota_size.get_float()  # Quota for this period
         self.have_quota = bool(cfg.quota_size())
@@ -230,101 +195,83 @@ class BPSMeter:
             res = self.reset_quota()
         except:
             self.defaults()
+        # Force update of counters and validate data
+        try:
+            for server in self.grand_total.keys():
+                self.update(server)
+        except TypeError:
+            self.defaults()
+            self.update()
         return res
 
-    def init_server_stats(self, server: str = None):
-        """Initialize counters for "server" """
-        if server not in self.cached_amount:
-            self.cached_amount[server] = 0
-            self.server_bps[server] = 0.0
-        if server not in self.day_total:
-            self.day_total[server] = 0
-        if server not in self.week_total:
-            self.week_total[server] = 0
-        if server not in self.month_total:
-            self.month_total[server] = 0
-        if server not in self.month_total:
-            self.month_total[server] = 0
-        if server not in self.grand_total:
-            self.grand_total[server] = 0
-        if server not in self.timeline_total:
-            self.timeline_total[server] = {}
-        if self.day_label not in self.timeline_total[server]:
-            self.timeline_total[server][self.day_label] = 0
-        if server not in self.server_bps:
-            self.server_bps[server] = 0.0
-        if server not in self.article_stats_tried:
-            self.article_stats_tried[server] = {}
-            self.article_stats_failed[server] = {}
-        if self.day_label not in self.article_stats_tried[server]:
-            self.article_stats_tried[server][self.day_label] = 0
-            self.article_stats_failed[server][self.day_label] = 0
-
     def update(self, server: Optional[str] = None, amount: int = 0):
-        """Update counters for "server" with "amount" bytes"""
-        # Add amount to temporary storage
-        if server:
-            self.cached_amount[server] += amount
-            self.sum_cached_amount += amount
-            return
-
+        """ Update counters for "server" with "amount" bytes """
         t = time.time()
-
         if t > self.end_of_day:
-            # Current day passed, get new end of day
+            # current day passed. get new end of day
             self.day_label = time.strftime("%Y-%m-%d")
-            self.end_of_day = tomorrow(t) - 1.0
             self.day_total = {}
+            self.end_of_day = tomorrow(t) - 1.0
 
-            # Check end of week and end of month
             if t > self.end_of_week:
                 self.week_total = {}
                 self.end_of_week = next_week(t) - 1.0
+
             if t > self.end_of_month:
                 self.month_total = {}
                 self.end_of_month = next_month(t) - 1.0
 
-            # Need to reset all counters
-            for server in sabnzbd.Downloader.servers[:]:
-                self.init_server_stats(server.id)
+        if server:
+            if server not in self.day_total:
+                self.day_total[server] = 0
+            self.day_total[server] += amount
 
-        # Add amounts that have been stored temporarily to statistics
-        for srv in self.cached_amount:
-            if self.cached_amount[srv]:
-                self.day_total[srv] += self.cached_amount[srv]
-                self.week_total[srv] += self.cached_amount[srv]
-                self.month_total[srv] += self.cached_amount[srv]
-                self.grand_total[srv] += self.cached_amount[srv]
-                self.timeline_total[srv][self.day_label] += self.cached_amount[srv]
+            if server not in self.week_total:
+                self.week_total[server] = 0
+            self.week_total[server] += amount
 
-            # Update server bps
-            try:
-                self.server_bps[srv] = (
-                    self.server_bps[srv] * (self.last_update - self.start_time) + self.cached_amount[srv]
-                ) / (t - self.start_time)
-            except ZeroDivisionError:
-                self.server_bps[srv] = 0.0
+            if server not in self.month_total:
+                self.month_total[server] = 0
+            self.month_total[server] += amount
 
-            # Reset for next time
-            self.cached_amount[srv] = 0
+            if server not in self.grand_total:
+                self.grand_total[server] = 0
+            self.grand_total[server] += amount
 
-        # Quota check
-        if self.have_quota and self.quota_enabled:
-            self.left -= self.sum_cached_amount
-            if self.left <= 0.0:
-                if not sabnzbd.Downloader.paused:
-                    sabnzbd.Downloader.pause()
-                    logging.warning(T("Quota spent, pausing downloading"))
+            if server not in self.timeline_total:
+                self.timeline_total[server] = {}
+            if self.day_label not in self.timeline_total[server]:
+                self.timeline_total[server][self.day_label] = 0
+            self.timeline_total[server][self.day_label] += amount
+
+            # Quota check
+            if self.have_quota and self.quota_enabled:
+                self.left -= amount
+                if self.left <= 0.0:
+                    if not sabnzbd.Downloader.paused:
+                        sabnzbd.Downloader.pause()
+                        logging.warning(T("Quota spent, pausing downloading"))
 
         # Speedometer
         try:
-            self.bps = (self.bps * (self.last_update - self.start_time) + self.sum_cached_amount) / (
-                t - self.start_time
-            )
-        except ZeroDivisionError:
+            self.bps = (self.bps * (self.last_update - self.start_time) + amount) / (t - self.start_time)
+        except:
             self.bps = 0.0
+            self.server_bps = {}
+
+        if server and server not in self.server_bps:
+            self.server_bps[server] = 0.0
+
+        for server_to_update in self.server_bps:
+            try:
+                # Only add data to the current server, update the rest to get correct average speed
+                self.server_bps[server_to_update] = (
+                    self.server_bps[server_to_update] * (self.last_update - self.start_time)
+                    + amount * (server_to_update == server)
+                ) / (t - self.start_time)
+            except:
+                self.server_bps[server_to_update] = 0.0
 
-        self.sum_cached_amount = 0
         self.last_update = t
 
         check_time = t - 5.0
@@ -336,7 +283,7 @@ class BPSMeter:
             self.reset()
 
         elif self.log_time < check_time:
-            logging.debug("Speed: %sB/s", to_units(self.bps))
+            logging.debug("bps: %s", self.bps)
             self.log_time = t
 
         if self.speed_log_time < (t - 1.0):
@@ -346,10 +293,20 @@ class BPSMeter:
 
     def register_server_article_tried(self, server: str):
         """Keep track how many articles were tried for each server"""
+        if server not in self.article_stats_tried:
+            self.article_stats_tried[server] = {}
+            self.article_stats_failed[server] = {}
+        if self.day_label not in self.article_stats_tried[server]:
+            self.article_stats_tried[server][self.day_label] = 0
+            self.article_stats_failed[server][self.day_label] = 0
+
+        # Update the counters
         self.article_stats_tried[server][self.day_label] += 1
 
     def register_server_article_failed(self, server: str):
         """Keep track how many articles failed for each server"""
+        # This function is always called after the one above,
+        # so we can skip the check if the keys in the dict exist
         self.article_stats_failed[server][self.day_label] += 1
 
     def reset(self):
@@ -357,11 +314,8 @@ class BPSMeter:
         self.start_time = t
         self.log_time = t
         self.last_update = t
-
-        # Reset general BPS and the for all servers
         self.bps = 0.0
-        for server in self.server_bps:
-            self.server_bps[server] = 0.0
+        self.server_bps = {}
 
     def add_empty_time(self):
         # Extra zeros, but never more than the maximum!
@@ -374,7 +328,7 @@ class BPSMeter:
             self.bps_list = self.bps_list[len(self.bps_list) - BPS_LIST_MAX :]
 
     def get_sums(self):
-        """return tuple of grand, month, week, day totals"""
+        """ return tuple of grand, month, week, day totals """
         return (
             sum([v for v in self.grand_total.values()]),
             sum([v for v in self.month_total.values()]),
@@ -383,7 +337,7 @@ class BPSMeter:
         )
 
     def amounts(self, server: str):
-        """Return grand, month, week, day and article totals for specified server"""
+        """ Return grand, month, week, day and article totals for specified server """
         return (
             self.grand_total.get(server, 0),
             self.month_total.get(server, 0),
@@ -395,7 +349,7 @@ class BPSMeter:
         )
 
     def clear_server(self, server: str):
-        """Clean counters for specified server"""
+        """ Clean counters for specified server """
         if server in self.day_total:
             del self.day_total[server]
         if server in self.week_total:
@@ -410,7 +364,6 @@ class BPSMeter:
             del self.article_stats_tried[server]
         if server in self.article_stats_failed:
             del self.article_stats_failed[server]
-        self.init_server_stats(server)
         self.save()
 
     def get_bps_list(self):
@@ -461,7 +414,7 @@ class BPSMeter:
             return True
 
     def next_reset(self, t: Optional[float] = None):
-        """Determine next reset time"""
+        """ Determine next reset time """
         t = t or time.time()
         tm = time.localtime(t)
         if self.q_period == "d":
@@ -492,7 +445,7 @@ class BPSMeter:
         logging.debug("Will reset quota at %s", tm)
 
     def change_quota(self, allow_resume: bool = True):
-        """Update quota, potentially pausing downloader"""
+        """ Update quota, potentially pausing downloader """
         if not self.have_quota and self.quota < 0.5:
             # Never set, use last period's size
             per = cfg.quota_period()
@@ -522,7 +475,7 @@ class BPSMeter:
             self.resume()
 
     def get_quota(self):
-        """If quota active, return check-function, hour, minute"""
+        """ If quota active, return check-function, hour, minute """
         if self.have_quota:
             self.q_period = cfg.quota_period()[0].lower()
             self.q_day = 1
@@ -551,19 +504,24 @@ class BPSMeter:
             return None, 0, 0
 
     def set_status(self, status: bool, action: bool = True):
-        """Disable/enable quota management"""
+        """ Disable/enable quota management """
         self.quota_enabled = status
         if action and not status:
             self.resume()
 
     @staticmethod
     def resume():
-        """Resume downloading"""
+        """ Resume downloading """
         if cfg.quota_resume() and sabnzbd.Downloader.paused:
             sabnzbd.Downloader.resume()
 
+    def midnight(self):
+        """ Midnight action: dummy update for all servers """
+        for server in self.day_total.keys():
+            self.update(server)
+
 
 def quota_handler():
-    """To be called from scheduler"""
+    """ To be called from scheduler """
     logging.debug("Checking quota")
     sabnzbd.BPSMeter.reset_quota()

sabnzbd/cfg.py

@@ -69,7 +69,7 @@ def validate_email(value):
 
 
 def validate_server(value):
-    """Check if server non-empty"""
+    """ Check if server non-empty"""
     global email_endjob, email_full, email_rss
     if value == "" and (email_endjob() or email_full() or email_rss()):
         return T("Server address required"), None
@@ -78,7 +78,7 @@ def validate_server(value):
 
 
 def validate_script(value):
-    """Check if value is a valid script"""
+    """ Check if value is a valid script """
     if not sabnzbd.__INITIALIZED__ or (value and sabnzbd.filesystem.is_valid_script(value)):
         return None, value
     elif (value and value == "None") or not value:
@@ -133,6 +133,7 @@ https_chain = OptionDir("misc", "https_chain", create=False)
 enable_https = OptionBool("misc", "enable_https", False)
 # 0=local-only, 1=nzb, 2=api, 3=full_api, 4=webui, 5=webui with login for external
 inet_exposure = OptionNumber("misc", "inet_exposure", 0, protect=True)
+local_ranges = OptionList("misc", "local_ranges", protect=True)
 api_key = OptionStr("misc", "api_key", create_api_key())
 nzb_key = OptionStr("misc", "nzb_key", create_api_key())
 
@@ -195,7 +196,6 @@ sanitize_safe = OptionBool("misc", "sanitize_safe", False)
 cleanup_list = OptionList("misc", "cleanup_list")
 unwanted_extensions = OptionList("misc", "unwanted_extensions")
 action_on_unwanted_extensions = OptionNumber("misc", "action_on_unwanted_extensions", 0)
-unwanted_extensions_mode = OptionNumber("misc", "unwanted_extensions_mode", 0)
 new_nzb_on_failure = OptionBool("misc", "new_nzb_on_failure", False)
 history_retention = OptionStr("misc", "history_retention", "0")
 enable_meta = OptionBool("misc", "enable_meta", True)
@@ -283,6 +283,7 @@ keep_awake = OptionBool("misc", "keep_awake", True)
 win_menu = OptionBool("misc", "win_menu", True)
 allow_incomplete_nzb = OptionBool("misc", "allow_incomplete_nzb", False)
 enable_broadcast = OptionBool("misc", "enable_broadcast", True)
+max_art_opt = OptionBool("misc", "max_art_opt", False)
 ipv6_hosting = OptionBool("misc", "ipv6_hosting", False)
 fixed_ports = OptionBool("misc", "fixed_ports", False)
 api_warnings = OptionBool("misc", "api_warnings", True, protect=True)
@@ -306,7 +307,6 @@ marker_file = OptionStr("misc", "nomedia_marker")
 ipv6_servers = OptionNumber("misc", "ipv6_servers", 1, 0, 2)
 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, 1)
 downloader_sleep_time = OptionNumber("misc", "downloader_sleep_time", 10, 0)
 ssdp_broadcast_interval = OptionNumber("misc", "ssdp_broadcast_interval", 15, 1, 600)

sabnzbd/config.py

@@ -52,7 +52,7 @@ RE_PARAMFINDER = re.compile(r"""(?:'.*?')|(?:".*?")|(?:[^'",\s][^,]*)""")
 
 
 class Option:
-    """Basic option class, basic fields"""
+    """ Basic option class, basic fields """
 
     def __init__(self, section: str, keyword: str, default_val: Any = None, add: bool = True, protect: bool = False):
         """Basic option
@@ -81,7 +81,7 @@ class Option:
             anchor[keyword] = self
 
     def get(self) -> Any:
-        """Retrieve value field"""
+        """ Retrieve value field """
         if self.__value is not None:
             return self.__value
         else:
@@ -91,11 +91,11 @@ class Option:
         return str(self.get())
 
     def get_dict(self, safe: bool = False) -> Dict[str, Any]:
-        """Return value a dictionary"""
+        """ Return value a dictionary """
         return {self.__keyword: self.get()}
 
     def set_dict(self, values: Dict[str, Any]):
-        """Set value based on dictionary"""
+        """ Set value based on dictionary """
         if not self.__protect:
             try:
                 self.set(values["value"])
@@ -103,7 +103,7 @@ class Option:
                 pass
 
     def set(self, value: Any):
-        """Set new value, no validation"""
+        """ Set new value, no validation """
         global modified
         if value is not None:
             if isinstance(value, list) or isinstance(value, dict) or value != self.__value:
@@ -116,11 +116,11 @@ class Option:
         return self.__default_val
 
     def callback(self, callback: Callable):
-        """Set callback function"""
+        """ Set callback function """
         self.__callback = callback
 
     def ident(self):
-        """Return section-list and keyword"""
+        """ Return section-list and keyword """
         return self.__sections, self.__keyword
 
 
@@ -145,7 +145,7 @@ class OptionNumber(Option):
         super().__init__(section, keyword, default_val, add=add, protect=protect)
 
     def set(self, value: Any):
-        """set new value, limited by range"""
+        """ set new value, limited by range """
         if value is not None:
             try:
                 if self.__int:
@@ -165,12 +165,12 @@ class OptionNumber(Option):
                 super().set(value)
 
     def __call__(self) -> Union[int, float]:
-        """get() replacement"""
+        """ get() replacement """
         return self.get()
 
 
 class OptionBool(Option):
-    """Boolean option class, always returns 0 or 1."""
+    """ Boolean option class, always returns 0 or 1."""
 
     def __init__(self, section: str, keyword: str, default_val: bool = False, add: bool = True, protect: bool = False):
         super().__init__(section, keyword, int(default_val), add=add, protect=protect)
@@ -180,12 +180,12 @@ class OptionBool(Option):
         super().set(sabnzbd.misc.int_conv(value))
 
     def __call__(self) -> int:
-        """get() replacement"""
+        """ get() replacement """
         return int(self.get())
 
 
 class OptionDir(Option):
-    """Directory option class"""
+    """ Directory option class """
 
     def __init__(
         self,
@@ -206,7 +206,7 @@ class OptionDir(Option):
         super().__init__(section, keyword, default_val, add=add)
 
     def get(self) -> str:
-        """Return value, corrected for platform"""
+        """ Return value, corrected for platform """
         p = super().get()
         if sabnzbd.WIN32:
             return p.replace("/", "\\") if "/" in p else p
@@ -214,7 +214,7 @@ class OptionDir(Option):
             return p.replace("\\", "/") if "\\" in p else p
 
     def get_path(self) -> str:
-        """Return full absolute path"""
+        """ Return full absolute path """
         value = self.get()
         path = ""
         if value:
@@ -224,11 +224,11 @@ class OptionDir(Option):
         return path
 
     def get_clipped_path(self) -> str:
-        """Return clipped full absolute path"""
+        """ Return clipped full absolute path """
         return clip_path(self.get_path())
 
     def test_path(self) -> bool:
-        """Return True if path exists"""
+        """ Return True if path exists """
         value = self.get()
         if value:
             return os.path.exists(real_path(self.__root, value))
@@ -236,7 +236,7 @@ class OptionDir(Option):
             return False
 
     def set_root(self, root: str):
-        """Set new root, is assumed to be valid"""
+        """ Set new root, is assumed to be valid """
         self.__root = root
 
     def set(self, value: str, create: bool = False) -> Optional[str]:
@@ -260,16 +260,16 @@ class OptionDir(Option):
         return error
 
     def set_create(self, value: bool):
-        """Set auto-creation value"""
+        """ Set auto-creation value """
         self.__create = value
 
     def __call__(self) -> str:
-        """get() replacement"""
+        """ get() replacement """
         return self.get()
 
 
 class OptionList(Option):
-    """List option class"""
+    """ List option class """
 
     def __init__(
         self,
@@ -286,7 +286,7 @@ class OptionList(Option):
         super().__init__(section, keyword, default_val, add=add, protect=protect)
 
     def set(self, value: Union[str, List]) -> Optional[str]:
-        """Set the list given a comma-separated string or a list"""
+        """ Set the list given a comma-separated string or a list """
         error = None
         if value is not None:
             if not isinstance(value, list):
@@ -301,20 +301,20 @@ class OptionList(Option):
         return error
 
     def get_string(self) -> str:
-        """Return the list as a comma-separated string"""
+        """ Return the list as a comma-separated string """
         return ", ".join(self.get())
 
     def default_string(self) -> str:
-        """Return the default list as a comma-separated string"""
+        """ Return the default list as a comma-separated string """
         return ", ".join(self.default())
 
     def __call__(self) -> List[str]:
-        """get() replacement"""
+        """ get() replacement """
         return self.get()
 
 
 class OptionStr(Option):
-    """String class."""
+    """ String class."""
 
     def __init__(
         self,
@@ -331,15 +331,15 @@ class OptionStr(Option):
         super().__init__(section, keyword, default_val, add=add, protect=protect)
 
     def get_float(self) -> float:
-        """Return value converted to a float, allowing KMGT notation"""
+        """ Return value converted to a float, allowing KMGT notation """
         return sabnzbd.misc.from_units(self.get())
 
     def get_int(self) -> int:
-        """Return value converted to an int, allowing KMGT notation"""
+        """ Return value converted to an int, allowing KMGT notation """
         return int(self.get_float())
 
     def set(self, value: Any) -> Optional[str]:
-        """Set stripped value"""
+        """ Set stripped value """
         error = None
         if isinstance(value, str) and self.__strip:
             value = value.strip()
@@ -351,46 +351,46 @@ class OptionStr(Option):
         return error
 
     def __call__(self) -> str:
-        """get() replacement"""
+        """ get() replacement """
         return self.get()
 
 
 class OptionPassword(Option):
-    """Password class."""
+    """ Password class. """
 
     def __init__(self, section: str, keyword: str, default_val: str = "", add: bool = True):
         self.get_string = self.get_stars
         super().__init__(section, keyword, default_val, add=add)
 
     def get(self) -> Optional[str]:
-        """Return decoded password"""
+        """ Return decoded password """
         return decode_password(super().get(), self.ident())
 
     def get_stars(self) -> Optional[str]:
-        """Return non-descript asterisk string"""
+        """ Return non-descript asterisk string """
         if self.get():
             return "*" * 10
         return ""
 
     def get_dict(self, safe: bool = False) -> Dict[str, str]:
-        """Return value a dictionary"""
+        """ Return value a dictionary """
         if safe:
             return {self.ident()[1]: self.get_stars()}
         else:
             return {self.ident()[1]: self.get()}
 
     def set(self, pw: str):
-        """Set password, encode it"""
+        """ Set password, encode it """
         if (pw is not None and pw == "") or (pw and pw.strip("*")):
             super().set(encode_password(pw))
 
     def __call__(self) -> str:
-        """get() replacement"""
+        """ get() replacement """
         return self.get()
 
 
 class ConfigServer:
-    """Class defining a single server"""
+    """ Class defining a single server """
 
     def __init__(self, name, values):
 
@@ -422,7 +422,7 @@ class ConfigServer:
         add_to_database("servers", self.__name, self)
 
     def set_dict(self, values: Dict[str, Any]):
-        """Set one or more fields, passed as dictionary"""
+        """ Set one or more fields, passed as dictionary """
         # Replace usage_at_start value with most recent statistics if the user changes the quota value
         # Only when we are updating it from the Config
         if sabnzbd.WEBUI_READY and values.get("quota", "") != self.quota():
@@ -459,7 +459,7 @@ class ConfigServer:
             self.displayname.set(self.__name)
 
     def get_dict(self, safe: bool = False) -> Dict[str, Any]:
-        """Return a dictionary with all attributes"""
+        """ Return a dictionary with all attributes """
         output_dict = {}
         output_dict["name"] = self.__name
         output_dict["displayname"] = self.displayname()
@@ -487,11 +487,11 @@ class ConfigServer:
         return output_dict
 
     def delete(self):
-        """Remove from database"""
+        """ Remove from database """
         delete_from_database("servers", self.__name)
 
     def rename(self, name: str):
-        """Give server new display name"""
+        """ Give server new display name """
         self.displayname.set(name)
 
     def ident(self) -> Tuple[str, str]:
@@ -499,7 +499,7 @@ class ConfigServer:
 
 
 class ConfigCat:
-    """Class defining a single category"""
+    """ Class defining a single category """
 
     def __init__(self, name: str, values: Dict[str, Any]):
         self.__name = name
@@ -516,7 +516,7 @@ class ConfigCat:
         add_to_database("categories", self.__name, self)
 
     def set_dict(self, values: Dict[str, Any]):
-        """Set one or more fields, passed as dictionary"""
+        """ Set one or more fields, passed as dictionary """
         for kw in ("order", "pp", "script", "dir", "newzbin", "priority"):
             try:
                 value = values[kw]
@@ -525,7 +525,7 @@ class ConfigCat:
                 continue
 
     def get_dict(self, safe: bool = False) -> Dict[str, Any]:
-        """Return a dictionary with all attributes"""
+        """ Return a dictionary with all attributes """
         output_dict = {}
         output_dict["name"] = self.__name
         output_dict["order"] = self.order()
@@ -537,19 +537,19 @@ class ConfigCat:
         return output_dict
 
     def delete(self):
-        """Remove from database"""
+        """ Remove from database """
         delete_from_database("categories", self.__name)
 
 
 class OptionFilters(Option):
-    """Filter list class"""
+    """ Filter list class """
 
     def __init__(self, section, keyword, add=True):
         super().__init__(section, keyword, add=add)
         self.set([])
 
     def move(self, current: int, new: int):
-        """Move filter from position 'current' to 'new'"""
+        """ Move filter from position 'current' to 'new' """
         lst = self.get()
         try:
             item = lst.pop(current)
@@ -570,7 +570,7 @@ class OptionFilters(Option):
         self.set(lst)
 
     def delete(self, pos: int):
-        """Remove filter 'pos'"""
+        """ Remove filter 'pos' """
         lst = self.get()
         try:
             lst.pop(pos)
@@ -579,14 +579,14 @@ class OptionFilters(Option):
         self.set(lst)
 
     def get_dict(self, safe: bool = False) -> Dict[str, str]:
-        """Return filter list as a dictionary with keys 'filter[0-9]+'"""
+        """ Return filter list as a dictionary with keys 'filter[0-9]+' """
         output_dict = {}
         for n, rss_filter in enumerate(self.get()):
             output_dict[f"filter{n}"] = rss_filter
         return output_dict
 
     def set_dict(self, values: Dict[str, Any]):
-        """Create filter list from dictionary with keys 'filter[0-9]+'"""
+        """ Create filter list from dictionary with keys 'filter[0-9]+' """
         filters = []
         # We don't know how many filters there are, so just assume all values are filters
         for n in range(len(values)):
@@ -597,12 +597,12 @@ class OptionFilters(Option):
             self.set(filters)
 
     def __call__(self) -> List[List[str]]:
-        """get() replacement"""
+        """ get() replacement """
         return self.get()
 
 
 class ConfigRSS:
-    """Class defining a single Feed definition"""
+    """ Class defining a single Feed definition """
 
     def __init__(self, name, values):
         self.__name = name
@@ -621,7 +621,7 @@ class ConfigRSS:
         add_to_database("rss", self.__name, self)
 
     def set_dict(self, values: Dict[str, Any]):
-        """Set one or more fields, passed as dictionary"""
+        """ Set one or more fields, passed as dictionary """
         for kw in ("uri", "cat", "pp", "script", "priority", "enable"):
             try:
                 value = values[kw]
@@ -631,7 +631,7 @@ class ConfigRSS:
         self.filters.set_dict(values)
 
     def get_dict(self, safe: bool = False) -> Dict[str, Any]:
-        """Return a dictionary with all attributes"""
+        """ Return a dictionary with all attributes """
         output_dict = {}
         output_dict["name"] = self.__name
         output_dict["uri"] = self.uri()
@@ -646,11 +646,11 @@ class ConfigRSS:
         return output_dict
 
     def delete(self):
-        """Remove from database"""
+        """ Remove from database """
         delete_from_database("rss", self.__name)
 
     def rename(self, new_name: str):
-        """Update the name and the saved entries"""
+        """ Update the name and the saved entries """
         delete_from_database("rss", self.__name)
         sabnzbd.RSSReader.rename(self.__name, new_name)
         self.__name = new_name
@@ -662,7 +662,7 @@ class ConfigRSS:
 
 @synchronized(CONFIG_LOCK)
 def add_to_database(section, keyword, obj):
-    """add object as section/keyword to INI database"""
+    """ add object as section/keyword to INI database """
     global database
     if section not in database:
         database[section] = {}
@@ -671,7 +671,7 @@ def add_to_database(section, keyword, obj):
 
 @synchronized(CONFIG_LOCK)
 def delete_from_database(section, keyword):
-    """Remove section/keyword from INI database"""
+    """ Remove section/keyword from INI database """
     global database, CFG, modified
     del database[section][keyword]
     if section == "servers" and "[" in keyword:
@@ -725,7 +725,7 @@ def get_dconfig(section, keyword, nested=False):
 
 
 def get_config(section, keyword):
-    """Return a config object, based on 'section', 'keyword'"""
+    """ Return a config object, based on 'section', 'keyword' """
     try:
         return database[section][keyword]
     except KeyError:
@@ -734,7 +734,7 @@ def get_config(section, keyword):
 
 
 def set_config(kwargs):
-    """Set a config item, using values in dictionary"""
+    """ Set a config item, using values in dictionary """
     try:
         item = database[kwargs.get("section")][kwargs.get("keyword")]
     except KeyError:
@@ -744,7 +744,7 @@ def set_config(kwargs):
 
 
 def delete(section: str, keyword: str):
-    """Delete specific config item"""
+    """ Delete specific config item """
     try:
         database[section][keyword].delete()
     except KeyError:
@@ -842,7 +842,7 @@ def _read_config(path, try_backup=False):
 
 @synchronized(SAVE_CONFIG_LOCK)
 def save_config(force=False):
-    """Update Setup file with current option values"""
+    """ Update Setup file with current option values """
     global CFG, database, modified
 
     if not (modified or force):
@@ -1025,7 +1025,7 @@ class ErrorCatchingArgumentParser(argparse.ArgumentParser):
 
 
 def encode_password(pw):
-    """Encode password in hexadecimal if needed"""
+    """ Encode password in hexadecimal if needed """
     enc = False
     if pw:
         encPW = __PW_PREFIX
@@ -1058,7 +1058,7 @@ def decode_password(pw, name):
 
 
 def clean_nice_ionice_parameters(value):
-    """Verify that the passed parameters are not exploits"""
+    """ Verify that the passed parameters are not exploits """
     if value:
         parser = ErrorCatchingArgumentParser()
 
@@ -1081,7 +1081,7 @@ def clean_nice_ionice_parameters(value):
 
 
 def all_lowercase(value):
-    """Lowercase everything!"""
+    """ Lowercase everything! """
     if isinstance(value, list):
         # If list, for each item
         return None, [item.lower() for item in value]
@@ -1089,7 +1089,7 @@ def all_lowercase(value):
 
 
 def validate_octal(value):
-    """Check if string is valid octal number"""
+    """ Check if string is valid octal number """
     if not value:
         return None, value
     try:
@@ -1100,7 +1100,7 @@ def validate_octal(value):
 
 
 def validate_no_unc(root, value, default):
-    """Check if path isn't a UNC path"""
+    """ Check if path isn't a UNC path """
     # Only need to check the 'value' part
     if value and not value.startswith(r"\\"):
         return validate_notempty(root, value, default)
@@ -1117,7 +1117,7 @@ def validate_safedir(root, value, default):
 
 
 def validate_notempty(root, value, default):
-    """If value is empty, return default"""
+    """ If value is empty, return default """
     if value:
         return None, value
     else:
@@ -1131,16 +1131,16 @@ def validate_strip_right_slash(value):
     return None, value
 
 
-def validate_single_tag(value: List[str]) -> Tuple[None, List[str]]:
+def validate_single_tag(value):
     """Don't split single indexer tags like "TV > HD"
     into ['TV', '>', 'HD']
     """
     if len(value) == 3:
         if value[1] == ">":
-            return None, [" ".join(value)]
+            return None, " ".join(value)
     return None, value
 
 
 def create_api_key():
-    """Return a new randomized API_KEY"""
+    """ Return a new randomized API_KEY """
     return uuid.uuid4().hex

sabnzbd/constants.py

@@ -141,8 +141,6 @@ year_match = r"[\W]([1|2]\d{3})([^\w]|$)"  # Something '(YYYY)' or '.YYYY.' or '
 
 sample_match = r"((^|[\W_])(sample|proof))"  # something-sample or something-proof
 
-resolution_match = r"(^|[\W_])((240|360|480|540|576|720|900|1080|1440|2160|4320)[piP])([\W_]|$)"  # 576i, 720p, 1080P
-
 
 class Status:
     COMPLETED = "Completed"  # PP: Job is finished

sabnzbd/database.py

@@ -26,7 +26,7 @@ import logging
 import sys
 import threading
 import sqlite3
-from typing import Union, Dict, Optional, List
+from typing import Union, Dict
 
 import sabnzbd
 import sabnzbd.cfg
@@ -41,7 +41,7 @@ DB_LOCK = threading.RLock()
 
 
 def convert_search(search):
-    """Convert classic wildcard to SQL wildcard"""
+    """ Convert classic wildcard to SQL wildcard """
     if not search:
         # Default value
         search = ""
@@ -75,14 +75,14 @@ class HistoryDB:
 
     @synchronized(DB_LOCK)
     def __init__(self):
-        """Determine databse path and create connection"""
+        """ Determine databse path and create connection """
         self.con = self.c = None
         if not HistoryDB.db_path:
             HistoryDB.db_path = os.path.join(sabnzbd.cfg.admin_dir.get_path(), DB_HISTORY_NAME)
         self.connect()
 
     def connect(self):
-        """Create a connection to the database"""
+        """ Create a connection to the database """
         create_table = not os.path.exists(HistoryDB.db_path)
         self.con = sqlite3.connect(HistoryDB.db_path)
         self.con.row_factory = sqlite3.Row
@@ -117,7 +117,7 @@ class HistoryDB:
             )
 
     def execute(self, command, args=(), save=False):
-        """Wrapper for executing SQL commands"""
+        """ Wrapper for executing SQL commands """
         for tries in range(5, 0, -1):
             try:
                 if args and isinstance(args, tuple):
@@ -161,7 +161,7 @@ class HistoryDB:
             return False
 
     def create_history_db(self):
-        """Create a new (empty) database file"""
+        """ Create a new (empty) database file """
         self.execute(
             """
         CREATE TABLE "history" (
@@ -198,7 +198,7 @@ class HistoryDB:
         self.execute("PRAGMA user_version = 2;")
 
     def close(self):
-        """Close database connection"""
+        """ Close database connection """
         try:
             self.c.close()
             self.con.close()
@@ -207,7 +207,7 @@ class HistoryDB:
             logging.info("Traceback: ", exc_info=True)
 
     def remove_completed(self, search=None):
-        """Remove all completed jobs from the database, optional with `search` pattern"""
+        """ Remove all completed jobs from the database, optional with `search` pattern """
         search = convert_search(search)
         logging.info("Removing all completed jobs from history")
         return self.execute(
@@ -215,7 +215,7 @@ class HistoryDB:
         )
 
     def get_failed_paths(self, search=None):
-        """Return list of all storage paths of failed jobs (may contain non-existing or empty paths)"""
+        """ Return list of all storage paths of failed jobs (may contain non-existing or empty paths) """
         search = convert_search(search)
         fetch_ok = self.execute(
             """SELECT path FROM history WHERE name LIKE ? AND status = ?""", (search, Status.FAILED)
@@ -226,7 +226,7 @@ class HistoryDB:
             return []
 
     def remove_failed(self, search=None):
-        """Remove all failed jobs from the database, optional with `search` pattern"""
+        """ Remove all failed jobs from the database, optional with `search` pattern """
         search = convert_search(search)
         logging.info("Removing all failed jobs from history")
         return self.execute(
@@ -234,7 +234,7 @@ class HistoryDB:
         )
 
     def remove_history(self, jobs=None):
-        """Remove all jobs in the list `jobs`, empty list will remove all completed jobs"""
+        """ Remove all jobs in the list `jobs`, empty list will remove all completed jobs """
         if jobs is None:
             self.remove_completed()
         else:
@@ -246,7 +246,7 @@ class HistoryDB:
                 logging.info("[%s] Removing job %s from history", caller_name(), job)
 
     def auto_history_purge(self):
-        """Remove history items based on the configured history-retention"""
+        """ Remove history items based on the configured history-retention """
         if sabnzbd.cfg.history_retention() == "0":
             return
 
@@ -279,7 +279,7 @@ class HistoryDB:
                 )
 
     def add_history_db(self, nzo, storage="", postproc_time=0, script_output="", script_line=""):
-        """Add a new job entry to the database"""
+        """ Add a new job entry to the database """
         t = build_history_info(nzo, storage, postproc_time, script_output, script_line, series_info=True)
 
         self.execute(
@@ -292,16 +292,8 @@ class HistoryDB:
         )
         logging.info("Added job %s to history", nzo.final_name)
 
-    def fetch_history(
-        self,
-        start: Optional[int] = None,
-        limit: Optional[int] = None,
-        search: Optional[str] = None,
-        failed_only: int = 0,
-        categories: Optional[List[str]] = None,
-        nzo_ids: Optional[List[str]] = None,
-    ):
-        """Return records for specified jobs"""
+    def fetch_history(self, start=None, limit=None, search=None, failed_only=0, categories=None, nzo_ids=None):
+        """ Return records for specified jobs """
         command_args = [convert_search(search)]
 
         post = ""
@@ -312,6 +304,7 @@ class HistoryDB:
             post += ")"
             command_args.extend(categories)
         if nzo_ids:
+            nzo_ids = nzo_ids.split(",")
             post += " AND (NZO_ID = ?"
             post += " OR NZO_ID = ? " * (len(nzo_ids) - 1)
             post += ")"
@@ -346,7 +339,7 @@ class HistoryDB:
         return items, fetched_items, total_items
 
     def have_episode(self, series, season, episode):
-        """Check whether History contains this series episode"""
+        """ Check whether History contains this series episode """
         total = 0
         series = series.lower().replace(".", " ").replace("_", " ").replace("  ", " ")
         if series and season and episode:
@@ -358,7 +351,7 @@ class HistoryDB:
         return total > 0
 
     def have_name_or_md5sum(self, name, md5sum):
-        """Check whether this name or md5sum is already in History"""
+        """ Check whether this name or md5sum is already in History """
         total = 0
         if self.execute(
             """SELECT COUNT(*) FROM History WHERE ( LOWER(name) = LOWER(?) OR md5sum = ? ) AND STATUS != ?""",
@@ -393,7 +386,7 @@ class HistoryDB:
         return total, month, week
 
     def get_script_log(self, nzo_id):
-        """Return decompressed log file"""
+        """ Return decompressed log file """
         data = ""
         t = (nzo_id,)
         if self.execute("""SELECT script_log FROM history WHERE nzo_id = ?""", t):
@@ -404,7 +397,7 @@ class HistoryDB:
         return data
 
     def get_name(self, nzo_id):
-        """Return name of the job `nzo_id`"""
+        """ Return name of the job `nzo_id` """
         t = (nzo_id,)
         name = ""
         if self.execute("""SELECT name FROM history WHERE nzo_id = ?""", t):
@@ -416,7 +409,7 @@ class HistoryDB:
         return name
 
     def get_path(self, nzo_id: str):
-        """Return the `incomplete` path of the job `nzo_id` if it is still there"""
+        """ Return the `incomplete` path of the job `nzo_id` if it is still there """
         t = (nzo_id,)
         path = ""
         if self.execute("""SELECT path FROM history WHERE nzo_id = ?""", t):
@@ -430,7 +423,7 @@ class HistoryDB:
         return None
 
     def get_other(self, nzo_id):
-        """Return additional data for job `nzo_id`"""
+        """ Return additional data for job `nzo_id` """
         t = (nzo_id,)
         if self.execute("""SELECT * FROM history WHERE nzo_id = ?""", t):
             try:
@@ -442,11 +435,11 @@ class HistoryDB:
         return "", "", "", "", ""
 
     def __enter__(self):
-        """For context manager support"""
+        """ For context manager support """
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        """For context manager support, ignore any exception"""
+        """ For context manager support, ignore any exception """
         self.close()
 
 
@@ -454,7 +447,7 @@ _PP_LOOKUP = {0: "", 1: "R", 2: "U", 3: "D"}
 
 
 def build_history_info(nzo, workdir_complete="", postproc_time=0, script_output="", script_line="", series_info=False):
-    """Collects all the information needed for the database"""
+    """ Collects all the information needed for the database """
     completed = int(time.time())
     pp = _PP_LOOKUP.get(opts_to_pp(*nzo.repair_opts), "X")
 

sabnzbd/decoder.py

@@ -46,7 +46,7 @@ except ImportError:
 
 
 class CrcError(Exception):
-    def __init__(self, needcrc: int, gotcrc: int, data: bytes):
+    def __init__(self, needcrc, gotcrc, data):
         super().__init__()
         self.needcrc = needcrc
         self.gotcrc = gotcrc
@@ -59,7 +59,7 @@ class BadYenc(Exception):
 
 
 class Decoder:
-    """Implement thread-like coordinator for the decoders"""
+    """ Implement thread-like coordinator for the decoders """
 
     def __init__(self):
         logging.debug("Initializing decoders")
@@ -106,7 +106,7 @@ class Decoder:
 
 
 class DecoderWorker(Thread):
-    """The actuall workhorse that handles decoding!"""
+    """ The actuall workhorse that handles decoding! """
 
     def __init__(self, decoder_queue):
         super().__init__()
@@ -154,16 +154,13 @@ class DecoderWorker(Thread):
                 sabnzbd.NzbQueue.reset_try_lists(article)
                 continue
 
-            except CrcError as crc_error:
+            except CrcError:
                 logging.info("CRC Error in %s" % art_id)
 
                 # Continue to the next one if we found new server
                 if search_new_server(article):
                     continue
 
-                # Store data, maybe par2 can still fix it
-                decoded_data = crc_error.data
-
             except (BadYenc, ValueError):
                 # Handles precheck and badly formed articles
                 if nzo.precheck and raw_data and raw_data[0].startswith(b"223 "):
@@ -246,7 +243,7 @@ def decode(article: Article, raw_data: List[bytes]) -> bytes:
 
 
 def search_new_server(article: Article) -> bool:
-    """Shorthand for searching new server or else increasing bad_articles"""
+    """ Shorthand for searching new server or else increasing bad_articles """
     # Continue to the next one if we found new server
     if not article.search_new_server():
         # Increase bad articles if no new server was found

sabnzbd/deobfuscate_filenames.py

@@ -42,7 +42,7 @@ MIN_FILE_SIZE = 10 * 1024 * 1024
 
 
 def decode_par2(parfile):
-    """Parse a par2 file and rename files listed in the par2 to their real name"""
+    """ Parse a par2 file and rename files listed in the par2 to their real name """
     # Check if really a par2 file
     if not is_parfile(parfile):
         logging.info("Par2 file %s was not really a par2 file")
@@ -89,11 +89,6 @@ def is_probably_obfuscated(myinputfilename):
         # exactly 32 hex digits, so:
         return True
 
-    # 0675e29e9abfd2.f7d069dab0b853283cc1b069a25f82.6547
-    if re.findall(r"^[a-f0-9\.]{40,}$", filebasename):
-        logging.debug("Obfuscated: starting with 40+ lower case hex digits and/or dots")
-        return True
-
     # /some/thing/abc.xyz.a4c567edbcbf27.BLA is certainly obfuscated
     if re.findall(r"^abc\.xyz", filebasename):
         logging.debug("Obfuscated: starts with 'abc.xyz'")
@@ -132,81 +127,47 @@ def is_probably_obfuscated(myinputfilename):
 
 
 def deobfuscate_list(filelist, usefulname):
-    """Check all files in filelist, and if wanted, deobfuscate: rename to filename based on usefulname"""
+    """ Check all files in filelist, and if wanted, deobfuscate """
 
     # to be sure, only keep really exsiting files:
     filelist = [f for f in filelist if os.path.exists(f)]
 
     # Search for par2 files in the filelist
     par2_files = [f for f in filelist if f.endswith(".par2")]
+
     # Found any par2 files we can use?
     run_renamer = True
     if not par2_files:
-        logging.debug("No par2 files found to process, running renamer")
+        logging.debug("No par2 files found to process, running renamer.")
     else:
         # Run par2 from SABnzbd on them
         for par2_file in par2_files:
             # Analyse data and analyse result
             logging.debug("Deobfuscate par2: handling %s", par2_file)
             if decode_par2(par2_file):
-                logging.debug("Deobfuscate par2 repair/verify finished")
+                logging.debug("Deobfuscate par2 repair/verify finished.")
                 run_renamer = False
             else:
-                logging.debug("Deobfuscate par2 repair/verify did not find anything to rename")
+                logging.debug("Deobfuscate par2 repair/verify did not find anything to rename.")
 
     # No par2 files? Then we try to rename qualifying (big, not-excluded, obfuscated) files to the job-name
     if run_renamer:
-        excluded_file_exts = EXCLUDED_FILE_EXTS
-        # If there is a collection with bigger files with the same extension, we don't want to rename it
-        extcounter = {}
-        for file in filelist:
-            if os.path.getsize(file) < MIN_FILE_SIZE:
-                # too small to care
-                continue
-            _, ext = os.path.splitext(file)
-            if ext in extcounter:
-                extcounter[ext] += 1
-            else:
-                extcounter[ext] = 1
-            if extcounter[ext] >= 3 and ext not in excluded_file_exts:
-                # collection, and extension not yet in excluded_file_exts, so add it
-                excluded_file_exts = (*excluded_file_exts, ext)
-                logging.debug(
-                    "Found a collection of at least %s files with extension %s, so not renaming those files",
-                    extcounter[ext],
-                    ext,
-                )
-
         logging.debug("Trying to see if there are qualifying files to be deobfuscated")
-        # We start with he biggest file ... probably the most important file
-        filelist = sorted(filelist, key=os.path.getsize, reverse=True)
         for filename in filelist:
-            # check that file is still there (and not renamed by the secondary renaming process below)
-            if not os.path.isfile(filename):
-                continue
             logging.debug("Deobfuscate inspecting %s", filename)
+            file_size = os.path.getsize(filename)
             # Do we need to rename this file?
             # Criteria: big, not-excluded extension, obfuscated (in that order)
             if (
-                os.path.getsize(filename) > MIN_FILE_SIZE
-                and get_ext(filename) not in excluded_file_exts
+                file_size > MIN_FILE_SIZE
+                and get_ext(filename) not in EXCLUDED_FILE_EXTS
                 and is_probably_obfuscated(filename)  # this as last test to avoid unnecessary analysis
             ):
-                # Rename and make sure the new filename is unique
+                # OK, rename
                 path, file = os.path.split(filename)
-                # construct new_name: <path><usefulname><extension>
                 new_name = get_unique_filename("%s%s" % (os.path.join(path, usefulname), get_ext(filename)))
                 logging.info("Deobfuscate renaming %s to %s", filename, new_name)
+                # Rename and make sure the new filename is unique
                 renamer(filename, new_name)
-                # find other files with the same basename in filelist, and rename them in the same way:
-                basedirfile, _ = os.path.splitext(filename)  # something like "/home/this/myiso"
-                for otherfile in filelist:
-                    if otherfile.startswith(basedirfile + ".") and os.path.isfile(otherfile):
-                        # yes, same basedirfile, only different extension
-                        remainingextension = otherfile.replace(basedirfile, "")  # might be long ext, like ".dut.srt"
-                        new_name = get_unique_filename("%s%s" % (os.path.join(path, usefulname), remainingextension))
-                        logging.info("Deobfuscate renaming %s to %s", otherfile, new_name)
-                        # Rename and make sure the new filename is unique
-                        renamer(otherfile, new_name)
     else:
         logging.info("No qualifying files found to deobfuscate")

sabnzbd/directunpacker.py

@@ -106,7 +106,7 @@ class DirectUnpacker(threading.Thread):
         return True
 
     def set_volumes_for_nzo(self):
-        """Loop over all files to detect the names"""
+        """ Loop over all files to detect the names """
         none_counter = 0
         found_counter = 0
         for nzf in self.nzo.files + self.nzo.finished_files:
@@ -126,7 +126,7 @@ class DirectUnpacker(threading.Thread):
 
     @synchronized(START_STOP_LOCK)
     def add(self, nzf: NzbFile):
-        """Add jobs and start instance of DirectUnpack"""
+        """ Add jobs and start instance of DirectUnpack """
         if not cfg.direct_unpack_tested():
             test_disk_performance()
 
@@ -350,7 +350,7 @@ class DirectUnpacker(threading.Thread):
 
     @synchronized(START_STOP_LOCK)
     def create_unrar_instance(self):
-        """Start the unrar instance using the user's options"""
+        """ Start the unrar instance using the user's options """
         # Generate extraction path and save for post-proc
         if not self.unpack_dir_info:
             try:
@@ -432,7 +432,7 @@ class DirectUnpacker(threading.Thread):
 
     @synchronized(START_STOP_LOCK)
     def abort(self):
-        """Abort running instance and delete generated files"""
+        """ Abort running instance and delete generated files """
         if not self.killed and self.cur_setname:
             logging.info("Aborting DirectUnpack for %s", self.cur_setname)
             self.killed = True
@@ -494,7 +494,7 @@ class DirectUnpacker(threading.Thread):
             self.reset_active()
 
     def get_formatted_stats(self):
-        """Get percentage or number of rar's done"""
+        """ Get percentage or number of rar's done """
         if self.cur_setname and self.cur_setname in self.total_volumes:
             # This won't work on obfuscated posts
             if self.total_volumes[self.cur_setname] >= self.cur_volume and self.cur_volume:
@@ -520,7 +520,7 @@ def analyze_rar_filename(filename):
 
 
 def abort_all():
-    """Abort all running DirectUnpackers"""
+    """ Abort all running DirectUnpackers """
     logging.info("Aborting all DirectUnpackers")
     for direct_unpacker in ACTIVE_UNPACKERS:
         direct_unpacker.abort()

sabnzbd/dirscanner.py

@@ -32,7 +32,7 @@ import sabnzbd.cfg as cfg
 
 
 def compare_stat_tuple(tup1, tup2):
-    """Test equality of two stat-tuples, content-related parts only"""
+    """ Test equality of two stat-tuples, content-related parts only """
     if tup1.st_ino != tup2.st_ino:
         return False
     if tup1.st_size != tup2.st_size:
@@ -45,7 +45,7 @@ def compare_stat_tuple(tup1, tup2):
 
 
 def clean_file_list(inp_list, folder, files):
-    """Remove elements of "inp_list" not found in "files" """
+    """ Remove elements of "inp_list" not found in "files" """
     for path in sorted(inp_list):
         fld, name = os.path.split(path)
         if fld == folder:
@@ -89,31 +89,31 @@ class DirScanner(threading.Thread):
         cfg.dirscan_speed.callback(self.newspeed)
 
     def newdir(self):
-        """We're notified of a dir change"""
+        """ We're notified of a dir change """
         self.ignored = {}
         self.suspected = {}
         self.dirscan_dir = cfg.dirscan_dir.get_path()
         self.dirscan_speed = cfg.dirscan_speed()
 
     def newspeed(self):
-        """We're notified of a scan speed change"""
+        """ We're notified of a scan speed change """
         # If set to 0, use None so the wait() is forever
         self.dirscan_speed = cfg.dirscan_speed() or None
         with self.loop_condition:
             self.loop_condition.notify()
 
     def stop(self):
-        """Stop the dir scanner"""
+        """ Stop the dir scanner """
         self.shutdown = True
         with self.loop_condition:
             self.loop_condition.notify()
 
     def save(self):
-        """Save dir scanner bookkeeping"""
+        """ Save dir scanner bookkeeping """
         sabnzbd.save_admin((self.dirscan_dir, self.ignored, self.suspected), SCAN_FILE_NAME)
 
     def run(self):
-        """Start the scanner"""
+        """ Start the scanner """
         logging.info("Dirscanner starting up")
         self.shutdown = False
 
@@ -125,7 +125,7 @@ class DirScanner(threading.Thread):
                 self.scan()
 
     def scan(self):
-        """Do one scan of the watched folder"""
+        """ Do one scan of the watched folder """
 
         def run_dir(folder, catdir):
             try:

sabnzbd/downloader.py

@@ -50,50 +50,11 @@ _PENALTY_PERM = 10  # Permanent error, like bad username/password
 _PENALTY_SHORT = 1  # Minimal penalty when no_penalties is set
 _PENALTY_VERYSHORT = 0.1  # Error 400 without cause clues
 
-# Wait this many seconds between checking idle servers for new articles or busy threads for timeout
-_SERVER_CHECK_DELAY = 0.5
-# Wait this many seconds between updates of the BPSMeter
-_BPSMETER_UPDATE_DELAY = 0.05
 
 TIMER_LOCK = RLock()
 
 
 class Server:
-    # Pre-define attributes to save memory and improve get/set performance
-    __slots__ = (
-        "id",
-        "newid",
-        "restart",
-        "displayname",
-        "host",
-        "port",
-        "timeout",
-        "threads",
-        "priority",
-        "ssl",
-        "ssl_verify",
-        "ssl_ciphers",
-        "optional",
-        "retention",
-        "send_group",
-        "username",
-        "password",
-        "busy_threads",
-        "next_busy_threads_check",
-        "idle_threads",
-        "next_article_search",
-        "active",
-        "bad_cons",
-        "errormsg",
-        "warning",
-        "info",
-        "ssl_info",
-        "request",
-        "have_body",
-        "have_stat",
-        "article_queue",
-    )
-
     def __init__(
         self,
         server_id,
@@ -133,7 +94,6 @@ class Server:
         self.password: Optional[str] = password
 
         self.busy_threads: List[NewsWrapper] = []
-        self.next_busy_threads_check: float = 0
         self.idle_threads: List[NewsWrapper] = []
         self.next_article_search: float = 0
         self.active: bool = True
@@ -145,15 +105,10 @@ class Server:
         self.request: bool = False  # True if a getaddrinfo() request is pending
         self.have_body: bool = True  # Assume server has "BODY", until proven otherwise
         self.have_stat: bool = True  # Assume server has "STAT", until proven otherwise
-        self.article_queue: List[sabnzbd.nzbstuff.Article] = []
 
-        # Initialize threads
         for i in range(threads):
             self.idle_threads.append(NewsWrapper(self, i + 1))
 
-        # Tell the BPSMeter about this server
-        sabnzbd.BPSMeter.init_server_stats(self.id)
-
     @property
     def hostip(self) -> str:
         """In case a server still has active connections, we use the same IP again
@@ -191,11 +146,6 @@ class Server:
                     logging.debug("%s: No successful IP connection was possible", self.host)
         return ip
 
-    def deactivate(self):
-        """Deactive server and reset queued articles"""
-        self.active = False
-        self.reset_article_queue()
-
     def stop(self):
         """Remove all connections from server"""
         for nw in self.idle_threads:
@@ -212,14 +162,8 @@ class Server:
             self.request = True
             Thread(target=self._request_info_internal).start()
 
-    def reset_article_queue(self):
-        logging.debug("Resetting article queue for %s", self)
-        for article in self.article_queue:
-            sabnzbd.NzbQueue.reset_try_lists(article, remove_fetcher_from_trylist=False)
-        self.article_queue = []
-
     def _request_info_internal(self):
-        """Async attempt to run getaddrinfo() for specified server"""
+        """ Async attempt to run getaddrinfo() for specified server """
         logging.debug("Retrieving server address information for %s", self.host)
         self.info = get_server_addrinfo(self.host, self.port)
         if not self.info:
@@ -234,25 +178,7 @@ class Server:
 
 
 class Downloader(Thread):
-    """Singleton Downloader Thread"""
-
-    # Improves get/set performance, even though it's inherited from Thread
-    # Due to the huge number of get-calls in run(), it can actually make a difference
-    __slots__ = (
-        "paused",
-        "bandwidth_limit",
-        "bandwidth_perc",
-        "can_be_slowed",
-        "can_be_slowed_timer",
-        "sleep_time",
-        "paused_for_postproc",
-        "shutdown",
-        "server_restarts",
-        "force_disconnect",
-        "read_fds",
-        "servers",
-        "timers",
-    )
+    """ Singleton Downloader Thread """
 
     def __init__(self, paused=False):
         super().__init__()
@@ -288,6 +214,8 @@ class Downloader(Thread):
         self.read_fds: Dict[int, NewsWrapper] = {}
 
         self.servers: List[Server] = []
+        self.server_dict: Dict[str, Server] = {}  # For faster lookups, but is not updated later!
+        self.server_nr: int = 0
         self.timers: Dict[str, List[float]] = {}
 
         for server in config.get_servers():
@@ -328,46 +256,45 @@ class Downloader(Thread):
                     create = False
                     server.newid = newserver
                     server.restart = True
-                    server.reset_article_queue()
                     self.server_restarts += 1
                     break
 
         if create and enabled and host and port and threads:
-            self.servers.append(
-                Server(
-                    newserver,
-                    displayname,
-                    host,
-                    port,
-                    timeout,
-                    threads,
-                    priority,
-                    ssl,
-                    ssl_verify,
-                    ssl_ciphers,
-                    send_group,
-                    username,
-                    password,
-                    optional,
-                    retention,
-                )
+            server = Server(
+                newserver,
+                displayname,
+                host,
+                port,
+                timeout,
+                threads,
+                priority,
+                ssl,
+                ssl_verify,
+                ssl_ciphers,
+                send_group,
+                username,
+                password,
+                optional,
+                retention,
             )
+            self.servers.append(server)
+            self.server_dict[newserver] = server
 
-            # Sort the servers for performance
-            self.servers.sort(key=lambda svr: "%02d%s" % (svr.priority, svr.displayname.lower()))
+        # Update server-count
+        self.server_nr = len(self.servers)
 
     def add_socket(self, fileno: int, nw: NewsWrapper):
-        """Add a socket ready to be used to the list to be watched"""
+        """ Add a socket ready to be used to the list to be watched """
         self.read_fds[fileno] = nw
 
     def remove_socket(self, nw: NewsWrapper):
-        """Remove a socket to be watched"""
+        """ Remove a socket to be watched """
         if nw.nntp:
             self.read_fds.pop(nw.nntp.fileno, None)
 
     @NzbQueueLocker
     def set_paused_state(self, state: bool):
-        """Set downloader to specified paused state"""
+        """ Set downloader to specified paused state """
         self.paused = state
 
     @NzbQueueLocker
@@ -380,7 +307,7 @@ class Downloader(Thread):
 
     @NzbQueueLocker
     def pause(self):
-        """Pause the downloader, optionally saving admin"""
+        """ Pause the downloader, optionally saving admin """
         if not self.paused:
             self.paused = True
             logging.info("Pausing")
@@ -480,21 +407,22 @@ class Downloader(Thread):
 
             # Not fully the same as the code below for optional servers
             server.bad_cons = 0
-            server.deactivate()
+            server.active = False
             self.plan_server(server, _PENALTY_TIMEOUT)
 
         # Optional and active server had too many problems.
         # Disable it now and send a re-enable plan to the scheduler
         if server.optional and server.active and (server.bad_cons / server.threads) > 3:
-            # Deactivate server
             server.bad_cons = 0
-            server.deactivate()
+            server.active = False
             logging.warning(T("Server %s will be ignored for %s minutes"), server.host, _PENALTY_TIMEOUT)
             self.plan_server(server, _PENALTY_TIMEOUT)
 
             # Remove all connections to server
             for nw in server.idle_threads + server.busy_threads:
-                self.__reset_nw(nw, "forcing disconnect", warn=False, wait=False, retry_article=False, send_quit=False)
+                self.__reset_nw(
+                    nw, "forcing disconnect", warn=False, wait=False, count_article_try=False, send_quit=False
+                )
 
             # Make sure server address resolution is refreshed
             server.info = None
@@ -510,7 +438,6 @@ class Downloader(Thread):
         if not raw_data:
             if not article.search_new_server():
                 sabnzbd.NzbQueue.register_article(article, success=False)
-                article.nzf.nzo.increase_bad_articles_counter("missing_articles")
             return
 
         # Send to decoder-queue
@@ -539,9 +466,7 @@ class Downloader(Thread):
         logging.debug("SSL verification test: %s", sabnzbd.CERTIFICATE_VALIDATION)
 
         # Kick BPS-Meter to check quota
-        BPSMeter = sabnzbd.BPSMeter
-        BPSMeter.update()
-        next_bpsmeter_update = 0
+        sabnzbd.BPSMeter.update()
 
         # Check server expiration dates
         check_server_expiration()
@@ -558,17 +483,15 @@ class Downloader(Thread):
                 if not server.busy_threads and server.next_article_search > now:
                     continue
 
-                if server.next_busy_threads_check < now:
-                    server.next_busy_threads_check = now + _SERVER_CHECK_DELAY
-                    for nw in server.busy_threads[:]:
-                        if (nw.nntp and nw.nntp.error_msg) or (nw.timeout and now > nw.timeout):
-                            if nw.nntp and nw.nntp.error_msg:
-                                # Already showed error
-                                self.__reset_nw(nw)
-                            else:
-                                self.__reset_nw(nw, "timed out", warn=True)
-                            server.bad_cons += 1
-                            self.maybe_block_server(server)
+                for nw in server.busy_threads[:]:
+                    if (nw.nntp and nw.nntp.error_msg) or (nw.timeout and now > nw.timeout):
+                        if nw.nntp and nw.nntp.error_msg:
+                            # Already showed error
+                            self.__reset_nw(nw)
+                        else:
+                            self.__reset_nw(nw, "timed out", warn=True)
+                        server.bad_cons += 1
+                        self.maybe_block_server(server)
 
                 if server.restart:
                     if not server.busy_threads:
@@ -586,6 +509,7 @@ class Downloader(Thread):
 
                 if (
                     not server.idle_threads
+                    or server.restart
                     or self.is_paused()
                     or self.shutdown
                     or self.paused_for_postproc
@@ -607,28 +531,20 @@ class Downloader(Thread):
                             server.request_info()
                         break
 
-                    # Get article from pre-fetched ones or fetch new ones
-                    if server.article_queue:
-                        article = server.article_queue.pop(0)
-                    else:
-                        # Pre-fetch new articles
-                        server.article_queue = sabnzbd.NzbQueue.get_articles(
-                            server, self.servers, max(1, server.threads // 4)
-                        )
-                        if server.article_queue:
-                            article = server.article_queue.pop(0)
-                            # Mark expired articles as tried on this server
-                            if server.retention and article.nzf.nzo.avg_stamp < now - server.retention:
-                                self.decode(article, None)
-                                while server.article_queue:
-                                    self.decode(server.article_queue.pop(), None)
-                                # Move to the next server, allowing the next server to already start
-                                # fetching the articles that were too old for this server
-                                break
-                        else:
-                            # Skip this server for a short time
-                            server.next_article_search = now + _SERVER_CHECK_DELAY
-                            break
+                    article = sabnzbd.NzbQueue.get_article(server, self.servers)
+
+                    if not article:
+                        # Skip this server for 0.5 second
+                        server.next_article_search = now + 0.5
+                        break
+
+                    if server.retention and article.nzf.nzo.avg_stamp < now - server.retention:
+                        # Let's get rid of all the articles for this server at once
+                        logging.info("Job %s too old for %s, moving on", article.nzf.nzo.final_name, server.host)
+                        while article:
+                            self.decode(article, None)
+                            article = article.nzf.nzo.get_article(server, self.servers)
+                        break
 
                     server.idle_threads.remove(nw)
                     server.busy_threads.append(nw)
@@ -656,16 +572,16 @@ class Downloader(Thread):
                         # Send goodbye if we have open socket
                         if nw.nntp:
                             self.__reset_nw(
-                                nw, "forcing disconnect", wait=False, count_article_try=False, send_quit=True
+                                nw,
+                                "forcing disconnect",
+                                wait=False,
+                                count_article_try=False,
+                                send_quit=True,
                             )
                     # Make sure server address resolution is refreshed
                     server.info = None
-                    server.reset_article_queue()
                 self.force_disconnect = False
 
-                # Make sure we update the stats
-                BPSMeter.update()
-
                 # Exit-point
                 if self.shutdown:
                     logging.info("Shutting down")
@@ -683,20 +599,20 @@ class Downloader(Thread):
                 # Need to initialize the check during first 20 seconds
                 if self.can_be_slowed is None or self.can_be_slowed_timer:
                     # Wait for stable speed to start testing
-                    if not self.can_be_slowed_timer and BPSMeter.get_stable_speed(timespan=10):
+                    if not self.can_be_slowed_timer and sabnzbd.BPSMeter.get_stable_speed(timespan=10):
                         self.can_be_slowed_timer = time.time()
 
                     # Check 10 seconds after enabling slowdown
                     if self.can_be_slowed_timer and time.time() > self.can_be_slowed_timer + 10:
                         # Now let's check if it was stable in the last 10 seconds
-                        self.can_be_slowed = BPSMeter.get_stable_speed(timespan=10)
+                        self.can_be_slowed = sabnzbd.BPSMeter.get_stable_speed(timespan=10)
                         self.can_be_slowed_timer = 0
                         logging.debug("Downloader-slowdown: %r", self.can_be_slowed)
 
             else:
                 read = []
 
-                BPSMeter.reset()
+                sabnzbd.BPSMeter.reset()
 
                 time.sleep(1.0)
 
@@ -709,11 +625,8 @@ class Downloader(Thread):
                     ):
                         DOWNLOADER_CV.wait()
 
-            if now > next_bpsmeter_update:
-                BPSMeter.update()
-                next_bpsmeter_update = now + _BPSMETER_UPDATE_DELAY
-
             if not read:
+                sabnzbd.BPSMeter.update()
                 continue
 
             for selected in read:
@@ -727,6 +640,7 @@ class Downloader(Thread):
                     bytes_received, done, skip = (0, False, False)
 
                 if skip:
+                    sabnzbd.BPSMeter.update()
                     continue
 
                 if bytes_received < 1:
@@ -735,22 +649,22 @@ class Downloader(Thread):
 
                 else:
                     try:
-                        article.nzf.nzo.update_download_stats(BPSMeter.bps, server.id, bytes_received)
+                        article.nzf.nzo.update_download_stats(sabnzbd.BPSMeter.bps, server.id, bytes_received)
                     except AttributeError:
                         # In case nzf has disappeared because the file was deleted before the update could happen
                         pass
 
-                    BPSMeter.update(server.id, bytes_received)
-
                     if self.bandwidth_limit:
-                        if BPSMeter.bps + BPSMeter.sum_cached_amount > self.bandwidth_limit:
-                            BPSMeter.update()
-                            while BPSMeter.bps > self.bandwidth_limit:
+                        limit = self.bandwidth_limit
+                        if bytes_received + sabnzbd.BPSMeter.bps > limit:
+                            while sabnzbd.BPSMeter.bps > limit:
                                 time.sleep(0.01)
-                                BPSMeter.update()
+                                sabnzbd.BPSMeter.update()
+                    sabnzbd.BPSMeter.update(server.id, bytes_received)
 
-                if nw.status_code != 222 and not done:
+                if not done and nw.status_code != 222:
                     if not nw.connected or nw.status_code == 480:
+                        done = False
                         try:
                             nw.finish_connect(nw.status_code)
                             if sabnzbd.LOG_ALL:
@@ -775,7 +689,7 @@ class Downloader(Thread):
                                         server.errormsg = errormsg
                                         logging.warning(T("Too many connections to server %s"), server.host)
                                     # Don't count this for the tries (max_art_tries) on this server
-                                    self.__reset_nw(nw, send_quit=True)
+                                    self.__reset_nw(nw, count_article_try=False, send_quit=True)
                                     self.plan_server(server, _PENALTY_TOOMANY)
                                     server.threads -= 1
                             elif ecode in (502, 481, 482) and clues_too_many_ip(msg):
@@ -826,11 +740,11 @@ class Downloader(Thread):
                                 block = True
                             if block or (penalty and server.optional):
                                 if server.active:
-                                    server.deactivate()
+                                    server.active = False
                                     if penalty and (block or server.optional):
                                         self.plan_server(server, penalty)
-                                # Note that the article is discard for this server
-                                self.__reset_nw(nw, retry_article=False, send_quit=True)
+                                # Note that this will count towards the tries (max_art_tries) on this server!
+                                self.__reset_nw(nw, send_quit=True)
                             continue
                         except:
                             logging.error(
@@ -840,7 +754,7 @@ class Downloader(Thread):
                                 nntp_to_msg(nw.data),
                             )
                             # No reset-warning needed, above logging is sufficient
-                            self.__reset_nw(nw, retry_article=False)
+                            self.__reset_nw(nw)
 
                         if nw.connected:
                             logging.info("Connecting %s@%s finished", nw.thrdnum, nw.server.host)
@@ -851,6 +765,7 @@ class Downloader(Thread):
                         logging.debug("Article <%s> is present", article.article)
 
                     elif nw.status_code == 211:
+                        done = False
                         logging.debug("group command ok -> %s", nntp_to_msg(nw.data))
                         nw.group = nw.article.nzf.nzo.group
                         nw.clear_data()
@@ -900,7 +815,6 @@ class Downloader(Thread):
         warn: bool = False,
         wait: bool = True,
         count_article_try: bool = True,
-        retry_article: bool = True,
         send_quit: bool = False,
     ):
         # Some warnings are errors, and not added as server.warning
@@ -921,23 +835,16 @@ class Downloader(Thread):
 
         if nw.article:
             # Only some errors should count towards the total tries for each server
-            if count_article_try:
-                nw.article.tries += 1
-
-            # Do we discard, or try again for this server
-            if not retry_article or nw.article.tries > cfg.max_art_tries():
+            if (
+                count_article_try
+                and nw.article.tries > cfg.max_art_tries()
+                and (nw.article.fetcher.optional or not cfg.max_art_opt())
+            ):
                 # Too many tries on this server, consider article missing
                 self.decode(nw.article, None)
-                nw.article.tries = 0
             else:
-                # 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)
+                # Allow all servers to iterate over this nzo/nzf again
+                sabnzbd.NzbQueue.reset_try_lists(nw.article)
 
         # Reset connection object
         nw.hard_reset(wait, send_quit=send_quit)
@@ -976,7 +883,7 @@ class Downloader(Thread):
 
     @synchronized(TIMER_LOCK)
     def plan_server(self, server: Server, interval: int):
-        """Plan the restart of a server in 'interval' minutes"""
+        """ Plan the restart of a server in 'interval' minutes """
         if cfg.no_penalties() and interval > _PENALTY_SHORT:
             # Overwrite in case of no_penalties
             interval = _PENALTY_SHORT
@@ -991,7 +898,7 @@ class Downloader(Thread):
 
     @synchronized(TIMER_LOCK)
     def trigger_server(self, server_id: str, timestamp: float):
-        """Called by scheduler, start server if timer still valid"""
+        """ Called by scheduler, start server if timer still valid """
         logging.debug("Trigger planned server resume for server-id %s", server_id)
         if server_id in self.timers:
             if timestamp in self.timers[server_id]:
@@ -1020,7 +927,7 @@ class Downloader(Thread):
     @NzbQueueLocker
     @synchronized(TIMER_LOCK)
     def check_timers(self):
-        """Make sure every server without a non-expired timer is active"""
+        """ Make sure every server without a non-expired timer is active """
         # Clean expired timers
         now = time.time()
         kicked = []
@@ -1046,18 +953,18 @@ class Downloader(Thread):
 
     @NzbQueueLocker
     def wakeup(self):
-        """Just rattle the semaphore"""
+        """ Just rattle the semaphore """
         pass
 
     @NzbQueueLocker
     def stop(self):
-        """Shutdown, wrapped so the semaphore is notified"""
+        """ Shutdown, wrapped so the semaphore is notified """
         self.shutdown = True
         sabnzbd.notifier.send_notification("SABnzbd", T("Shutting down"), "startup")
 
 
 def clues_login(text: str) -> bool:
-    """Check for any "failed login" clues in the response code"""
+    """ Check for any "failed login" clues in the response code """
     text = text.lower()
     for clue in ("username", "password", "invalid", "authen", "access denied"):
         if clue in text:
@@ -1066,7 +973,7 @@ def clues_login(text: str) -> bool:
 
 
 def clues_too_many(text: str) -> bool:
-    """Check for any "too many connections" clues in the response code"""
+    """ Check for any "too many connections" clues in the response code """
     text = text.lower()
     for clue in ("exceed", "connections", "too many", "threads", "limit"):
         # Not 'download limit exceeded' error
@@ -1076,7 +983,7 @@ def clues_too_many(text: str) -> bool:
 
 
 def clues_too_many_ip(text: str) -> bool:
-    """Check for any "account sharing" clues in the response code"""
+    """ Check for any "account sharing" clues in the response code """
     text = text.lower()
     for clue in ("simultaneous ip", "multiple ip"):
         if clue in text:
@@ -1085,7 +992,7 @@ def clues_too_many_ip(text: str) -> bool:
 
 
 def clues_pay(text: str) -> bool:
-    """Check for messages about payments"""
+    """ Check for messages about payments """
     text = text.lower()
     for clue in ("credits", "paym", "expired", "exceeded"):
         if clue in text: