Set version to 3.7.2

@jcfp if you ever feel like a refactor of these tests ;)

.github/dependabot.yml

@@ -4,7 +4,3 @@ updates:
   directory: "/"
   schedule:
     interval: "weekly"
-- package-ecosystem: "pip"
-  directory: "/"
-  schedule:
-    interval: "weekly"

.github/renovate.json

@@ -0,0 +1,37 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",
+    ":disableDependencyDashboard"
+  ],
+  "schedule": [
+    "before 3am on Monday"
+  ],
+  "ignorePaths": [
+    "tests/**",
+    ".github/workflows/**"
+  ],
+  "pip_requirements": {
+    "fileMatch": [
+      "requirements.txt",
+      "builder/requirements.txt",
+      "builder/osx/requirements.txt"
+    ]
+  },
+  "ignoreDeps": [
+    "jaraco.text"
+  ],
+  "packageRules": [
+    {
+      "matchPackagePatterns": [
+        "*"
+      ],
+      "groupName": "all dependencies",
+      "groupSlug": "all",
+      "separateMajorMinor": false,
+      "automerge": true
+    }
+  ],
+  "automergeStrategy": "squash",
+  "platformAutomerge": true
+}

.github/workflows/black.yml

@@ -1,23 +0,0 @@
-name: Black Code Formatter
-on: [push, pull_request]
-
-jobs:
-  black:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Black Code Formatter
-      uses: lgeiger/black-action@master
-      with:
-          args: >
-            SABnzbd.py
-            sabnzbd
-            scripts
-            tools
-            builder
-            builder/SABnzbd.spec
-            tests
-            --line-length=120
-            --target-version=py37
-            --check
-            --diff

.github/workflows/build_release.yml

@@ -2,8 +2,10 @@ name: Build binaries and source distribution
 
 on: [push, pull_request]
 
+# Setting PYTHONNODEBUGRANGES reduces binary size
 env:
   AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
+  PYTHONNODEBUGRANGES: 1
 
 jobs:
   build_windows:
@@ -12,13 +14,13 @@ jobs:
     timeout-minutes: 30
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.10 (64bit)
-      uses: actions/setup-python@v3
+    - name: Set up Python 3.11 (64bit)
+      uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.11"
         architecture: "x64"
     - name: Cache Python virtualenv (64bit)
-      uses: syphar/restore-virtualenv@v1.2
+      uses: syphar/restore-virtualenv@v1.3
       id: cache-virtualenv-64bit
       with:
         custom_virtualenv_dir: "venv64"
@@ -33,32 +35,25 @@ jobs:
         pip install --upgrade pip wheel
         pip install --upgrade -r requirements.txt
         pip install --upgrade -r builder/requirements.txt
-    - name: Build source distribution
-      run: python builder/package.py source
-    - name: Upload source distribution
-      uses: actions/upload-artifact@v2
-      with:
-        path: "*-src.tar.gz"
-        name: Source distribution
     - name: Build Windows standalone binary and installer (64bit)
       run: python builder/package.py installer
     - name: Upload Windows standalone binary (64bit)
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: "*-win64-bin.zip"
         name: Windows Windows standalone binary (64bit)
     - name: Upload Windows installer (64bit)
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: "*-win-setup.exe"
         name: Windows installer
     - name: Set up Python 3.8 (32bit and legacy)
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: "3.8"
         architecture: "x86"
     - name: Cache Python virtualenv (32bit and legacy)
-      uses: syphar/restore-virtualenv@v1.2
+      uses: syphar/restore-virtualenv@v1.3
       id: cache-virtualenv-32bit
       with:
         custom_virtualenv_dir: "venv32"
@@ -76,7 +71,7 @@ jobs:
     - name: Build Windows standalone binary (32bit and legacy)
       run: python builder/package.py binary
     - name: Upload Windows standalone binary (32bit and legacy)
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: "*-win32-bin.zip"
         name: Windows Windows standalone binary (32bit and legacy)
@@ -89,24 +84,22 @@ jobs:
     runs-on: macos-11
     timeout-minutes: 30
     env:
-      SIGNING_AUTH: ${{ secrets.SIGNING_AUTH }}
-      NOTARIZATION_USER: ${{ secrets.NOTARIZATION_USER }}
-      NOTARIZATION_PASS: ${{ secrets.NOTARIZATION_PASS }}
       # We need the official Python, because the GA ones only support newer macOS versions
       # The deployment target is picked up by the Python build tools automatically
       # If updated, make sure to also set LSMinimumSystemVersion in SABnzbd.spec
-      PYTHON_VERSION: "3.10.2"
+      PYTHON_VERSION: "3.11.1"
       MACOSX_DEPLOYMENT_TARGET: "10.9"
       # We need to force compile for universal2 support
-      CFLAGS: -arch arm64 -arch x86_64
+      CFLAGS: -arch x86_64 -arch arm64
+      ARCHFLAGS: -arch x86_64 -arch arm64
     steps:
     - uses: actions/checkout@v3
     - name: Cache Python download
       id: cache-python-download
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/python.pkg
-        key: macOS-Python-${{ env.PYTHON_VERSION }}
+        key: cache-macOS-Python-${{ env.PYTHON_VERSION }}
     - name: Get Python
       if: steps.cache-python-download.outputs.cache-hit != 'true'
       run: curl https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macos11.pkg -o ~/python.pkg
@@ -116,7 +109,7 @@ jobs:
         unlink /usr/local/bin/python
         ln -s /usr/local/bin/python3 /usr/local/bin/python
     - name: Cache Python virtualenv
-      uses: syphar/restore-virtualenv@v1.2
+      uses: syphar/restore-virtualenv@v1.3
       id: cache-virtualenv
       with:
         custom_cache_key_element: "release"
@@ -124,40 +117,57 @@ jobs:
           **/requirements.txt
           PKG-INFO
     - name: Install Python dependencies
-      # We have to manually install a few packages:
-      # 1.  cffi will pick up the single-arch libffi from Homebrew, while Apple provides universal2-version
-      #     of libffi with XCode. So we forcefully have to remove the Homebrew one.
-      # 2.  Because building cryptography is hard, and we cannot force pip to fetch universal2 version we
+      # We have to manually take a few steps:
+      # 1.  Because building cryptography is hard, and we cannot force pip to fetch universal2 version we
       #     first install the x86 version (and it's dependencies) and then manually fetch the universal2 build
       #     https://github.com/pyca/cryptography/issues/5918
-      # 3.  We need to build the PyInstaller bootloader from sources:
+      # 2.  We need to build the PyInstaller bootloader:
       #     https://github.com/pyinstaller/pyinstaller/issues/6235
       if: steps.cache-virtualenv.outputs.cache-hit != 'true'
       run: |
         python3 --version
         pip3 install --upgrade pip wheel
         
-        brew uninstall libffi --ignore-dependencies
-        ARCHFLAGS="-arch x86_64 -arch arm64" pip3 install --upgrade cffi --no-binary cffi
-        pip3 install --upgrade -r requirements.txt
+        pip3 install --upgrade -r requirements.txt --no-binary cffi
         
         pip3 uninstall cryptography -y
-        pip3 download -r builder/osx/requirements.txt --platform macosx_10_10_universal2 --only-binary :all: --no-deps --dest .
+        pip3 download -r builder/osx/requirements.txt --platform macosx_10_12_universal2 --only-binary :all: --no-deps --dest .
         pip3 install -r builder/osx/requirements.txt --no-cache-dir --no-index --find-links .
-        
+
         PYINSTALLER_COMPILE_BOOTLOADER=1 pip3 install --upgrade -r builder/requirements.txt --no-binary pyinstaller
     - name: Import macOS codesign certificates
-      uses: apple-actions/import-codesign-certs@v1
-      if: env.SIGNING_AUTH
+      # Taken from https://github.com/Apple-Actions/import-codesign-certs/pull/27 (comments)
+      env:
+        CERTIFICATES_P12: ${{ secrets.CERTIFICATES_P12 }}
+        CERTIFICATES_P12_PASSWORD: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+        MACOS_KEYCHAIN_TEMP_PASSWORD: ${{ secrets.MACOS_KEYCHAIN_TEMP_PASSWORD }}
+      if: env.CERTIFICATES_P12
+      run: |
+        echo $CERTIFICATES_P12 | base64 --decode > certificate.p12
+        security create-keychain -p "$MACOS_KEYCHAIN_TEMP_PASSWORD" build.keychain 
+        security default-keychain -s build.keychain 
+        security unlock-keychain -p "$MACOS_KEYCHAIN_TEMP_PASSWORD" build.keychain
+        security set-keychain-settings -lut 21600 build.keychain
+        security import certificate.p12 -k build.keychain -P "$CERTIFICATES_P12_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productsign -T /usr/bin/xcrun
+        security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_KEYCHAIN_TEMP_PASSWORD" build.keychain
+    - name: Build source distribution
+      # Run this on macOS so the line endings are correct by default
+      run: python builder/package.py source
+    - name: Upload source distribution
+      uses: actions/upload-artifact@v3
       with:
-        p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+        path: "*-src.tar.gz"
+        name: Source distribution
     - name: Build macOS binary
+      env:
+        SIGNING_AUTH: ${{ secrets.SIGNING_AUTH }}
+        NOTARIZATION_USER: ${{ secrets.NOTARIZATION_USER }}
+        NOTARIZATION_PASS: ${{ secrets.NOTARIZATION_PASS }}
       run: |
         python3 builder/package.py app
         python3 builder/make_dmg.py
     - name: Upload macOS binary
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: "*-osx.dmg"
         name: macOS binary (not notarized)
@@ -170,15 +180,14 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
     env:
-      SNAP_TOKEN: ${{ secrets.SNAP_TOKEN }}
+      SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_TOKEN }}
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: "3.x"
       - name: Release latest available Snap
         run: |
           sudo snap install snapcraft --classic
-          echo "${SNAP_TOKEN}" | snapcraft login --with -
           python3 snap/local/release_snap.py

.github/workflows/integration_testing.yml

@@ -3,6 +3,27 @@ name: CI Tests
 on: [push, pull_request]
 
 jobs:
+  black:
+    name: Black Code Formatter
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Black Code Formatter
+        uses: lgeiger/black-action@master
+        with:
+          args: >
+            SABnzbd.py
+            sabnzbd
+            scripts
+            tools
+            builder
+            builder/SABnzbd.spec
+            tests
+            --line-length=120
+            --target-version=py37
+            --check
+            --diff
+
   test:
     name: Test ${{ matrix.name }} - Python ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
@@ -10,27 +31,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         os: [ubuntu-20.04]
         include:
           - name: macOS
             os: macos-latest
-            python-version: "3.10"
+            python-version: "3.11"
           - name: Windows
             os: windows-latest
-            python-version: "3.10"
+            python-version: "3.11"
 
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
+        architecture: "x64"
     - name: Install system dependencies
       if: runner.os == 'Linux'
       run: sudo apt-get install unrar p7zip-full par2
     - name: Cache Python virtualenv
-      uses: syphar/restore-virtualenv@v1.2
+      uses: syphar/restore-virtualenv@v1.3
       id: cache-virtualenv
       with:
         custom_cache_key_element: "ci"
@@ -41,6 +63,7 @@ jobs:
       if: steps.cache-virtualenv.outputs.cache-hit != 'true'
       run: |
         python --version
+        pip install --upgrade pip wheel
         pip install --upgrade -r requirements.txt
         pip install --upgrade -r tests/requirements.txt
     - name: Test SABnzbd

.github/workflows/translations.yml

@@ -7,33 +7,35 @@ on:
 
 jobs:
   translations:
+    name: Update translatable texts
     runs-on: ubuntu-latest
     env:
       TX_TOKEN: ${{ secrets.TX_TOKEN }}
     steps:
       - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
       - name: Generate translatable texts
         run: |
           python3 tools/extract_pot.py
-      - name: Install Transifex client
-        if: env.TX_TOKEN
-        # Sudo is needed to link the "tx"-command
-        run: |
-          sudo -H python3 -m pip install setuptools wheel
-          sudo -H python3 -m pip install transifex-client
       - name: Push/pull Transifex translations
         if: env.TX_TOKEN
         run: |
-          tx push --source --parallel
-          tx pull --all --force --parallel
+          curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
+          ./tx push --translation --source
+          ./tx pull --all --force
       - 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.13.1
+        uses: stefanzweifel/git-auto-commit-action@v4.16.0
         if: env.TX_TOKEN
         with:
-          commit_message: Update translatable texts
+          commit_message: | 
+            Update translatable texts
+            [skip ci]
           commit_user_name: SABnzbd Automation
           commit_user_email: bugs@sabnzbd.org
           commit_author: SABnzbd Automation <bugs@sabnzbd.org>
+          file_pattern: "po/*.pot po/*.po"
+          push_options: --force

.tx/config

@@ -1,21 +1,21 @@
 [main]
 host = https://www.transifex.com
 
-[sabnzbd-translations.po-main-sabnzbd-pot--develop]
+[o:sabnzbd:p:sabnzbd-translations:r:po-main-sabnzbd-pot--develop]
 file_filter = po/main/<lang>.po
 minimum_perc = 0
 source_file = po/main/SABnzbd.pot
 source_lang = en
 type = PO
 
-[sabnzbd-translations.po-email-sabemail-pot--develop]
+[o:sabnzbd:p:sabnzbd-translations:r:po-email-sabemail-pot--develop]
 file_filter = po/email/<lang>.po
 minimum_perc = 0
 source_file = po/email/SABemail.pot
 source_lang = en
 type = PO
 
-[sabnzbd-translations.po-nsis-sabnsis-pot--develop]
+[o:sabnzbd:p:sabnzbd-translations:r:po-nsis-sabnsis-pot--develop]
 file_filter = po/nsis/<lang>.po
 minimum_perc = 0
 source_file = po/nsis/SABnsis.pot

COPYRIGHT.txt

@@ -1,5 +1,5 @@
 
-(c) Copyright 2007-2022 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2023 by "The SABnzbd-team" <team@sabnzbd.org>
 
 The SABnzbd-team is:
 

INSTALL.txt

@@ -4,7 +4,7 @@
 0) LICENSE
 -------------------------------------------------------------------------------
 
-(c) Copyright 2007-2022 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2023 by "The SABnzbd-team" <team@sabnzbd.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

ISSUES.txt

@@ -16,7 +16,7 @@
       no_penalties = 1
   See: https://sabnzbd.org/wiki/configuration/3.4/special
 
-- Some third-party utilties try to probe SABnzbd API in such a way that you will
+- Some third-party utilities 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.
@@ -53,3 +53,6 @@
   to your servers to a total of 7. There is a CPU-usage reduction feature in SABnzbd that
   gets confused by the way some VPN's handle the state of a connection. Below 8 connections
   this feature is not active.
+
+- If the queue is paused but one or more jobs have the Force priority, SABnzbd might still
+  download some data from other jobs in the queue if active servers have unused connections.

LICENSE.txt

@@ -1,4 +1,4 @@
-(c) Copyright 2007-2022 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2023 by "The SABnzbd-team" <team@sabnzbd.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

PKG-INFO

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

README.md

@@ -1,10 +1,8 @@
 SABnzbd - The automated Usenet download tool
 ============================================
 
-![CI tests](https://github.com/sabnzbd/sabnzbd/workflows/CI%20Tests/badge.svg)
-![Build binaries](https://github.com/sabnzbd/sabnzbd/workflows/Build%20binaries%20and%20source%20distribution/badge.svg)
-[![License](https://img.shields.io/badge/license-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
-
+[![License](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
+[![Join our Discord](https://img.shields.io/discord/976737547558461480?color=7289DA&label=Discord&logo=Discord&logoColor=white)](https://discord.gg/KQzDe7fvNU)
 
 SABnzbd is an Open Source Binary Newsreader written in Python.
 

README.mkd

@@ -1,28 +1,60 @@
-Release Notes - SABnzbd 3.6.0 Beta 1
+Release Notes - SABnzbd 3.7.2
 =========================================================
 
-## Changes since 3.5.3
-- Significantly increased performance by using the yEnc-decoding
-  library of @animetosho. Usenet articles are now decoded using
-  specialized CPU instructions (SIMD) on x86 and ARM systems.
-- Create and restore backup of configuration and database.
-- Show source of lower download speed (CPU or disk).
-- Added keyboard shortcuts (Pause, Add, Status, Config).
-- Results of `Deobfuscate` step listed in History.
-- Disable `api_warnings` to prevent showing `Access Denied`
-  information to the external client.
-- Jobs with `Force` priority always skip duplicate check.
-- Removed several status items from the `queue` API-call.
-- Linux: Added AppStream metadata, desktop shortcut and MimeInfo.
-- macOS: Application and included tools fully native on M1 systems.
-- macOS/Windows: Updated UnRar to 6.10 and 7-Zip to 21.07.
-- Windows: Updated MultiPar to v1.3.2.3.
+## Bugfixes and changes since 3.7.1
+- Ignore permissions inside archives during unpacking by UnRar.
+- Improvements to connection error messages.
+- Apply other changes only after updating the `Category` in multi-edit.
+- Categories were not sorted correctly in dropdowns.
+- Prevent crash when `Automatically sort queue` was enabled.
+- Apply `History Retention` setting during startup.
+- Tweaks to download performance.
+- Linux: Update appstream metadata.
 
-# Bugfixes since 3.5.3
-- Extended timeout when measuring system performance.
-- Interface settings were sometimes reset on page reload.
-- Par2 sets with duplicate names could skip verification and repair.
-- Prevent crash if not enough repair blocks are available.
+## Bugfixes and changes since 3.7.0
+- Minor improvements in download performance.
+- Scripts set `On queue finish` are no longer persistent by default.
+- Improved `Test Server` to handle more failure cases.
+- Priority list in `Add NZB`-window was missing `Paused` priority.
+- Keyboard shortcuts did not work if not in Tabbed-mode.
+- Keyboard shortcut `S` did not reload status information.
+- In `history` API-call the `stage_log` could be empty.
+- Using the `-` character broke the queue/history search.
+- Improved detection and handling of stuck jobs.
+
+## Changes since 3.6.1
+- The queue and history can be filtered using keywords:
+  `cat` and `priority`. For example: `show name cat:tv`.
+- Use shortcut `shift + arrow-key` to navigate the queue/history pages.
+- The backup is now created in a local folder for security.
+- Recurring backups can be configured using the scheduler.
+- Improvements to Deobfuscate Final Filenames.
+- RSS overview shows the rule that accepted the job.
+- Added option to sort the queue by `% downloaded`.
+- Added option to replace underscores with dots in folder names.
+- SABnzbd Host input will be validated before being applied.
+- Moved system load information from the main page to the Status window.
+- Console logging is now written to `stdout` instead of `stderr`.
+- Removed Special settings `enable_meta`, `disable_key`,
+  `replace_illegal`, `osx_speed` and `show_sysload`.
+- Merged Special settings `win_menu` and `osx_menu` into `tray_icon`.
+- macOS/Windows: Use Python 3.11, slightly boosting overall performance.
+- macOS/Windows: Updated UnRar to 6.12.
+- Windows: Updated MultiPar to 1.3.2.5.
+
+# API changes since 3.6.1
+- Minor improvements in API performance.
+- Removed fields `scripts` and `categories` from `queue` API call.
+- Moved `loadavg` from `queue` to `status` API call.
+
+# Bugfixes since 3.6.1
+- Free Space Detection was too strict when using Direct Unpack.
+- File uploads with special characters would be parsed incorrectly.
+- Passwords from NZB meta-data were tried multiple times.
+- Passwords were not always supplied to the pre-queue script.
+- RSS-feed names were not sanitized when renamed.
+- Make sure short-dates are detected as `YY-MM-DD` in Sorting.
+- Show the custom job name in History when the NZB could not be fetched.
 
 ## Upgrade notices
 - The download statistics file `totals10.sab` is updated in 3.2.x
@@ -39,4 +71,4 @@ Release Notes - SABnzbd 3.6.0 Beta 1
   that automatically verify, repair, extract and clean up posts downloaded
   from Usenet.
 
-  (c) Copyright 2007-2022 by "The SABnzbd-team" \<team@sabnzbd.org\>
+  (c) Copyright 2007-2023 by "The SABnzbd-team" \<team@sabnzbd.org\>

SABnzbd.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python3 -OO
-# Copyright 2007-2022 The SABnzbd-Team <team@sabnzbd.org>
+# Copyright 2007-2023 The SABnzbd-Team <team@sabnzbd.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -64,7 +64,7 @@ from sabnzbd.constants import (
     DEF_TIMEOUT,
     DEF_LOG_ERRFILE,
     DEF_MAIN_TMPL,
-    DEF_STDINTF,
+    DEF_STD_WEB_DIR,
     DEF_WORKDIR,
     DEF_INTERFACES,
     DEF_LANGUAGE,
@@ -74,7 +74,7 @@ from sabnzbd.constants import (
     MAX_WARNINGS,
     RSS_FILE_NAME,
     DEF_LOG_FILE,
-    DEF_STDCONFIG,
+    DEF_STD_CONFIG,
     DEF_LOG_CHERRY,
 )
 import sabnzbd.newsunpack
@@ -240,7 +240,7 @@ def print_version():
             """
 %s-%s
 
-Copyright (C) 2007-2022 The SABnzbd-Team <team@sabnzbd.org>
+Copyright (C) 2007-2023 The SABnzbd-Team <team@sabnzbd.org>
 SABnzbd comes with ABSOLUTELY NO WARRANTY.
 This is free software, and you are welcome to redistribute it
 under certain conditions. It is licensed under the
@@ -326,7 +326,7 @@ def identify_web_template(key, defweb, wdir):
 
     if not os.path.exists(full_main):
         helpful_warning(T("Cannot find web template: %s, trying standard template"), full_main)
-        full_dir = real_path(sabnzbd.DIR_INTERFACES, DEF_STDINTF)
+        full_dir = real_path(sabnzbd.DIR_INTERFACES, DEF_STD_WEB_DIR)
         full_main = real_path(full_dir, DEF_MAIN_TMPL)
         if not os.path.exists(full_main):
             logging.exception("Cannot find standard template: %s", full_dir)
@@ -431,7 +431,6 @@ def print_modules():
                 sabnzbd.decoder.SABYENC_VERSION,
                 sabnzbd.constants.SABYENC_VERSION_REQUIRED,
             )
-            logging.info("SABYenc file %s", sabnzbd.decoder.SABYENC_FILE)
         else:
             # No SABYenc module at all
             logging.error(
@@ -1157,7 +1156,7 @@ def main():
         daemonize()
     else:
         if console_logging:
-            console = logging.StreamHandler()
+            console = logging.StreamHandler(stream=sys.stdout)
             console.setLevel(LOGLEVELS[logging_level + 1])
             console.setFormatter(logging.Formatter(logformat))
             logger.addHandler(console)
@@ -1193,7 +1192,7 @@ def main():
     # Find encoding; relevant for external processing activities
     logging.info("Preferred encoding = %s", sabnzbd.encoding.CODEPAGE)
 
-    # On Linux/FreeBSD/Unix "UTF-8" is strongly, strongly adviced:
+    # On Linux/FreeBSD/Unix "UTF-8" is strongly, strongly advised:
     if not sabnzbd.WIN32 and not sabnzbd.MACOS and not ("utf-8" in sabnzbd.encoding.CODEPAGE.lower()):
         helpful_warning(
             T(
@@ -1209,6 +1208,9 @@ def main():
             sabnzbd.ORG_UMASK,
         )
 
+    # Log JSON module in case of problems
+    logging.debug("JSON-module = %s %s", sabnzbd.api.json.__name__, sabnzbd.api.json.__version__)
+
     # SSL Information
     logging.info("SSL version = %s", ssl.OPENSSL_VERSION)
 
@@ -1250,15 +1252,15 @@ def main():
 
     os.chdir(sabnzbd.DIR_PROG)
 
-    sabnzbd.WEB_DIR = identify_web_template(sabnzbd.cfg.web_dir, DEF_STDINTF, fix_webname(web_dir))
-    sabnzbd.WEB_DIR_CONFIG = identify_web_template(None, DEF_STDCONFIG, "")
+    sabnzbd.WEB_DIR = identify_web_template(sabnzbd.cfg.web_dir, DEF_STD_WEB_DIR, fix_webname(web_dir))
+    sabnzbd.WEB_DIR_CONFIG = identify_web_template(None, DEF_STD_CONFIG, "")
     sabnzbd.WIZARD_DIR = os.path.join(sabnzbd.DIR_INTERFACES, "wizard")
 
     sabnzbd.WEB_COLOR = check_template_scheme(sabnzbd.cfg.web_color(), sabnzbd.WEB_DIR)
     sabnzbd.cfg.web_color.set(sabnzbd.WEB_COLOR)
 
     # Handle the several tray icons
-    if sabnzbd.cfg.win_menu() and not sabnzbd.DAEMON and not sabnzbd.WIN_SERVICE:
+    if sabnzbd.cfg.tray_icon() and not sabnzbd.DAEMON and not sabnzbd.WIN_SERVICE:
         if sabnzbd.WIN32:
             sabnzbd.WINTRAY = sabnzbd.sabtray.SABTrayThread()
         elif sabnzbd.LINUX_POWER and os.environ.get("DISPLAY"):
@@ -1269,7 +1271,7 @@ def main():
                 from gi.repository import Gtk
                 import sabnzbd.sabtraylinux
 
-                sabnzbd.LINUXTRAY = sabnzbd.sabtraylinux.StatusIcon()
+                sabnzbd.sabtraylinux.StatusIcon()
             except:
                 logging.info("python3-gi not found, no SysTray.")
 
@@ -1612,15 +1614,20 @@ def main():
     # Send our final goodbyes!
     notifier.send_notification("SABnzbd", T("SABnzbd shutdown finished"), "startup")
     logging.info("Leaving SABnzbd")
-    sys.stderr.flush()
-    sys.stdout.flush()
     sabnzbd.pid_file()
 
+    try:
+        sys.stderr.flush()
+        sys.stdout.flush()
+    except AttributeError:
+        # Not supported on Windows binaries
+        pass
+
     if hasattr(sys, "frozen") and sabnzbd.MACOS:
         try:
             AppHelper.stopEventLoop()
         except:
-            # Failing AppHelper libary!
+            # Failing AppHelper library!
             os._exit(0)
     elif sabnzbd.WIN_SERVICE:
         # Do nothing, let service handle it

builder/SABnzbd.spec

@@ -122,7 +122,7 @@ pyi_analysis = Analysis(
     ["SABnzbd.py"],
     datas=extra_pyinstaller_files,
     hiddenimports=extra_hiddenimports,
-    excludes=["FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter"],
+    excludes=["ujson", "FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter"],
 )
 
 pyz = PYZ(pyi_analysis.pure, pyi_analysis.zipped_data)

builder/osx/requirements.txt

@@ -1,3 +1,3 @@
 # Special requirements for macOS universal2 binary release
 # This way dependabot can auto-update them
-cryptography==36.0.1
+cryptography==39.0.0

builder/package.py

@@ -16,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import glob
+import hashlib
 import platform
 import re
 import sys
@@ -63,7 +64,7 @@ extra_folders = [
 
 # Support functions
 def safe_remove(path):
-    """Remove file without erros if the file doesn't exist
+    """Remove file without errors if the file doesn't exist
     Can also handle folders
     """
     if os.path.exists(path):
@@ -482,6 +483,16 @@ if __name__ == "__main__":
         # Remove source folder
         safe_remove(src_folder)
 
+        # Calculate hashes for Synology release
+        with open(RELEASE_SRC, "rb") as inp_file:
+            source_data = inp_file.read()
+
+        print("----")
+        print(RELEASE_SRC, "SHA1", hashlib.sha1(source_data).hexdigest())
+        print(RELEASE_SRC, "SHA256", hashlib.sha256(source_data).hexdigest())
+        print(RELEASE_SRC, "MD5", hashlib.md5(source_data).hexdigest())
+        print("----")
+
     # Release to github
     if "release" in sys.argv:
         # Check if tagged as release and check for token

builder/requirements.txt

@@ -1,18 +1,23 @@
 # Basic build requirements
 # Note that not all sub-dependencies are listed, but only ones we know could cause trouble
-pyinstaller==4.10
-pyinstaller-hooks-contrib==2022.2
-altgraph==0.17.2
-wrapt==1.14.0
-setuptools==60.9.3
-pkginfo==1.8.2
-PyGithub==1.55
-charset-normalizer==2.0.12
+pyinstaller==5.7.0
+pyinstaller-hooks-contrib==2022.14
+altgraph==0.17.3
+wrapt==1.14.1
+setuptools==65.6.3
+pkginfo==1.9.6
+PyGithub==1.57
+charset-normalizer==3.0.1
 certifi
 
+# orjson does not support 32bit Windows, exclude it based on Python-version
+# This way we also test ujson on Python 3.7 and 3.8 in the CI-tests
+# Fixed to 3.8.3 due to issue in 3.8.4: https://github.com/ijl/orjson/issues/331
+orjson==3.8.3; python_version > '3.8'
+
 # For the macOS build
-dmgbuild==1.5.2; sys_platform == 'darwin'
-mac-alias==2.2.0; sys_platform == 'darwin'
-macholib==1.15.2; sys_platform == 'darwin'
-ds-store==1.3.0; sys_platform == 'darwin'
-PyNaCl==1.5.0; sys_platform == 'darwin'
+dmgbuild==1.6.0; sys_platform == 'darwin'
+mac-alias==2.2.2; sys_platform == 'darwin'
+macholib==1.16.2; sys_platform == 'darwin'
+ds-store==1.3.1; sys_platform == 'darwin'
+PyNaCl==1.5.0; sys_platform == 'darwin'

builder/win/NSIS_Installer.nsi

@@ -56,7 +56,7 @@ Unicode true
   CRCCheck on ; (can be off)
   AutoCloseWindow false ; (can be true for the window go away automatically at end)
   ShowInstDetails hide ; (can be show to have them shown, or nevershow to disable)
-  SetDateSave off ; (can be on to have files restored to their orginal date)
+  SetDateSave off ; (can be on to have files restored to their original date)
   WindowIcon on
   SpaceTexts none
 
@@ -185,7 +185,7 @@ Section "SABnzbd" SecDummy
   liteFirewallW::AddRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"
 
   ;------------------------------------------------------------------
-  ; Add to registery
+  ; Add to registry
   WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd" "" "$INSTDIR"
   WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd" "Installer Language" "$(MsgLangCode)"
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "DisplayName" "SABnzbd ${SAB_VERSION}"
@@ -328,7 +328,7 @@ FunctionEnd
 UninstallText $(MsgUninstall)
 
 Section "un.$(MsgDelProgram)" Uninstall
-;make sure sabnzbd.exe isnt running..if so shut it down
+;make sure sabnzbd.exe isn't running..if so shut it down
   ${nsProcess::KillProcess} "SABnzbd.exe" $R0
   ${nsProcess::Unload}
   DetailPrint "Process Killed"

interfaces/Config/templates/_inc_footer_uc.tmpl

@@ -15,7 +15,7 @@
                         <!--#if not $windows#-->
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="show_hidden_folders"> <span>$T('systemFolders')</span>
+                                <input type="checkbox" id="show_hidden_folders"> <span>$T('hiddenFolders')</span>
                             </label>
                         </div>
                         <!--#end if#-->

interfaces/Config/templates/_inc_header_uc.tmpl

@@ -69,7 +69,7 @@
         // Set default functions for the autocomplete everywhere
         \$.extend(\$.fn.typeahead.defaults, {
             source: function (query, process) {
-                // If there's no seperator, it must be a relative path
+                // If there's no separator, it must be a relative path
                 if(query.split(folderSeperator).length < 2 && this.\$element.data('initialdir')) {
                     query  = this.\$element.data('initialdir') + folderSeperator + query;
                 }

interfaces/Config/templates/config.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Config"#-->
-<!--#set global $help_uri="configuration/3.6/configure"#-->
+<!--#set global $help_uri="configuration/3.7/configure"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#from sabnzbd.encoding import CODEPAGE#-->
@@ -124,7 +124,7 @@
 
 <div class="colmask">
     <div class="padding alt">
-        <h5 class="copyright">Copyright &copy; 2007-2022 The SABnzbd Team &lt;<a href="mailto:team@sabnzbd.org">team@sabnzbd.org</a>&gt;</h5>
+        <h5 class="copyright">Copyright &copy; 2007-2023 The SABnzbd Team &lt;<a href="mailto:team@sabnzbd.org">team@sabnzbd.org</a>&gt;</h5>
         <p class="copyright"><small>$T('yourRights')</small></p>
     </div>
 

interfaces/Config/templates/config_cat.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Categories"#-->
-<!--#set global $help_uri="configuration/3.6/categories"#-->
+<!--#set global $help_uri="configuration/3.7/categories"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
     <div class="section">
@@ -111,7 +111,7 @@
         });
 
         // Add autocomplete and file-browser
-        \$('.fileBrowserSmall').typeahead().fileBrowser();
+        \$('.fileBrowserSmall').typeahead({appendTo: 'body'}).fileBrowser();
 
         // Make categories sortable
         \$('.padTable').sortable({

interfaces/Config/templates/config_folders.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Folders"#-->
-<!--#set global $help_uri="configuration/3.6/folders"#-->
+<!--#set global $help_uri="configuration/3.7/folders"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -104,6 +104,11 @@
                     <span class="desc">$T('explain-admin_dir1')</span>
                     <span class="desc">$T('explain-admin_dir2')</span>
                 </div>
+                <div class="field-pair">
+                    <label class="config" for="backup_dir">$T('opt-backup_dir')</label>
+                    <input type="text" name="backup_dir" id="backup_dir" value="$backup_dir" data-initialdir="$my_home" />
+                    <span class="desc">$T('explain-backup_dir')</span>
+                </div>
                 <div class="field-pair">
                     <label class="config" for="log_dir">$T('opt-log_dir')</label>
                     <input type="text" name="log_dir" id="log_dir" value="$log_dir" data-initialdir="$my_lcldata" />

interfaces/Config/templates/config_general.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="General"#-->
-<!--#set global $help_uri="configuration/3.6/general"#-->
+<!--#set global $help_uri="configuration/3.7/general"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -181,7 +181,7 @@
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="socks5_proxy_url">$T('opt-socks5_proxy_url')</label>
-                        <input type="text" name="socks5_proxy_url" id="socks5_proxy_url" value="$socks5_proxy_url" placeholder="socks5://username:password@hostname:port" />
+                        <input type="text" name="socks5_proxy_url" id="socks5_proxy_url" value="$socks5_proxy_url" autocomplete="off" placeholder="socks5://user:pass@hostname:port" />
                         <span class="desc">$T('explain-socks5_proxy_url') <br/>$T('readwiki')</span>
                     </div>
                     <div class="field-pair">
@@ -231,18 +231,18 @@
         <div class="section">
             <div class="col2">
                 <h3>$T('backup') <a href="$helpuri$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-                <p><b>$T('restartRequired')</b></p>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
                     <div class="field-pair">
-                        <label class="config" for="download_backup">$T('download-backup')</label>
-                        <span class="desc"><a class="btn btn-default" href="../backup/?apikey=$apikey" target="_blank" id="download_backup"><span class="glyphicon glyphicon-download-alt"></span> $T('download-backup')</a></span>
+                        <label class="config" for="create_backup">$T('create-backup')</label>
+                        <span class="desc"><button class="btn btn-default createBackup" type="button" id="create_backup"><span class="glyphicon glyphicon glyphicon-import"></span> $T('create-backup')</button></span>
+                        <span class="desc">$T('explain-create_backup')</span>
                     </div>
                     <div class="field-pair">
                         <label class="config" for="config_backup_file">$T('restore-backup')</label>
-                        <input type="file" name="config_backup_file" id="config_backup_file" />
-                        <span class="desc">$T('explain-admin_backup')</span>
+                        <input type="file" accept=".zip" name="config_backup_file" id="config_backup_file" />
+                        <span class="desc">$T('restartRequired')</span>
                     </div>
                     <div class="field-pair">
                         <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-open"></span> $T('restore-backup')</button>
@@ -281,7 +281,7 @@
             // Skip the fancy stuff, just submit
             this.submit()
         })
-        // No JSON reponse
+        // No JSON response
         \$('#ajax').val('')
     })
     hideOrShowTranslate()
@@ -399,6 +399,20 @@
         }
     })
 
+    \$('#create_backup').click(function () {
+        $.ajax({
+          type: "POST",
+          url: "../../api",
+          data: {mode:'config', name:'create_backup', output:'json', apikey: \$('#apikey').val()},
+          success: function(data) {
+              if(data.value.result) {
+                  alert("$T('backup'):\n" + data.value.message)
+              } else {
+                  alert("$T('button-failed')")
+              }
+          }
+        });
+    });
 });
 </script>
 

interfaces/Config/templates/config_notify.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Email"#-->
-<!--#set global $help_uri="configuration/3.6/notifications"#-->
+<!--#set global $help_uri="configuration/3.7/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.6/rss"#-->
+<!--#set global $help_uri="configuration/3.7/rss"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <!--#import html#-->
 <div class="colmask">
@@ -481,18 +481,22 @@
                     <thead>
                         <tr>
                             <th class="default-sort">$T('rss-added')</th>
+                            <th>$T('rss-filter')</th>
                             <th>$T('size')</th>
                             <th width="60%">$T('sort-title')</th>
                             <th>$T('category')</th>
+                            <th>$T('nzo-age')</th>
                             <th>$T('source')</th>
                         </tr>
                     </thead>
                     <!--#for $job in $downloaded#-->
                         <tr class="infoTableSeperator">
                             <td data-sort-value="$job['time_downloaded_ms']">$job['time_downloaded']</td>
+                            <td>$job['rule'] $job['skip']</td>
                             <td data-sort-value="$job['size']">$job['size_units']</td>
                             <td>$job['title']</td>
                             <td>$job['cat']</td>
+                            <td data-sort-value="$job['age_ms']">$job['age']</td>
                             <td data-sort-value="$job['baselink']" title="$job['baselink']">
                                 <!--#if not $job['infourl']#-->
                                 <div class="favicon source-icon" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></div>

interfaces/Config/templates/config_scheduling.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Scheduling"#-->
-<!--#set global $help_uri="configuration/3.6/scheduling"#-->
+<!--#set global $help_uri="configuration/3.7/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.6/servers"#-->
+<!--#set global $help_uri="configuration/3.7/servers"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#import json#-->
@@ -49,7 +49,7 @@
                         <label class="config" for="host">$T('srv-host')</label>
                         <input type="text" name="host" id="host" required />
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="port">$T('srv-port')</label>
                         <input type="number" name="port" id="port" size="8" value="119" min="0" />
                     </div>
@@ -180,7 +180,7 @@
                             <label class="config" for="host$cur">$T('srv-host')</label>
                             <input type="text" name="host" id="host$cur" value="$server['host']" required />
                         </div>
-                        <div class="field-pair">
+                        <div class="field-pair advanced-settings">
                             <label class="config" for="port$cur">$T('srv-port')</label>
                             <input type="number" name="port" id="port$cur" value="$server['port']" size="8" min="0" required />
                         </div>
@@ -259,7 +259,7 @@
                             <label class="config" for="notes$cur">$T('srv-notes')</label>
                             <textarea name="notes" id="notes$cur" rows="3" cols="50">$server['notes']</textarea>
                         </div>
-                        <div class="field-pair">
+                        <div class="field-pair no-field-pair-bg">
                             <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                             <button class="btn btn-default testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button>
                             <button class="btn btn-default delServer"><span class="glyphicon glyphicon-trash"></span> $T('button-delServer')</button>
@@ -283,7 +283,8 @@
 
                             <p title="$T('readwiki')">
                                 <b>$T('srv-article-availability'):</b><br/>
-                                $T('selectedDates'): <span id="server-article-value-${cur}"></span>
+                                $T('selectedDates'): <span id="server-article-value-${cur}"></span><br/>
+                                <a href="https://sabnzbd.org/not-complete" id="server-article-not-complete-${cur}" target="_blank">https://sabnzbd.org/not-complete</a>
                             </p>
                             <!--#if $server['expire_date']#-->
                             <p><b>$T('srv-expire_date'):</b> $(server['expire_date'])</p>
@@ -402,8 +403,11 @@
             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})))
+                // If we have a low value, we link them to the website
+                if(articleRatio > 60) \$('#server-article-not-complete-' + server_id).hide()
             } else {
                 \$('#server-article-value-' + server_id).text('$T("notAvailable")')
+                \$('#server-article-not-complete-' + server_id).hide()
             }
 
             // Save bandwidth data in a very ugly way, but we need to do this
@@ -545,7 +549,7 @@
                 theButton.removeAttr("disabled")
                 theButton.find('span').toggleClass('glyphicon-sort glyphicon-refresh spin-glyphicon')
 
-                // Succes or not?
+                // Success or not?
                 if(data.value.result) {
                     resultBox.addClass('alert-success')
                     resultBox.prepend('<span class="glyphicon glyphicon-ok-sign"></span> ')

interfaces/Config/templates/config_sorting.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Sorting"#-->
-<!--#set global $help_uri="configuration/3.6/sorting"#-->
+<!--#set global $help_uri="configuration/3.7/sorting"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -242,10 +242,6 @@
                         <label class="config wide" for="enable_movie_sorting">$T('opt-movieSort')</label>
                         <input type="checkbox" name="enable_movie_sorting" id="enable_movie_sorting" value="1" <!--#if int($enable_movie_sorting)> 0 then 'checked="checked"' else ""#--> />
                     </div>
-                    <div class="field-pair">
-                        <label class="config wide" for="movie_extra_folder">$T('opt-movieExtra')</label>
-                        <input type="checkbox" name="movie_extra_folder" id="movie_extra_folder" value="1" <!--#if int($movie_extra_folder)> 0 then 'checked="checked"' else ""#--> />
-                    </div>
                     <div class="field-pair">
                         <label class="config" for="moviefoldername">$T('sortString')</label>
                         <input type="text" name="movie_sort_string" id="moviefoldername" value="$movie_sort_string" /><button class="btn btn-default clearBtn" type="button"><span class="glyphicon glyphicon-remove"></span> $T('button-clear')</button>
@@ -257,9 +253,9 @@
                     <div class="field-pair">
                         <label class="config">$T('presetSort')</label>
                         <div class="presets float-left">
-                            <input type="button" class="btn btn-default" onclick="movieSet('%title (%y)/%title (%y).%ext',' CD%1');movieExtraFolder(false)" value="$T('button-inFolders')" />
-                            <input type="button" class="btn btn-default" onclick="movieSet('%title (%y).%ext',' CD%1');movieExtraFolder(true)" value="$T('button-noFolders')" />
-                            <input type="button" class="btn btn-default" onclick="movieSet('%0decade/%title (%y).%ext',' CD%1');movieExtraFolder(true)" value="$T('decade')" />
+                            <input type="button" class="btn btn-default" onclick="movieSet('%title (%y)/%title (%y).%ext',' CD%1');" value="$T('button-inFolders')" />
+                            <input type="button" class="btn btn-default" onclick="movieSet('%title (%y).%ext',' CD%1');" value="$T('button-noFolders')" />
+                            <input type="button" class="btn btn-default" onclick="movieSet('%0decade/%title (%y).%ext',' CD%1');" value="$T('decade')" />
                             <input type="button" class="btn btn-default" onclick="movieSet('%dn.%ext')" value="$T('button-FileLikeFolder')" />
                         </div>
                     </div>
@@ -642,10 +638,6 @@
       new_previewmovie();
   }
 
-  function movieExtraFolder(value) {
-      \$('#movie_extra_folder').attr("checked", value);
-  }
-
   function dateSet(val) {
       \$('#datefoldername').val(val);
       new_previewdate();

interfaces/Config/templates/config_special.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Special"#-->
-<!--#set global $help_uri="configuration/3.6/special"#-->
+<!--#set global $help_uri="configuration/3.7/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.6/switches"#-->
+<!--#set global $help_uri="configuration/3.7/switches"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -141,6 +141,7 @@
                         <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="remaining asc" <!--#if $auto_sort == "remaining asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortRemaining')</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="name asc" <!--#if $auto_sort == "name asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortNameAsc')</option>
@@ -148,7 +149,7 @@
                             <option value="size asc" <!--#if $auto_sort == "size asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortSizeAsc')</option>
                             <option value="size desc" <!--#if $auto_sort == "size desc" then 'selected="selected"' else ""#--> >$T('Glitter-sortSizeDesc')</option>
                         </select>
-                        <span class="desc">$T('explain-auto_sort')</span>
+                        <span class="desc">$T('explain-auto_sort') $T('explain-auto_sort_remaining')</span>
                     </div>
                     <div class="field-pair">
                         <label class="config" for="direct_unpack">$T('opt-direct_unpack')</label>
@@ -247,11 +248,6 @@
                         <input type="checkbox" name="deobfuscate_final_filenames" id="deobfuscate_final_filenames" value="1" <!--#if int($deobfuscate_final_filenames) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-deobfuscate_final_filenames') $T('explain-deobfuscate_final_filenames-ext')</span>
                     </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="enable_meta">$T('opt-enable_meta')</label>
-                        <input type="checkbox" name="enable_meta" id="enable_meta" value="1" <!--#if int($enable_meta) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-enable_meta').replace('. ', '.<br/>')</span>
-                    </div>
                     <div class="field-pair">
                         <label class="config" for="cleanup_list">$T('opt-cleanup_list')</label>
                         <input type="text" name="cleanup_list" id="cleanup_list" value="$cleanup_list"/>
@@ -292,6 +288,11 @@
                         <input type="checkbox" name="replace_spaces" id="replace_spaces" value="1" <!--#if int($replace_spaces) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-replace_spaces')</span>
                     </div>
+                    <div class="field-pair">
+                        <label class="config" for="replace_underscores">$T('opt-replace_underscores')</label>
+                        <input type="checkbox" name="replace_underscores" id="replace_underscores" value="1" <!--#if int($replace_underscores) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-replace_underscores')</span>
+                    </div>
                     <div class="field-pair">
                         <label class="config" for="replace_dots">$T('opt-replace_dots')</label>
                         <input type="checkbox" name="replace_dots" id="replace_dots" value="1" <!--#if int($replace_dots) > 0 then 'checked="checked"' else ""#--> />
@@ -348,149 +349,11 @@
                 </fieldset>
             </div><!-- /col1 -->
         </div><!-- /section -->
-        <div class="section">
-            <div class="col2">
-                <h3>$T('swtag-indexing') <a href="$helpuri$help_uri#toc6" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-            </div><!-- /col2 -->
-            <div class="col1">
-                <fieldset>
-                    <div class="field-pair">
-                        <label class="config" for="rating_enable">$T('opt-rating_enable')</label>
-                        <input type="checkbox" name="rating_enable" id="rating_enable" value="1" <!--#if int($rating_enable) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-rating_enable').replace('. ', '.<br/>')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="rating_api_key">$T('opt-rating_api_key')</label>
-                        <input type="text" name="rating_api_key" id="rating_api_key" value="$rating_api_key" />
-                        <span class="desc">$T('explain-rating_api_key')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="rating_filter_enable">$T('opt-rating_filter_enable')</label>
-                        <input type="checkbox" name="rating_filter_enable" id="rating_filter_enable" value="1" <!--#if int($rating_filter_enable) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-rating_filter_enable')</span>
-                    </div>
-                    <div class="field-pair" id="rating_filter_abort">
-                        <label class="config">$T('opt-rating_filter_abort_if')</label>
-                        <div class="rating-filter">
-                            <p>
-                                <label for="rating_filter_abort_video">$T('opt-rating_filter_video')</label>
-                                <select name="rating_filter_abort_video" id="rating_filter_abort_video">
-                                    <option value="0" <!--#if $rating_filter_abort_video == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
-                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_abort_video == $val then 'selected="selected"' else ""#--> >$val $T('orLess')</option><!--#end for#-->
-                                </select>
-                            </p>
-                            <p>
-                                <label for="rating_filter_abort_audio">$T('opt-rating_filter_audio')</label>
-                                <select name="rating_filter_abort_audio" id="rating_filter_abort_audio">
-                                    <option value="0" <!--#if $rating_filter_abort_audio == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
-                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_abort_audio == $val then 'selected="selected"' else ""#--> >$val $T('orLess')</option><!--#end for#-->
-                                </select>
-                            </p>
-                            <p>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_abort_encrypted" name="rating_filter_abort_encrypted" <!--#if int($rating_filter_abort_encrypted) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_abort_encrypted">$T('opt-rating_filter_passworded')</label>
-                                </span>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_abort_encrypted_confirm" name="rating_filter_abort_encrypted_confirm" <!--#if int($rating_filter_abort_encrypted_confirm) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_abort_encrypted_confirm">$T('opt-rating_filter_confirmed')</label>
-                                </span>
-                            </p>
-                            <p>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_abort_spam" name="rating_filter_abort_spam" <!--#if int($rating_filter_abort_spam) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_abort_spam">$T('opt-rating_filter_spam')</label>
-                                </span>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_abort_spam_confirm" name="rating_filter_abort_spam_confirm" <!--#if int($rating_filter_abort_spam_confirm) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_abort_spam_confirm">$T('opt-rating_filter_confirmed')</label>
-                                </span>
-                            </p>
-                            <p>
-                                <input type="checkbox" value="1" id="rating_filter_abort_downvoted" name="rating_filter_abort_downvoted" <!--#if int($rating_filter_abort_downvoted) > 0 then 'checked="checked"' else ""#--> />
-                                <label for="rating_filter_abort_downvoted">$T('opt-rating_filter_downvoted')</label>
-                            </p>
-                            <p>
-                                <label for="rating_filter_abort_keywords">$T('opt-rating_filter_keywords')</label>
-                                <input type="text" name="rating_filter_abort_keywords" id="rating_filter_abort_keywords" value="$rating_filter_abort_keywords"/>
-                                <span class="desc">$T('explain-rating_filter_keywords')</span>
-                            </p>
-                        </div>
-                    </div>
-                    <div class="field-pair" id="rating_filter_pause">
-                        <label class="config">$T('opt-rating_filter_pause_if')</label>
-                        <div class="rating-filter">
-                            <p>
-                                <label for="rating_filter_pause_video">$T('opt-rating_filter_video')</label>
-                                <select name="rating_filter_pause_video" id="rating_filter_pause_video">
-                                    <option value="0" <!--#if $rating_filter_pause_video == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
-                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_pause_video == $val then 'selected="selected"' else ""#--> >$val $T('orLess')</option><!--#end for#-->
-                                </select>
-                            </p>
-                            <p>
-                                <label for="rating_filter_pause_audio">$T('opt-rating_filter_audio')</label>
-                                <select name="rating_filter_pause_audio" id="rating_filter_pause_audio">
-                                    <option value="0" <!--#if $rating_filter_pause_audio == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
-                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_pause_audio == $val then 'selected="selected"' else ""#--> >$val $T('orLess') </option><!--#end for#-->
-                                </select>
-                            </p>
-                            <p>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_pause_encrypted" name="rating_filter_pause_encrypted" <!--#if int($rating_filter_pause_encrypted) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_pause_encrypted">$T('opt-rating_filter_passworded')</label>
-                                </span>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_pause_encrypted_confirm" name="rating_filter_pause_encrypted_confirm" <!--#if int($rating_filter_pause_encrypted_confirm) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_pause_encrypted_confirm">$T('opt-rating_filter_confirmed')</label>
-                                </span>
-                            </p>
-                            <p>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_pause_spam" name="rating_filter_pause_spam" <!--#if int($rating_filter_pause_spam) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_pause_spam">$T('opt-rating_filter_spam')</label>
-                                </span>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_pause_spam_confirm" name="rating_filter_pause_spam_confirm" <!--#if int($rating_filter_pause_spam_confirm) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_pause_spam_confirm">$T('opt-rating_filter_confirmed')</label>
-                                </span>
-                            </p>
-                            <p>
-                                <input type="checkbox" value="1" id="rating_filter_pause_downvoted" name="rating_filter_pause_downvoted" <!--#if int($rating_filter_pause_downvoted) > 0 then 'checked="checked"' else ""#--> />
-                                <label for="rating_filter_pause_downvoted">$T('opt-rating_filter_downvoted')</label>
-                            </p>
-                            <p>
-                                <label for="rating_filter_pause_keywords">$T('opt-rating_filter_keywords')</label>
-                                <input type="text" name="rating_filter_pause_keywords" id="rating_filter_pause_keywords" value="$rating_filter_pause_keywords"/>
-                                <span class="desc">$T('explain-rating_filter_keywords')</span>
-                            </p>
-                        </div>
-                    </div>
-                    <div class="field-pair">
-                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    </div>
-                </fieldset>
-            </div><!-- /col1 -->
-        </div><!-- /section -->
     </form>
 </div><!-- /colmask -->
 
 <script type="text/javascript">
 \$(document).ready(function() {
-    if (!\$('#rating_filter_enable').is(":checked")) {
-        \$("#rating_filter_abort").hide();
-        \$("#rating_filter_pause").hide();
-    }
-    \$('#rating_filter_enable').change(function () {
-        if (\$(this).is(":checked")) {
-            \$("#rating_filter_abort").show();
-            \$("#rating_filter_pause").show();
-        }
-        else {
-            \$("#rating_filter_abort").hide();
-            \$("#rating_filter_pause").hide();
-        }
-    });
-
     \$('#history_retention_select, #history_retention_number').on('change', updateHistoryRetention)
     function updateHistoryRetention() {
         var retention_setting = \$('#history_retention')

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

@@ -727,41 +727,6 @@ ul.tabs li.active a {
 .checkbox-days label {
     padding: 2px 20px;
 }
-.rating-filter  {
-    float:  left;
-}
-.rating-filter p  {
-    margin:  0 0 10px 0;
-}
-.rating-filter select  {
-    vertical-align: middle;
-}
-.rating-filter input  {
-    vertical-align: middle;
-     margin-top: -1px;
-}
-.rating-filter label  {
-    display: inline-block;
-     padding-left: 0px;
-     width: 100px;
-}
-.rating-filter input[type="checkbox"]  {
-    display: inline;
-}
-.rating-filter input[type="checkbox"] + label  {
-    padding-left: 20px;
-    padding-top: 5px;
-     width: auto;
-}
-.rating-filter p > span:first-child  {
-    float: left;
-     width: 130px;
-}
-.rating-filter .desc  {
-    display: block;
-     margin: 0px;
-     padding-left: 103px;
-}
 
 /** EDITS 2015 **/
 * {

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

@@ -408,7 +408,7 @@ $(document).ready(function () {
     $('input[type="checkbox"]').parents('label').addClass('config-hover')
 
     // Disable sections
-    var checkDisabled = '#rating_enable, #enable_tv_sorting, #enable_movie_sorting, #enable_date_sorting'
+    var checkDisabled = '#enable_tv_sorting, #enable_movie_sorting, #enable_date_sorting'
 
     $(checkDisabled).on('change', function() {
         $(this).parent().nextAll().toggleClass('disabled')

interfaces/Glitter/licenses/LICENSE-CC.txt

@@ -9,7 +9,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE B
 
 1. Definitions
 
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("syncing") will be considered an Adaptation for the purpose of this License.
    2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License.
    3. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
    4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
@@ -44,7 +44,7 @@ The above rights may be exercised in all media and formats whether now known or
 
 5. Representations, Warranties and Disclaimer
 
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
 
 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 

interfaces/Glitter/templates/include_history.tmpl

@@ -41,102 +41,11 @@
                         </span>
                     </div>
                 </td>
-                <td class="name" data-bind="css: { 'name-has-ratings' : historyStatus.has_rating }">
+                <td class="name">
                     <div class="row-wrap-text">
                         <a class="retry-buttontext" href="#" data-bind="visible: (failed() && canRetry()), click: retry">$T('button-retry')</a>
                         <span data-bind="text: historyStatus.name, attr: { 'title': historyStatus.name() }"></span>
                     </div>
-
-                    <!-- ko if: historyStatus.has_rating -->
-                    <div class="dropdown history-ratings">
-                        <a href="#" class="name-icons hover-button" data-toggle="dropdown" onclick="keepOpen(this)">
-                            <span class="glyphicon glyphicon-thumbs-up"></span> <span data-bind="text: historyStatus.rating_avg_vote_up"></span>
-                            <span class="glyphicon glyphicon-thumbs-down"></span> <span data-bind="text: historyStatus.rating_avg_vote_down"></span>
-                        </a>
-                        <ul class="dropdown-menu history-ratings-menu">
-                            <li>
-                                <form class="history-ratings-basic">
-                                    <label>
-                                        <input type="radio" value="up" data-bind="attr: { 'name': 'ratings-status-'+nzo_id, 'checked': historyStatus.rating_user_vote() == 1 }, event: { change: setUserVote }" />
-                                        <span class="glyphicon glyphicon-thumbs-up"></span>
-                                        <span data-bind="text: historyStatus.rating_avg_vote_up"></span>
-                                    </label>
-                                    <label>
-                                        <input type="radio" value="down" data-bind="attr: { 'name': 'ratings-status-'+nzo_id, 'checked': historyStatus.rating_user_vote() == 2 }, event: { change: setUserVote }" />
-                                        <span class="glyphicon glyphicon-thumbs-down"></span>
-                                        <span data-bind="text: historyStatus.rating_avg_vote_down"></span>
-                                    </label>
-                                    <label>
-                                        <span class="glyphicon glyphicon-facetime-video"></span>
-                                        <select name="ratings-video" data-bind="value: historyStatus.rating_user_video, event: { change: setUserRating }, disable: historyStatus.rating_user_video">
-                                            <option value="">&nbsp;</option>
-                                            <option value="1">1</option>
-                                            <option value="2">2</option>
-                                            <option value="3">3</option>
-                                            <option value="4">4</option>
-                                            <option value="5">5</option>
-                                            <option value="6">6</option>
-                                            <option value="7">7</option>
-                                            <option value="8">8</option>
-                                            <option value="9">9</option>
-                                            <option value="10">10</option>
-                                        </select>
-                                    </label>
-                                    <label>
-                                        <span class="glyphicon glyphicon-volume-up"></span>
-                                        <select name="ratings-audio" data-bind="value: historyStatus.rating_user_audio, event: { change: setUserRating }, disable: historyStatus.rating_user_audio">
-                                            <option value="">&nbsp;</option>
-                                            <option value="1">1</option>
-                                            <option value="2">2</option>
-                                            <option value="3">3</option>
-                                            <option value="4">4</option>
-                                            <option value="5">5</option>
-                                            <option value="6">6</option>
-                                            <option value="7">7</option>
-                                            <option value="8">8</option>
-                                            <option value="9">9</option>
-                                            <option value="10">10</option>
-                                        </select>
-                                    </label>
-                                    <!-- ko if: historyStatus.url_info -->
-                                    <a href="#" target="_blank" data-bind="attr: { 'href':historyStatus.url_info }" title="$T('Glitter-openInfoURL')"><span class="glyphicon glyphicon-globe"></span></a>
-                                    <!-- /ko -->
-                                </form>
-                            </li>
-                            <li class="divider"></li>
-                            <li>
-                                <form class="history-ratings-report" data-bind="submit: setUserReport">
-                                    <strong>$T('report')</strong>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="spam" /> $T('spam')
-                                    </label>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="encrypted" /> $T('encrypted')
-                                    </label>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="expired" /> $T('expired')
-                                        <select name="ratings-report-expired-server" class="ratings-report-hidden form-control" data-bind="options: \$parent.servers, optionsText: 'host', optionsValue: 'host', optionsCaption: '$T('nzo-all')'"></select>
-                                    </label>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="other" /> $T('otherProblem')
-                                        <input type="text" class="form-control ratings-report-hidden" name="ratings-report-other" />
-                                    </label>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="comment" /> $T('comment')
-                                        <input type="text" class="form-control ratings-report-hidden" name="ratings-report-comment" />
-                                    </label>
-                                    <br />
-                                    <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> $T('send')</button>
-                                </form>
-                            </li>
-                        </ul>
-                    </div>
-                    <!-- /ko -->
                 </td>
                 <td class="status row-wrap-text" data-bind="text: statusText()" onclick="showDetails(this)"></td>
                 <!-- ko foreach: parent.parent.extraHistoryColumns -->
@@ -177,7 +86,7 @@
                                     <div class="col-sm-2">$T('srv-password')</div>
                                     <div class="col-sm-10" data-bind="text: historyStatus.password"></div>
                                 </div>
-                                <div class="row">
+                                <div class="row" data-bind="visible: historyStatus.storage() || historyStatus.path()">
                                     <div class="col-sm-2">$T('msg-path')</div>
                                     <div class="col-sm-10" data-bind="text: historyStatus.storage() == '' ? historyStatus.path : historyStatus.storage"></div>
                                 </div>

interfaces/Glitter/templates/include_menu.tmpl

@@ -43,7 +43,7 @@
                         <button type="button" class="btn btn-default navbar-btn dropdown-toggle" data-toggle="dropdown" onclick="keepOpen(this)">
                             <span class="caret"></span>
                         </button>
-                        <a href="#" class="max-speed-input-clear hover-button" data-bind="click: clearSpeedLimit, visible:(speedLimit() != 100)" style="display: none;">
+                        <a href="#" class="max-speed-input-clear hover-button" data-bind="click: clearSpeedLimit, visible:(speedLimit() < 100 && speedLimit() > 0)" style="display: none;">
                             <span class="glyphicon glyphicon-link"></span>
                         </a>
                         <div class="dropdown-menu max-speed-input">
@@ -81,7 +81,7 @@
             <li data-tooltip="true" data-placement="bottom" title="SABnzbd $T('menu-config')">
                 <a href="./config/"><span class="glyphicon glyphicon-cog"></span></a>
             </li>
-            <li class="dropdown main-menu-link" data-bind="css: { 'active-on-queue-finish-menu': onQueueFinish()}">
+            <li class="dropdown main-menu-link" data-bind="css: { 'active-on-queue-finish-menu': finishaction()}">
                 <a href="#" data-toggle="dropdown"  onclick="keepOpen(this)">
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
@@ -102,7 +102,8 @@
                     <li class="divider"></li>
                     <li class="dropdown-header"><span class="glyphicon glyphicon-off"></span> $T('Glitter-onFinish'):</li>
                     <li>
-                        <select data-bind="value: onQueueFinish, event: { change: setOnQueueFinish }" class="form-control">
+                        <!-- ko if: queue.scriptsListLoaded -->
+                        <select data-bind="value: finishaction, event: { change: setOnQueueFinish }" class="form-control">
                             <option value=""></option>
                             <optgroup label="$T('eoq-actions')">
                                 <option value="shutdown_program">$T('shutdownSab')</option>
@@ -114,12 +115,13 @@
                             </optgroup>
                             <optgroup label="$T('eoq-scripts')" data-bind="visible: queue.scriptsList().length > 1">
                                 <!-- ko foreach: queue.scriptsList -->
-                                    <!-- ko if: \$data != glitterTranslate.noneText -->
-                                        <option data-bind="text: \$data, attr: { value: 'script_'+\$data } " ></option>
+                                    <!-- ko if: \$data.scriptValue != 'None' -->
+                                        <option data-bind="text: \$data.scriptText, attr: { value: 'script_'+\$data.scriptValue } " ></option>
                                     <!-- /ko -->
                                 <!-- /ko -->
                             </optgroup>
                         </select>
+                        <!-- /ko -->
                     </li>
                 </ul>
             </li>

interfaces/Glitter/templates/include_overlays.tmpl

@@ -1,6 +1,6 @@
 <!--#from sabnzbd.constants import VALID_ARCHIVES, VALID_NZB_FILES#-->
 <!--#set $file_exts = ', '.join(VALID_NZB_FILES + VALID_ARCHIVES)#-->
-<!-- Notifcation box -->
+<!-- Notification box -->
 <div class="main-notification-box" style="display: none">
     <div class="main-notification-box-uploading">
         <span class="glyphicon glyphicon-open"></span> $T('Glitter-notification-uploading') <span class="main-notification-box-file-count"></span>
@@ -117,6 +117,12 @@
                                 <span data-bind="text: cacheSize"></span> (<span data-bind="text: cacheArticles"></span> $T('Glitter-articles'))
                             </div>
                         </div>
+                        <div class="row" data-bind="visible: statusInfo.loadavg()">
+                            <div class="col-sm-6">$T('dashboard-loadavg') &nbsp; </div>
+                            <div class="col-sm-6">
+                                <span data-bind="text: statusInfo.loadavg"></span>
+                            </div>
+                        </div>
                         <div class="row" data-bind="visible: statusInfo.delayed_decoder() > 5 || statusInfo.delayed_assembler() > 5">
                             <div class="col-sm-6">$T('dashboard-delayed') &nbsp; </div>
                             <div class="col-sm-6">
@@ -517,14 +523,22 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label">$T('category')</label>
                     <div class="col-sm-6">
-                        <select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText',"></select>
+                        <select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText'"></select>
                         <span class="glyphicon glyphicon-tag"></span>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-4 control-label">$T('priority')</label>
                     <div class="col-sm-6">
-                        <select name="Priority" class="form-control" data-bind="options: queue.priorityOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '$T('default')'"></select>
+                        <!-- This list is different from the one during download! -->
+                        <select name="Priority" class="form-control">
+                            <option value="-100">$T('default')</option>
+                            <option value="2">$T('pr-force')</option>
+                            <option value="1">$T('pr-high')</option>
+                            <option value="0">$T('pr-normal')</option>
+                            <option value="-1">$T('pr-low')</option>
+                            <option value="-2" >$T('pr-paused')</option>
+                        </select>
                         <span class="glyphicon glyphicon-sort-by-attributes-alt"></span>
                     </div>
                 </div>
@@ -538,7 +552,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label">$T('eoq-scripts')</label>
                     <div class="col-sm-6">
-                        <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '$T('default')', enable: (queue.scriptsList().length > 1)"></select>
+                        <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '$T('default')', optionsValue: 'scriptValue', optionsText: 'scriptText', enable: (queue.scriptsList().length > 1)"></select>
                         <span class="glyphicon glyphicon-flash"></span>
                     </div>
                 </div>

interfaces/Glitter/templates/include_queue.tmpl

@@ -9,12 +9,6 @@
             </a>
         </div>
         <!-- /ko -->
-        <!--#if $loadavg#-->
-        <div class="info-container-box" title="$T('ft-sysload') - $T('menu-config') &#10140; $T('cmenu-special') &#10140; show_sysload">
-            <span class="glyphicon glyphicon-record"></span>
-            <span data-bind="text: systemLoad"></span>
-        </div>
-        <!--#end if#-->
         <!-- ko if: (queueDataLeft() != '')  -->
         <div class="info-container-box">
             <span class="glyphicon glyphicon-save"></span>
@@ -52,6 +46,7 @@
                 <span class="glyphicon glyphicon-tasks" data-tooltip="true" data-placement="left" title="$T('Glitter-multiOperations')"></span>
             </a>
             <ul class="dropdown-menu">
+                <li><a href="#" data-action="sortRemainingAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortRemaining')</a></li>
                 <li><a href="#" data-action="sortAgeAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortAgeAsc')</a></li>
                 <li><a href="#" data-action="sortAgeDesc" data-bind="click: queue.queueSorting">$T('Glitter-sortAgeDesc')</a></li>
                 <li><a href="#" data-action="sortNameAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortNameAsc')</a></li>
@@ -162,7 +157,7 @@
                             </li>
                             <li title="$T('eoq-scripts')" data-tooltip="true" data-placement="left">
                                 <span class="glyphicon glyphicon-flash"></span>
-                                <select name="Post-processing" class="form-control" data-bind="options: parent.scriptsList, value: script, event: { change: changeScript }, enable: (parent.scriptsList().length > 1)"></select>
+                                <select name="Post-processing" class="form-control" data-bind="options: parent.scriptsList, value: script, optionsValue: 'scriptValue', optionsText: 'scriptText', event: { change: changeScript }, enable: (parent.scriptsList().length > 1)"></select>
                             </li>
                         </ul>
                         <!-- /ko -->
@@ -209,7 +204,7 @@
         </div>
         <div class="add-nzb-inputbox" data-tooltip="true" data-placement="top" title="$T('eoq-scripts')">
             <span class="glyphicon glyphicon-flash"></span>
-            <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
+            <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsValue: 'scriptValue', optionsText: 'scriptText', optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
         </div>
         <div class="clearfix"></div>
     </form>

interfaces/Glitter/templates/main.tmpl

@@ -65,17 +65,8 @@
             glitterTranslate.renameAbort = "$T('Glitter-confirmAbortDirectUnpack')\n$T('confirm')";
             glitterTranslate.retryAll = "$T('link-retryAll')?";
             glitterTranslate.fetch = "$T('Glitter-fetch')";
-            glitterTranslate.encrypted = "$T('Glitter-encrypted')";
-            glitterTranslate.duplicate = "$T('Glitter-duplicate')";
-            glitterTranslate.tooLarge = "$T('Glitter-tooLarge')";
-            glitterTranslate.unwanted = "$T('Glitter-unwanted')";
-            glitterTranslate.incomplete = "$T('Glitter-incomplete')";
-            glitterTranslate.filtered = "$T('Glitter-filtered')";
-            glitterTranslate.waitSec = "$T('Glitter-waitSec')";
             glitterTranslate.checking = "$T('post-Checking')";
             glitterTranslate.misingArt = "$T('missingArt')";
-            glitterTranslate.noSelect = "$T('Glitter-noSelect')";
-            glitterTranslate.sendThanks = "$T('Glitter-sendThanks')";
             glitterTranslate.chooseFile = "$T('Glitter-chooseFile')";
             glitterTranslate.orphanedJobsMsg = "$T('explain-orphans')";
             glitterTranslate.useCache = "$T('explain-cache_limitstr').replace("64M", "256M").replace("128M", "512M")";
@@ -103,6 +94,7 @@
             glitterTranslate.status['Repair'] = "$T('stage-repair')";
             glitterTranslate.status['Filejoin'] = "$T('stage-filejoin')";
             glitterTranslate.status['Unpack'] = "$T('stage-unpack')";
+            glitterTranslate.status['Deobfuscate'] = "$T('stage-deobfuscate')";
             glitterTranslate.status['Script'] = "$T('stage-script')";
             glitterTranslate.status['Source'] = "$T('stage-source')";
             glitterTranslate.status['Servers'] = "$T('stage-servers')";
@@ -124,14 +116,16 @@
             glitterTranslate.priority['Stop'] = "$T('pr-stop')";
         </script>
 
-        <!-- Inclusion is faster than external scripts. We load momentJS locale seperatly so failure won't break anything -->
+        <!-- Inclusion is faster than external scripts. We load momentJS locale separately so failure won't break anything -->
         <script type="text/javascript">
             <!--#include raw $webdir + "/static/javascripts/jquery-3.5.1.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/jquery-ui.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/jquery.peity.min.js"#-->
+            <!--#include raw $webdir + "/static/javascripts/jquery.hotkeys.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/moment-2.26.0.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/knockout-3.5.1.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/knockout-extensions.js"#-->
+            <!--#include raw $webdir + "/static/javascripts/search-query-parser.js"#-->
             <!--#include raw $webdir + "/static/bootstrap/js/bootstrap.min.js"#-->
             <!--#include $webdir + "/static/javascripts/glitter.js"#-->
         </script>

interfaces/Glitter/templates/static/javascripts/glitter.filelist.pagination.js

@@ -294,7 +294,7 @@ function paginationModel(parent) {
             self.nrPages(1)
             self.currentStart(0);
 
-            // Are we on next page?
+            // Are we on next page? Bad!
             if(self.currentPage() > 1) {
                 // Force full update
                 parent.parent.refresh(true);
@@ -302,9 +302,6 @@ function paginationModel(parent) {
 
             // Move to current page
             self.currentPage(1);
-
-            // Force full update
-            parent.parent.refresh(true);
         } else {
             // Calculate number of pages needed
             var newNrPages = Math.ceil(parent.totalItems() / parent.paginationLimit())

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

@@ -10,7 +10,7 @@ function HistoryListModel(parent) {
     self.historyItems = ko.observableArray([])
     self.showFailed = ko.observable(false).extend({ persist: 'historyShowFailed' });
     self.isLoading = ko.observable(false).extend({ rateLimit: 100 });
-    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 200, method: "notifyWhenChangesStop" } });
+    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 400, method: "notifyWhenChangesStop" } });
     self.paginationLimit = ko.observable(10).extend({ persist: 'historyPaginationLimit' });
     self.totalItems = ko.observable(0);
     self.pagination = new paginationModel(self);
@@ -139,14 +139,15 @@ function HistoryListModel(parent) {
         form.reset()
     }
 
-    // Searching in history (rate-limited in decleration)
+    // Searching in history (rate-limited in declaration)
     self.searchTerm.subscribe(function() {
-        // Make sure we refresh
-        self.lastUpdate = 0
-        self.parent.refresh();
         // Go back to page 1
         if(self.pagination.currentPage() != 1) {
+            // This forces a refresh
             self.pagination.moveToPage(1);
+        } else {
+            // Make sure we refresh
+            self.parent.refresh(true);
         }
     })
 
@@ -157,7 +158,6 @@ function HistoryListModel(parent) {
             // Set the loader so it doesn't flicker and then switch
             self.isLoading(true)
             self.searchTerm('');
-            self.parent.refresh()
         }
         // Was it click and the field is empty? Then we focus on the field
         if(event.type == 'mousedown' && self.searchTerm() == '') {
@@ -449,103 +449,4 @@ function HistoryModel(parent, data) {
 
         }
     };
-
-    // User voting
-    self.setUserVote = function(item, event) {
-        // Send vote
-        callAPI({
-            mode: 'queue',
-            name: 'rating',
-            type: 'vote',
-            setting: $(event.target).val(),
-            value: self.nzo_id
-        }).then(function(response) {
-            // Update all info
-            self.updateAllHistory = true;
-            self.parent.parent.refresh(true)
-        })
-    }
-
-    // User rating
-    self.setUserRating = function(item, event) {
-        // Audio or video
-        var changeWhat = 'audio';
-        if($(event.target).attr('name') == 'ratings-video') {
-            changeWhat = 'video';
-        }
-
-        // Only on user-event, not the auto-fired ones
-        if(!event.originalEvent) return;
-
-        // Send vote
-        callAPI({
-            mode: 'queue',
-            name: 'rating',
-            type: changeWhat,
-            setting: $(event.target).val(),
-            value: self.nzo_id
-        }).then(function(response) {
-            // Update all info
-            self.updateAllHistory = true;
-            self.parent.parent.refresh(true)
-        })
-    }
-
-    // User comment
-    self.setUserReport = function(form) {
-        // What are we reporting?
-        var userReport = $(form).find('input[name="rating_flag"]:checked').val();
-        var userDetail = '';
-
-        // Anything selected?
-        if(!userReport) {
-            alert(glitterTranslate.noSelect)
-            return;
-        }
-
-        // Extra info?
-        if(userReport == 'comment') userDetail = $(form).find('input[name="ratings-report-comment"]').val();
-        if(userReport == 'other') userDetail = $(form).find('input[name="ratings-report-other"]').val();
-
-        // Exception for servers
-        if(userReport == 'expired') {
-            // Which server?
-            userDetail = $(form).find('select[name="ratings-report-expired-server"]').val();
-
-            // All?
-            if(userDetail == "") {
-                // Loop over all servers
-                $.each(parent.parent.servers, function(index, server) {
-                    // Set timeout because simultanious requests don't work (yet)
-                    setTimeout(function() {
-                        submitUserReport(server.name)
-                    }, index * 1500)
-                })
-
-            } else {
-                // Just the one server
-                submitUserReport(userDetail)
-            }
-        } else {
-            submitUserReport(userDetail)
-        }
-
-        // After all, close it
-        form.reset();
-        $(form).parent().parent().dropdown('toggle');
-        alert(glitterTranslate.sendThanks)
-
-        function submitUserReport(theDetail) {
-            // Send note
-            callAPI({
-                mode: 'queue',
-                name: 'rating',
-                type: 'flag',
-                setting: userReport,
-                detail: theDetail,
-                value: self.nzo_id
-            })
-        }
-        return false
-    }
 }

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

@@ -48,7 +48,7 @@ function ViewModel() {
     self.nrWarnings = ko.observable(0);
     self.allWarnings = ko.observableArray([]);
     self.allMessages = ko.observableArray([]);
-    self.onQueueFinish = ko.observable('');
+    self.finishaction = ko.observable();
     self.speedHistory = [];
 
     // Statusinfo container
@@ -64,6 +64,7 @@ function ViewModel() {
     self.statusInfo.dnslookup = ko.observable();
     self.statusInfo.delayed_decoder = ko.observable();
     self.statusInfo.delayed_assembler = ko.observable();
+    self.statusInfo.loadavg = ko.observable();
     self.statusInfo.pystone = ko.observable();
     self.statusInfo.downloaddir = ko.observable();
     self.statusInfo.downloaddirspeed = ko.observable();
@@ -78,7 +79,7 @@ function ViewModel() {
     // Make the speedlimit tekst
     self.speedLimitText = ko.pureComputed(function() {
         // Set?
-        if(!self.bandwithLimit()) return;
+        if (!self.bandwithLimit()) return;
 
         // The text
         var bandwithLimitText = self.bandwithLimit().replace(/[^a-zA-Z]+/g, '');
@@ -87,10 +88,10 @@ function ViewModel() {
         var speedLimitNumberFull = (parseFloat(self.bandwithLimit()) * (self.speedLimit() / 100));
 
         // Trick to only get decimal-point when needed
-        var speedLimitNumber = Math.round(speedLimitNumberFull*10)/10;
+        var speedLimitNumber = Math.round(speedLimitNumberFull * 10) / 10;
 
         // Fix it for lower than 1MB/s
-        if(bandwithLimitText == 'M' && speedLimitNumber < 1) {
+        if (bandwithLimitText == 'M' && speedLimitNumber < 1) {
             bandwithLimitText = 'K';
             speedLimitNumber = Math.round(speedLimitNumberFull * 1024);
         }
@@ -106,7 +107,7 @@ function ViewModel() {
 
     // Dynamic icon
     self.SABIcon = ko.pureComputed(function() {
-        if(self.downloadsPaused()) {
+        if (self.downloadsPaused()) {
             return './staticcfg/ico/faviconpaused.ico?v=1.1.0';
         } else {
             return './staticcfg/ico/favicon.ico?v=1.1.0';
@@ -115,7 +116,7 @@ function ViewModel() {
 
     // Dynamic queue length check
     self.hasQueue = ko.pureComputed(function() {
-        return(self.queue.queueItems().length > 0 || self.queue.searchTerm() || self.queue.isLoading())
+        return (self.queue.queueItems().length > 0 || self.queue.searchTerm() || self.queue.isLoading())
     })
 
     // Dynamic history length check
@@ -125,7 +126,7 @@ function ViewModel() {
     })
 
     self.hasWarnings = ko.pureComputed(function() {
-        return(self.allWarnings().length > 0)
+        return (self.allWarnings().length > 0)
     })
 
     // Check for any warnings/messages
@@ -136,10 +137,10 @@ function ViewModel() {
     // Update main queue
     self.updateQueue = function(response) {
         // Block in case off dragging
-        if(!self.queue.shouldUpdate()) return;
+        if (!self.queue.shouldUpdate()) return;
 
         // Make sure we are displaying the interface
-        if(self.isRestarting() >= 1) {
+        if (self.isRestarting() >= 1) {
             // Decrease the counter by 1
             // In case of restart (which takes time to fire) we count down
             // In case of re-connect after failure it counts from 1 so emmediate continuation
@@ -150,7 +151,7 @@ function ViewModel() {
         /***
             Possible login failure?
         ***/
-        if(response.hasOwnProperty('error') && response.error == 'Missing authentication') {
+        if (response.hasOwnProperty('error') && response.error == 'Missing authentication') {
             // Restart
             document.location = document.location;
         }
@@ -165,29 +166,26 @@ function ViewModel() {
         self.downloadsPaused(response.queue.paused);
 
         // Finish action. Replace null with empty
-        self.onQueueFinish(response.queue.finishaction ? response.queue.finishaction : '');
+        self.finishaction(response.queue.finishaction ? response.queue.finishaction : '');
 
         // Disk sizes
         self.diskSpaceLeft1(response.queue.diskspace1_norm)
 
         // Same sizes? Then it's all 1 disk!
-        if(response.queue.diskspace1 != response.queue.diskspace2) {
+        if (response.queue.diskspace1 != response.queue.diskspace2) {
             self.diskSpaceLeft2(response.queue.diskspace2_norm)
         } else {
             self.diskSpaceLeft2('')
         }
 
         // Did we exceed the space?
-        self.diskSpaceExceeded1(parseInt(response.queue.mbleft)/1024 > parseFloat(response.queue.diskspace1))
-        self.diskSpaceExceeded2(parseInt(response.queue.mbleft)/1024 > parseFloat(response.queue.diskspace2))
+        self.diskSpaceExceeded1(parseInt(response.queue.mbleft) / 1024 > parseFloat(response.queue.diskspace1))
+        self.diskSpaceExceeded2(parseInt(response.queue.mbleft) / 1024 > parseFloat(response.queue.diskspace2))
 
         // Quota
         self.quotaLimit(response.queue.quota)
         self.quotaLimitLeft(response.queue.left_quota)
 
-        // System load
-        self.systemLoad(response.queue.loadavg)
-
         // Cache
         self.cacheSize(response.queue.cache_size)
         self.cacheArticles(response.queue.cache_art)
@@ -199,7 +197,7 @@ function ViewModel() {
             Spark line
         ***/
         // Break the speed if empty queue
-        if(response.queue.sizeleft == '0 B') {
+        if (response.queue.sizeleft == '0 B') {
             response.queue.kbpersec = 0;
             response.queue.speed = '0';
         }
@@ -210,7 +208,7 @@ function ViewModel() {
         self.speedMetric(speedSplit[1]);
 
         // Update sparkline data
-        if(self.speedHistory.length >= 275) {
+        if (self.speedHistory.length >= 275) {
             // Remove first one
             self.speedHistory.shift();
         }
@@ -218,12 +216,12 @@ function ViewModel() {
         self.speedHistory.push(parseInt(response.queue.kbpersec));
 
         // Is sparkline visible? Not on small mobile devices..
-        if($('.sparkline-container').css('display') != 'none') {
+        if ($('.sparkline-container').css('display') != 'none') {
             // Make sparkline
-            if(self.speedHistory.length == 1) {
+            if (self.speedHistory.length == 1) {
                 // We only use speedhistory from SAB if we use global settings
                 // Otherwise SAB doesn't know the refresh rate
-                if(!self.useGlobalOptions()) {
+                if (!self.useGlobalOptions()) {
                     sabSpeedHistory = [];
                 } else {
                     // Update internally
@@ -254,30 +252,31 @@ function ViewModel() {
         /***
             Speedlimit
         ***/
-        // Nothing = 100%
-        response.queue.speedlimit = (response.queue.speedlimit == '') ? 100.0 : parseFloat(response.queue.speedlimit).toFixed(1);
-        // Trick to only get decimal-point when needed
-        response.queue.speedlimit = Math.round(response.queue.speedlimit*10)/10;
-        self.speedLimitInt(response.queue.speedlimit)
+        // Nothing or 0 means 100%
+        if(response.queue.speedlimit == '' || response.queue.speedlimit == '0') {
+            self.speedLimitInt(100)
+        } else {
+            self.speedLimitInt(parseInt(response.queue.speedlimit));
+        }
 
         // Only update from external source when user isn't doing input
-        if(!$('.speedlimit-dropdown .btn-group .btn-group').is('.open')) {
-            self.speedLimit(response.queue.speedlimit)
+        if (!$('.speedlimit-dropdown .btn-group .btn-group').is('.open')) {
+            self.speedLimit(self.speedLimitInt())
         }
 
         /***
             Download timing and pausing
         ***/
         var timeString = response.queue.timeleft;
-        if(timeString === '') {
+        if (timeString === '') {
             timeString = '0:00';
         } else {
             timeString = rewriteTime(response.queue.timeleft)
         }
 
         // Paused main queue
-        if(self.downloadsPaused()) {
-            if(response.queue.pause_int == '0') {
+        if (self.downloadsPaused()) {
+            if (response.queue.pause_int == '0') {
                 timeString = glitterTranslate.paused;
             } else {
                 var pauseSplit = response.queue.pause_int.split(/:/);
@@ -287,21 +286,21 @@ function ViewModel() {
                 seconds -= minutes * 60;
 
                 // Add leading zeros
-                if(minutes < 10) minutes = '0' + minutes;
-                if(seconds < 10) seconds = '0' + seconds;
+                if (minutes < 10) minutes = '0' + minutes;
+                if (seconds < 10) seconds = '0' + seconds;
 
                 // Final formating
                 timeString = glitterTranslate.paused + ' (' + rewriteTime(hours + ":" + minutes + ":" + seconds) + ')';
             }
 
             // Add info about amount of download (if actually downloading)
-            if(response.queue.noofslots > 0 && parseInt(self.queueDataLeft()) > 0) {
+            if (response.queue.noofslots > 0 && parseInt(self.queueDataLeft()) > 0) {
                 self.title(timeString + ' - ' + self.queueDataLeft() + ' ' + glitterTranslate.left + ' - SABnzbd')
             } else {
                 // Set title with pause information
                 self.title(timeString + ' - SABnzbd')
             }
-        } else if(response.queue.noofslots > 0 && parseInt(self.queueDataLeft()) > 0) {
+        } else if (response.queue.noofslots > 0 && parseInt(self.queueDataLeft()) > 0) {
             // Set title only if we are actually downloading something..
             self.title(self.speedText() + ' - ' + self.queueDataLeft() + ' ' + glitterTranslate.left + ' - SABnzbd')
         } else {
@@ -318,7 +317,7 @@ function ViewModel() {
 
     // Update history items
     self.updateHistory = function(response) {
-        if(!response) return;
+        if (!response) return;
         self.history.updateFromData(response.history);
     }
 
@@ -334,38 +333,46 @@ function ViewModel() {
 
         // Do requests for full information
         // Catch the fail to display message
-        var queueApi = callAPI({
+        var api_call = {
             mode: "queue",
-            search: self.queue.searchTerm(),
             start: self.queue.pagination.currentStart(),
             limit: parseInt(self.queue.paginationLimit())
-        })
-        .done(self.updateQueue)
-        .fail(function(response) {
-            // Catch the failure of authorization error
-            if(response.status == 401) {
-                // Stop refresh and reload
-                clearInterval(self.interval)
-                location.reload();
-            }
-            // Show screen
-            self.isRestarting(1)
-        }).always(self.setNextUpdate);
+        }
+        if (self.queue.searchTerm()) {
+            parseSearchQuery(api_call, self.queue.searchTerm(), ["cat", "category", "priority"])
+        }
+        var queueApi = callAPI(api_call)
+            .done(self.updateQueue)
+            .fail(function(response) {
+                // Catch the failure of authorization error
+                if (response.status == 401) {
+                    // Stop refresh and reload
+                    clearInterval(self.interval)
+                    location.reload();
+                }
+                // Show screen
+                self.isRestarting(1)
+            }).always(self.setNextUpdate);
 
         // Force full history update?
-        if(forceFullHistory) {
+        if (forceFullHistory) {
             self.history.lastUpdate = 0
         }
 
-        // History
-        callAPI({
+        // Build history request and parse search
+        var history_call = {
             mode: "history",
-            search: self.history.searchTerm(),
-            failed_only: self.history.showFailed()*1,
+            failed_only: self.history.showFailed() * 1,
             start: self.history.pagination.currentStart(),
             limit: parseInt(self.history.paginationLimit()),
             last_history_update: self.history.lastUpdate
-        }).done(self.updateHistory);
+        }
+        if (self.history.searchTerm()) {
+            parseSearchQuery(history_call, self.history.searchTerm(), ["cat", "category"])
+        }
+
+        // History
+        callAPI(history_call).done(self.updateHistory);
 
         // We are now done with any loading
         // But we wait a few ms so Knockout has time to update
@@ -378,6 +385,25 @@ function ViewModel() {
         return queueApi;
     };
 
+    function parseSearchQuery(api_request, search, keywords) {
+        var parsed_query = search_query_parse(search, { keywords: keywords })
+        api_request["search"] = parsed_query.text
+        for (const keyword of keywords) {
+            if (Array.isArray(parsed_query[keyword])) {
+                api_request[keyword] = parsed_query[keyword].join(",")
+            } else {
+                api_request[keyword] = parsed_query[keyword]
+            }
+            // Special case for priority, dirty replace of string by numeric value
+            if (keyword == "priority" && api_request["priority"]) {
+                for (const prio_name in self.queue.priorityName) {
+                    api_request["priority"] = api_request["priority"].replace(prio_name, self.queue.priorityName[prio_name])
+
+                }
+            }
+        }
+    }
+
     // Set pause action on click of toggle
     self.pauseToggle = function() {
         callAPI({
@@ -399,23 +425,23 @@ function ViewModel() {
     // Open modal
     self.openCustomPauseTime = function() {
         // Was it loaded already?
-        if(!Date.i18n) {
-             jQuery.getScript('./static/javascripts/date.min.js').then(function() {
+        if (!Date.i18n) {
+            jQuery.getScript('./static/javascripts/date.min.js').then(function() {
                 // After loading we start again
                 self.openCustomPauseTime()
-             })
-             return;
+            })
+            return;
         }
         // Show modal
         $('#modal_custom_pause').modal('show')
 
         // Focus on the input field
-        $('#modal_custom_pause').on('shown.bs.modal', function () {
+        $('#modal_custom_pause').on('shown.bs.modal', function() {
             $('#customPauseInput').focus()
         })
 
         // Reset on modal close
-        $('#modal_custom_pause').on('hide.bs.modal', function () {
+        $('#modal_custom_pause').on('hide.bs.modal', function() {
             self.pauseCustom('');
         })
     }
@@ -423,13 +449,13 @@ function ViewModel() {
     // Update on changes
     self.pauseCustom.subscribe(function(newValue) {
         // Is it plain numbers?
-        if(newValue.match(/^\s*\d+\s*$/)) {
+        if (newValue.match(/^\s*\d+\s*$/)) {
             // Treat it as a number of minutes
             newValue += "minutes";
         }
 
         // At least 3 charaters
-        if(newValue.length < 3) {
+        if (newValue.length < 3) {
             $('#customPauseOutput').text('').data('time', 0)
             $('#modal_custom_pause .btn-default').addClass('disabled')
             return;
@@ -445,19 +471,19 @@ function ViewModel() {
         var pauseParsed = Date.parse(newValue);
 
         // Did we get it?
-        if(pauseParsed) {
+        if (pauseParsed) {
             // Is it just now?
-            if(pauseParsed <= Date.parse('now')) {
+            if (pauseParsed <= Date.parse('now')) {
                 // Try again with the '+' in front, the parser doesn't get 100min
                 pauseParsed = Date.parse('+' + newValue);
             }
 
             // Calculate difference in minutes and save
-            var pauseDuration = Math.round((pauseParsed - Date.parse('now'))/1000/60);
-            $('#customPauseOutput').html('<span class="glyphicon glyphicon-pause"></span> ' +glitterTranslate.pauseFor + ' ' + pauseDuration + ' ' + glitterTranslate.minutes)
+            var pauseDuration = Math.round((pauseParsed - Date.parse('now')) / 1000 / 60);
+            $('#customPauseOutput').html('<span class="glyphicon glyphicon-pause"></span> ' + glitterTranslate.pauseFor + ' ' + pauseDuration + ' ' + glitterTranslate.minutes)
             $('#customPauseOutput').data('time', pauseDuration)
             $('#modal_custom_pause .btn-default').removeClass('disabled')
-        } else if(newValue) {
+        } else if (newValue) {
             // No..
             $('#customPauseOutput').text(glitterTranslate.pausePromptFail)
             $('#modal_custom_pause .btn-default').addClass('disabled')
@@ -470,7 +496,7 @@ function ViewModel() {
         var pauseDuration = $('#customPauseOutput').data('time');
 
         // If in the future
-        if(pauseDuration > 0) {
+        if (pauseDuration > 0) {
             callAPI({
                 mode: 'config',
                 name: 'set_pause',
@@ -487,7 +513,7 @@ function ViewModel() {
     // Update the warnings
     self.nrWarnings.subscribe(function(newValue) {
         // Really any change?
-        if(newValue == self.allWarnings().length) return;
+        if (newValue == self.allWarnings().length) return;
 
         // Get all warnings
         callAPI({
@@ -496,7 +522,7 @@ function ViewModel() {
 
             // Reset it all
             self.allWarnings.removeAll();
-            if(response) {
+            if (response) {
                 // Newest first
                 response.warnings.reverse()
 
@@ -537,10 +563,10 @@ function ViewModel() {
     // Update on speed-limit change
     self.speedLimit.subscribe(function(newValue) {
         // Only on new load
-        if(!self.speedLimitInt()) return;
+        if (!self.speedLimitInt()) return;
 
         // Update
-        if(self.speedLimitInt() != newValue) {
+        if (self.speedLimitInt() != newValue) {
             callAPI({
                 mode: "config",
                 name: "speedlimit",
@@ -563,24 +589,18 @@ function ViewModel() {
 
     // Shutdown options
     self.setOnQueueFinish = function(model, event) {
-        // Ignore updates before the page is done
-        if(!self.hasStatusInfo()) return;
-
         // Something changes
         callAPI({
             mode: 'queue',
             name: 'change_complete_action',
             value: $(event.target).val()
         })
-
-        // Top stop blinking while the API is calling
-        self.onQueueFinish($(event.target).val())
     }
 
     // Use global settings or device-specific?
     self.useGlobalOptions.subscribe(function(newValue) {
         // Reload in case of enabling global options
-        if(newValue) document.location = document.location;
+        if (newValue) document.location = document.location;
     })
 
     // Update refreshrate
@@ -589,7 +609,7 @@ function ViewModel() {
         self.refresh();
 
         // Save in config if global-settings
-        if(self.useGlobalOptions()) {
+        if (self.useGlobalOptions()) {
             callAPI({
                 mode: "set_config",
                 section: "misc",
@@ -607,24 +627,24 @@ function ViewModel() {
         // Get filename
         var fileName = $(event.target).val().replace(/\\/g, '/').replace(/.*\//, '');
         // Set label
-        if(fileName) $('.btn-file em').text(fileName)
+        if (fileName) $('.btn-file em').text(fileName)
     }
 
     // Add NZB form
     self.addNZB = function(form) {
         // Anything?
-        if(!$(form.nzbFile)[0].files[0] && !$(form.nzbURL).val()) {
+        if (!$(form.nzbFile)[0].files[0] && !$(form.nzbURL).val()) {
             $('.btn-file, input[name="nzbURL"]').attr('style', 'border-color: red !important')
             setTimeout(function() { $('.btn-file, input[name="nzbURL"]').css('border-color', '') }, 2000)
             return false;
         }
 
         // Upload file using the method we also use for drag-and-drop
-        if($(form.nzbFile)[0].files[0]) {
+        if ($(form.nzbFile)[0].files[0]) {
             self.addNZBFromFile($(form.nzbFile)[0].files);
             // Hide modal, upload will reset the form
             $("#modal-add-nzb").modal("hide");
-        } else if($(form.nzbURL).val()) {
+        } else if ($(form.nzbURL).val()) {
             // Or add URL
             var theCall = {
                 mode: "addurl",
@@ -637,8 +657,8 @@ function ViewModel() {
             }
 
             // Optional, otherwise they get mis-labeled if left empty
-            if($('#modal-add-nzb select[name="Category"]').val() != '*') theCall.cat = $('#modal-add-nzb select[name="Category"]').val()
-            if($('#modal-add-nzb select[name="Processing"]').val()) theCall.pp = $('#modal-add-nzb select[name="Category"]').val()
+            if ($('#modal-add-nzb select[name="Category"]').val() != '*') theCall.cat = $('#modal-add-nzb select[name="Category"]').val()
+            if ($('#modal-add-nzb select[name="Processing"]').val()) theCall.pp = $('#modal-add-nzb select[name="Category"]').val()
 
             // Add
             callAPI(theCall).then(function(r) {
@@ -651,17 +671,22 @@ function ViewModel() {
         }
     }
 
+    // default to url input when modal is shown
+    $('#modal-add-nzb').on('shown.bs.modal', function() {
+      $('input[name="nzbURL"]').focus();
+    })
+
     // From the upload or filedrop
     self.addNZBFromFile = function(files, fileindex) {
         // First file
-        if(fileindex === undefined) {
+        if (fileindex === undefined) {
             fileindex = 0
         }
         var file = files[fileindex]
         fileindex++
 
         // Check if it's maybe a folder, we can't handle those
-        if(!file.type && file.size % 4096 == 0) return;
+        if (!file.type && file.size % 4096 == 0) return;
 
         // Add notification
         showNotification('.main-notification-box-uploading', 0, fileindex)
@@ -677,8 +702,8 @@ function ViewModel() {
         data.append("apikey", apiKey);
 
         // Optional, otherwise they get mis-labeled if left empty
-        if($('#modal-add-nzb select[name="Category"]').val() != '*') data.append("cat", $('#modal-add-nzb select[name="Category"]').val());
-        if($('#modal-add-nzb select[name="Processing"]').val()) data.append("pp", $('#modal-add-nzb select[name="Processing"]').val());
+        if ($('#modal-add-nzb select[name="Category"]').val() != '*') data.append("cat", $('#modal-add-nzb select[name="Category"]').val());
+        if ($('#modal-add-nzb select[name="Processing"]').val()) data.append("pp", $('#modal-add-nzb select[name="Processing"]').val());
 
         // Add this one
         $.ajax({
@@ -690,7 +715,7 @@ function ViewModel() {
             data: data
         }).then(function(r) {
             // Are we done?
-            if(fileindex < files.length) {
+            if (fileindex < files.length) {
                 // Do the next one
                 self.addNZBFromFile(files, fileindex)
             } else {
@@ -716,28 +741,29 @@ function ViewModel() {
 
         // Make it spin if the user requested it otherwise we don't,
         // because browsers use a lot of CPU for the animation
-        if(statusFullRefresh) {
+        if (statusFullRefresh) {
             self.hasStatusInfo(false)
         }
 
         // Show loading text for performance measures
-        if(statusPerformance) {
+        if (statusPerformance) {
             self.hasPerformanceInfo(false)
         }
 
         // Load the custom status info, allowing for longer timeouts
         callAPI({
             mode: 'status',
-            skip_dashboard: (!statusFullRefresh)*1,
-            calculate_performance: statusPerformance*1,
+            skip_dashboard: (!statusFullRefresh) * 1,
+            calculate_performance: statusPerformance * 1,
         }, 30000).then(function(data) {
             // Update basic
             self.statusInfo.folders(data.status.folders)
+            self.statusInfo.loadavg(data.status.loadavg)
             self.statusInfo.delayed_decoder(data.status.delayed_decoder)
             self.statusInfo.delayed_assembler(data.status.delayed_assembler)
 
             // Update the full set if the data is available
-            if("dnslookup" in data.status) {
+            if ("dnslookup" in data.status) {
                 self.statusInfo.pystone(data.status.pystone)
                 self.statusInfo.downloaddir(data.status.downloaddir)
                 self.statusInfo.downloaddirspeed(data.status.downloaddirspeed)
@@ -752,7 +778,7 @@ function ViewModel() {
             }
 
             // Update the servers
-            if(self.statusInfo.servers().length != data.status.servers.length) {
+            if (self.statusInfo.servers().length != data.status.servers.length) {
                 // Empty them, in case of update
                 self.statusInfo.servers([])
 
@@ -777,21 +803,21 @@ function ViewModel() {
                 $.each(data.status.servers, function(index) {
                     var activeServer = self.statusInfo.servers()[index];
                     activeServer.servername(this.servername),
-                    activeServer.serveroptional(this.serveroptional),
-                    activeServer.serverpriority(this.serverpriority),
-                    activeServer.servertotalconn(this.servertotalconn),
-                    activeServer.serverssl(this.serverssl),
-                    activeServer.serversslinfo(this.serversslinfo),
-                    activeServer.serveractiveconn(this.serveractiveconn),
-                    activeServer.servererror(this.servererror),
-                    activeServer.serveractive(this.serveractive),
-                    activeServer.serverconnections(this.serverconnections),
-                    activeServer.serverbps(this.serverbps)
+                        activeServer.serveroptional(this.serveroptional),
+                        activeServer.serverpriority(this.serverpriority),
+                        activeServer.servertotalconn(this.servertotalconn),
+                        activeServer.serverssl(this.serverssl),
+                        activeServer.serversslinfo(this.serversslinfo),
+                        activeServer.serveractiveconn(this.serveractiveconn),
+                        activeServer.servererror(this.servererror),
+                        activeServer.serveractive(this.serveractive),
+                        activeServer.serverconnections(this.serverconnections),
+                        activeServer.serverbps(this.serverbps)
                 })
             }
 
             // Add tooltips to possible new items
-            if(!isMobile) $('#modal-options [data-tooltip="true"]').tooltip({ trigger: 'hover', container: 'body' })
+            if (!isMobile) $('#modal-options [data-tooltip="true"]').tooltip({ trigger: 'hover', container: 'body' })
 
             // Stop it spin
             self.hasStatusInfo(true)
@@ -804,7 +830,7 @@ function ViewModel() {
         var nzbSize = $(event.target).data('size')
 
         // Maybe it was a click on the icon?
-        if(nzbSize == undefined) {
+        if (nzbSize == undefined) {
             nzbSize = $(event.target.parentElement).data('size')
         }
 
@@ -846,7 +872,7 @@ function ViewModel() {
             checkSize()
 
             // Check if still visible
-            if(!$('#options_connections').is(':visible') && connectionRefresh) {
+            if (!$('#options_connections').is(':visible') && connectionRefresh) {
                 // Stop refreshing
                 clearInterval(connectionRefresh)
                 return
@@ -865,9 +891,9 @@ function ViewModel() {
     // Function that handles the actual sizing of connections tab
     function checkSize() {
         // Any connections?
-        if(self.showActiveConnections() && $('#options_connections').is(':visible') && $('.table-server-connections').height() > 1) {
+        if (self.showActiveConnections() && $('#options_connections').is(':visible') && $('.table-server-connections').height() > 1) {
             var mainWidth = $('.main-content').width()
-            $('#modal-options .modal-dialog').width(mainWidth*0.85 > 650 ? mainWidth*0.85 : '')
+            $('#modal-options .modal-dialog').width(mainWidth * 0.85 > 650 ? mainWidth * 0.85 : '')
         } else {
             // Small again
             $('#modal-options .modal-dialog').width('')
@@ -875,7 +901,7 @@ function ViewModel() {
     }
 
     // Make sure Connections get refreshed also after open->close->open
-    $('#modal-options').on('show.bs.modal', function () {
+    $('#modal-options').on('show.bs.modal', function() {
         // Trigger
         $('.nav-tabs a[href="#options_connections"]').trigger('shown.bs.tab')
     })
@@ -886,7 +912,7 @@ function ViewModel() {
         $('#options-orphans [data-tooltip="true"]').tooltip('hide')
 
         // Show notification on delete
-        if($(htmlElement.currentTarget).data('action') == 'delete_orphan') {
+        if ($(htmlElement.currentTarget).data('action') == 'delete_orphan') {
             showNotification('.main-notification-box-removing', 1000)
         } else {
             // Adding back to queue
@@ -908,8 +934,8 @@ function ViewModel() {
 
     // Orphaned folder deletion of all
     self.removeAllOrphaned = function() {
-        if(!self.confirmDeleteHistory() || confirm(glitterTranslate.clearWarn)) {
-             // Show notification
+        if (!self.confirmDeleteHistory() || confirm(glitterTranslate.clearWarn)) {
+            // Show notification
             showNotification('.main-notification-box-removing-multiple', 0, self.statusInfo.folders().length)
             // Delete them all
             callAPI({
@@ -925,8 +951,8 @@ function ViewModel() {
 
     // Orphaned folder adding of all
     self.addAllOrphaned = function() {
-        if(!self.confirmDeleteHistory() || confirm(glitterTranslate.clearWarn)) {
-             // Show notification
+        if (!self.confirmDeleteHistory() || confirm(glitterTranslate.clearWarn)) {
+            // Show notification
             showNotification('.main-notification-box-sendback')
             // Delete them all
             callAPI({
@@ -956,7 +982,7 @@ function ViewModel() {
     })
 
     // Change hash for page-reload
-    $('.history-queue-swicher .nav-tabs a').on('shown.bs.tab', function (e) {
+    $('.history-queue-swicher .nav-tabs a').on('shown.bs.tab', function(e) {
         window.location.hash = e.target.hash;
     })
 
@@ -965,7 +991,7 @@ function ViewModel() {
     **/
     // Shutdown
     self.shutdownSAB = function() {
-        if(confirm(glitterTranslate.shutdown)) {
+        if (confirm(glitterTranslate.shutdown)) {
             // Show notification and return true to follow the URL
             showNotification('.main-notification-box-shutdown')
             return true
@@ -973,14 +999,14 @@ function ViewModel() {
     }
     // Restart
     self.restartSAB = function() {
-        if(!confirm(glitterTranslate.restart)) return;
+        if (!confirm(glitterTranslate.restart)) return;
         // Call restart function
         callAPI({ mode: "restart" })
 
         // Set counter, we need at least 15 seconds
         self.isRestarting(Math.max(1, Math.floor(15 / self.refreshRate())));
         // Force refresh in case of very long refresh-times
-        if(self.refreshRate() > 30) {
+        if (self.refreshRate() > 30) {
             setTimeout(self.refresh, 30 * 1000)
         }
     }
@@ -989,7 +1015,7 @@ function ViewModel() {
         // Event
         var theAction = $(event.target).data('mode');
         // Show notification if available
-        if(['rss_now', 'watched_now'].indexOf(theAction) > -1) {
+        if (['rss_now', 'watched_now'].indexOf(theAction) > -1) {
             showNotification('.main-notification-box-' + theAction, 2000)
         }
         // Send to the API
@@ -997,7 +1023,7 @@ function ViewModel() {
     }
     // Repair queue
     self.repairQueue = function() {
-        if(!confirm(glitterTranslate.repair)) return;
+        if (!confirm(glitterTranslate.repair)) return;
         // Hide the modal and show the notifucation
         $("#modal-options").modal("hide");
         showNotification('.main-notification-box-queue-repair', 5000)
@@ -1018,18 +1044,18 @@ function ViewModel() {
         Retrieve config information and do startup functions
     ***/
     // Force compact mode as fast as possible
-    if(localStorageGetItem('displayCompact') === 'true') {
+    if (localStorageGetItem('displayCompact') === 'true') {
         // Add extra class
         $('body').addClass('container-compact')
     }
 
-    if(localStorageGetItem('displayFullWidth') === 'true') {
+    if (localStorageGetItem('displayFullWidth') === 'true') {
         // Add extra class
         $('body').addClass('container-full-width')
     }
 
     // Tabbed layout?
-    if(localStorageGetItem('displayTabbed') === 'true') {
+    if (localStorageGetItem('displayTabbed') === 'true') {
         $('body').addClass('container-tabbed')
 
         var tab_from_hash = location.hash.replace(/^#/, '');
@@ -1069,9 +1095,9 @@ function ViewModel() {
         mode: 'get_config'
     }).then(function(response) {
         // Do we use global, or local settings?
-        if(self.useGlobalOptions()) {
+        if (self.useGlobalOptions()) {
             // Set refreshrate (defaults to 1/s)
-            if(!response.config.misc.refresh_rate) response.config.misc.refresh_rate = 1;
+            if (!response.config.misc.refresh_rate) response.config.misc.refresh_rate = 1;
             self.refreshRate(response.config.misc.refresh_rate.toString());
 
             // Set history and queue limit
@@ -1079,10 +1105,10 @@ function ViewModel() {
             self.queue.paginationLimit(response.config.misc.queue_limit.toString())
 
             // Import the rest of the settings
-            if(response.config.misc.interface_settings) {
+            if (response.config.misc.interface_settings) {
                 var interfaceSettings = JSON.parse(response.config.misc.interface_settings);
-                for (const setting of self.globalInterfaceSettings){
-                    if(setting in interfaceSettings) {
+                for (const setting of self.globalInterfaceSettings) {
+                    if (setting in interfaceSettings) {
                         self[setting](interfaceSettings[setting]);
                     }
                 }
@@ -1094,14 +1120,37 @@ function ViewModel() {
         }
 
         // Set bandwidth limit
-        if(!response.config.misc.bandwidth_max) response.config.misc.bandwidth_max = false;
+        if (!response.config.misc.bandwidth_max) response.config.misc.bandwidth_max = false;
         self.bandwithLimit(response.config.misc.bandwidth_max);
 
-        // Save servers (for reporting functionality)
-        self.servers = response.config.servers;
+        // Reformat and set categories
+        self.queue.categoriesList($.map(response.config.categories, function(cat) {
+            // Default?
+            if(cat.name == '*') return { catValue: '*', catText: glitterTranslate.defaultText };
+            return { catValue: cat.name, catText: cat.name };
+        }))
+
+        // Get the scripts, if there are any
+        if(response.config.misc.script_dir) {
+            callAPI({
+                mode: 'get_scripts'
+            }).then(function(script_response) {
+                // Reformat script-list
+                self.queue.scriptsList($.map(script_response.scripts, function(script) {
+                    // None?
+                    if(script == 'None') return { scriptValue: 'None', scriptText: glitterTranslate.noneText };
+                    return { scriptValue: script, scriptText: script };
+                }))
+                self.queue.scriptsListLoaded(true)
+            })
+        } else {
+            // We can already continue
+            self.queue.scriptsListLoaded(true)
+        }
+
 
         // Already set if we are using a proxy
-        if(response.config.misc.socks5_proxy_url) self.statusInfo.active_socks5_proxy(true)
+        if (response.config.misc.socks5_proxy_url) self.statusInfo.active_socks5_proxy(true)
 
         // Set logging and only then subscribe to changes
         self.loglevel(response.config.logging.log_level);
@@ -1115,28 +1164,28 @@ function ViewModel() {
         })
 
         // Update message
-        if(newRelease) {
+        if (newRelease) {
             self.allMessages.push({
                 index: 'UpdateMsg',
                 type: glitterTranslate.status['INFO'],
-                text: ('<a class="queue-update-sab" href="'+newReleaseUrl+'" target="_blank">'+glitterTranslate.updateAvailable+' '+newRelease+' <span class="glyphicon glyphicon-save"></span></a>'),
+                text: ('<a class="queue-update-sab" href="' + newReleaseUrl + '" target="_blank">' + glitterTranslate.updateAvailable + ' ' + newRelease + ' <span class="glyphicon glyphicon-save"></span></a>'),
                 css: 'info'
             });
         }
 
         // Message about cache - Not for 5 days if user ignored it
-        if(!response.config.misc.cache_limit && localStorageGetItem('CacheMsg')*1+(1000*3600*24*5) < Date.now()) {
+        if (!response.config.misc.cache_limit && localStorageGetItem('CacheMsg') * 1 + (1000 * 3600 * 24 * 5) < Date.now()) {
             self.allMessages.push({
                 index: 'CacheMsg',
                 type: glitterTranslate.status['INFO'],
-                text: ('<a href="./config/general/#cache_limit">'+glitterTranslate.useCache.replace(/<br \/>/g, " ")+' <span class="glyphicon glyphicon-cog"></span></a>'),
+                text: ('<a href="./config/general/#cache_limit">' + glitterTranslate.useCache.replace(/<br \/>/g, " ") + ' <span class="glyphicon glyphicon-cog"></span></a>'),
                 css: 'info',
-                clear: function() { self.clearMessages('CacheMsg')}
+                clear: function() { self.clearMessages('CacheMsg') }
             });
         }
 
         // Message about tips and tricks, only once
-        if(response.config.misc.notified_new_skin < 2) {
+        if (response.config.misc.notified_new_skin < 2) {
             self.allMessages.push({
                 index: 'TipsMsgV110',
                 type: glitterTranslate.status['INFO'],
@@ -1159,71 +1208,109 @@ function ViewModel() {
     })
 
     // Orphaned folder check - Not for 5 days if user ignored it
-    var orphanMsg = localStorageGetItem('OrphanedMsg')*1+(1000*3600*24*5) < Date.now();
+    var orphanMsg = localStorageGetItem('OrphanedMsg') * 1 + (1000 * 3600 * 24 * 5) < Date.now();
     // Delay the check
-    if(orphanMsg) {
+    if (orphanMsg) {
         setTimeout(self.loadStatusInfo, 200);
     }
 
     // On any status load we check Orphaned folders
     self.hasStatusInfo.subscribe(function(finishedLoading) {
         // Loaded or just starting?
-        if(!finishedLoading) return;
+        if (!finishedLoading) return;
 
         // Orphaned folders? If user clicked away we check again in 5 days
-        if(self.statusInfo.folders().length >= 3 && orphanMsg) {
+        if (self.statusInfo.folders().length >= 3 && orphanMsg) {
             // Check if not already there
-            if(!ko.utils.arrayFirst(self.allMessages(), function(item) { return item.index == 'OrphanedMsg' })) {
+            if (!ko.utils.arrayFirst(self.allMessages(), function(item) { return item.index == 'OrphanedMsg' })) {
                 self.allMessages.push({
                     index: 'OrphanedMsg',
                     type: glitterTranslate.status['INFO'],
                     text: glitterTranslate.orphanedJobsMsg + ' <a href="#" onclick="showOrphans()"><span class="glyphicon glyphicon-wrench"></span></a>',
                     css: 'info',
-                    clear: function() { self.clearMessages('OrphanedMsg')}
+                    clear: function() { self.clearMessages('OrphanedMsg') }
                 });
             }
         } else {
             // Remove any message, if it was there
             self.allMessages.remove(function(item) {
-               return item.index == 'OrphanedMsg';
+                return item.index == 'OrphanedMsg';
             })
         }
     })
 
     // Message about localStorage not being enabled every 20 days
-    if(!hasLocalStorage && localStorageGetItem('LocalStorageMsg')*1+(1000*3600*24*20) < Date.now()) {
+    if (!hasLocalStorage && localStorageGetItem('LocalStorageMsg') * 1 + (1000 * 3600 * 24 * 20) < Date.now()) {
         self.allMessages.push({
             index: 'LocalStorageMsg',
             type: glitterTranslate.status['WARNING'].replace(':', ''),
             text: glitterTranslate.noLocalStorage,
             css: 'warning',
-            clear: function() { self.clearMessages('LocalStorageMsg')}
+            clear: function() { self.clearMessages('LocalStorageMsg') }
         });
     }
 
-    document.onkeydown = function(e) {
-        if(self.keyboardShortcuts()) {
-            // Ignore if the user used a combination
-            if(e.altKey || e.metaKey || e.ctrlKey) return;
-
-            // Do not act if the user is typing something
-            if($("input:focus, textarea:focus").length === 0) {
-                if (e.code === 'KeyP') {
-                    self.pauseToggle();
-                }
-                if (e.code === 'KeyA') {
-                    $('#modal-add-nzb').modal('show');
-                }
-                if (e.code === 'KeyC') {
-                    window.location.href = './config/';
-                }
-                if (e.code === 'KeyS') {
-                    self.loadStatusInfo(true, true)
-                    $('#modal-options').modal('show');
-                }
+    if (self.keyboardShortcuts()) {
+        $(document).bind('keydown', 'p', function(e) {
+            self.pauseToggle();
+        });
+        $(document).bind('keydown', 'a', function(e) {
+            // avoid modal clashes
+            if (!$('.modal-dialog').is(':visible')) {
+                $('#modal-add-nzb').modal('show');
             }
-
-        }
+        });
+        $(document).bind('keydown', 'c', function(e) {
+            window.location.href = './config/';
+        });
+        $(document).bind('keydown', 's', function(e) {
+            // Update the data
+            self.loadStatusInfo(true, true)
+            // avoid modal clashes
+            if (!$('.modal-dialog').is(':visible')) {
+                $('#modal-options').modal('show');
+            }
+        });
+        $(document).bind('keydown', 'shift+left', function(e) {
+            if($("body").hasClass("container-tabbed")) {
+                $('#history-tab.active > ul.pagination li.active').prev().click();
+                $('#queue-tab.active > ul.pagination li.active').prev().click();
+            } else {
+                $('#history-tab > ul.pagination li.active').prev().click();
+                $('#queue-tab > ul.pagination li.active').prev().click();
+            }
+            e.preventDefault();
+        });
+        $(document).bind('keydown', 'shift+right', function(e) {
+            if($("body").hasClass("container-tabbed")) {
+                $('#history-tab.active > ul.pagination li.active').next().click();
+                $('#queue-tab.active > ul.pagination li.active').next().click();
+            } else {
+                $('#history-tab > ul.pagination li.active').next().click();
+                $('#queue-tab > ul.pagination li.active').next().click();
+            }
+            e.preventDefault();
+        });
+        $(document).bind('keydown', 'shift+up', function(e) {
+            if($("body").hasClass("container-tabbed")) {
+                $('#history-tab.active > ul.pagination li').first().click();
+                $('#queue-tab.active > ul.pagination li').first().click();
+            } else {
+                $('#history-tab > ul.pagination li').first().click();
+                $('#queue-tab > ul.pagination li').first().click();
+            }
+            e.preventDefault();
+        });
+        $(document).bind('keydown', 'shift+down', function(e) {
+            if($("body").hasClass("container-tabbed")) {
+                $('#history-tab.active > ul.pagination li').last().click();
+                $('#queue-tab.active > ul.pagination li').last().click();
+            } else {
+                $('#history-tab > ul.pagination li').last().click();
+                $('#queue-tab > ul.pagination li').last().click();
+            }
+            e.preventDefault();
+        });
     }
 
     /***
@@ -1241,7 +1328,7 @@ function ViewModel() {
         $('[data-timestamp]').each(function() {
             $(this).text(displayDateTime($(this).data('timestamp'), self.dateFormat(), 'X'))
         })
-    }, 60*1000)
+    }, 60 * 1000)
 
     /***
         End of main functions, start of the fun!
@@ -1252,6 +1339,12 @@ function ViewModel() {
     // And refresh now!
     self.refresh()
 
-    // Activate tooltips
-    if(!isMobile) $('[data-tooltip="true"]').tooltip({ trigger: 'hover', container: 'body' })
+    // Special options for (non) mobile
+    if (isMobile) {
+        // Disable accept parameter on file inputs, as it doesn't work on mobile Safari
+        $("input[accept!=''][accept]").attr("accept","")
+    } else {
+        // Activate tooltips
+        $('[data-tooltip="true"]').tooltip({ trigger: 'hover', container: 'body' })
+    }
 }

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

@@ -6,8 +6,6 @@ function QueueListModel(parent) {
     var self = this;
     self.parent = parent;
     self.dragging = false;
-    self.rawCatList = [];
-    self.rawScriptList = [];
 
     // Because SABNZB returns the name
     // But when you want to set Priority you need the number..
@@ -39,7 +37,8 @@ function QueueListModel(parent) {
     self.multiEditItems = ko.observableArray([]);
     self.categoriesList = ko.observableArray([]);
     self.scriptsList = ko.observableArray([]);
-    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 200, method: "notifyWhenChangesStop" } });
+    self.scriptsListLoaded = ko.observable(false);
+    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 400, method: "notifyWhenChangesStop" } });
     self.paginationLimit = ko.observable(20).extend({ persist: 'queuePaginationLimit' });
     self.pagination = new paginationModel(self);
 
@@ -66,31 +65,6 @@ function QueueListModel(parent) {
             return i.id;
         });
 
-        // Did the category-list change?
-        // Otherwise KO will send updates to all <select> for every refresh()
-        if(self.rawCatList != data.categories.toString()) {
-            // Reformat categories
-            self.categoriesList($.map(data.categories, function(cat) {
-                // Default?
-                if(cat == '*') return { catValue: '*', catText: glitterTranslate.defaultText };
-                return { catValue: cat, catText: cat };
-            }))
-            // Update
-            self.rawCatList = data.categories.toString();
-        }
-
-        // Did the script-list change?
-        if(self.rawScriptList != data.scripts.toString()) {
-            // Reformat script-list
-            self.scriptsList($.map(data.scripts, function(script) {
-                // Default?
-                if(script == 'None') return glitterTranslate.noneText;
-                return script;
-            }))
-            // Update
-            self.rawScriptList = data.scripts.toString();
-        }
-
         // Set limit
         self.totalItems(data.noofslots);
 
@@ -194,11 +168,13 @@ function QueueListModel(parent) {
 
     // Searching in queue (rate-limited in decleration)
     self.searchTerm.subscribe(function() {
-        // Refresh now
-        self.parent.refresh();
         // Go back to page 1
         if(self.pagination.currentPage() != 1) {
+            // This forces a refresh
             self.pagination.moveToPage(1);
+        } else {
+            // Refresh now
+            self.parent.refresh();
         }
     })
 
@@ -208,7 +184,6 @@ function QueueListModel(parent) {
         if(event.type == 'mousedown' || (event.keyCode && event.keyCode == 27)) {
             self.isLoading(true)
             self.searchTerm('');
-            self.parent.refresh()
         }
         // Was it click and the field is empty? Then we focus on the field
         if(event.type == 'mousedown' && self.searchTerm() == '') {
@@ -226,6 +201,10 @@ function QueueListModel(parent) {
         // What action?
         var sort, dir;
         switch($(event.currentTarget).data('action')) {
+            case 'sortRemainingAsc':
+                sort = 'remaining';
+                dir = 'asc';
+                break;
             case 'sortAgeAsc':
                 sort = 'avg_age';
                 dir = 'desc';
@@ -364,54 +343,61 @@ function QueueListModel(parent) {
         var newStatus = $('.multioperations-selector input[name="multiedit-status"]:checked').val()
 
         // List all the ID's
-        var  strIDs = '';
+        var strIDs = '';
         $.each(self.multiEditItems(), function(index) {
             strIDs = strIDs + this.id + ',';
         })
 
+        // All non-category updates need to only happen after a category update
+        function nonCatUpdates() {
+            if(newScript != '') {
+                callAPI({
+                    mode: 'change_script',
+                    value: strIDs,
+                    value2: newScript
+                })
+            }
+            if(newPrior != '') {
+                callAPI({
+                    mode: 'queue',
+                    name: 'priority',
+                    value: strIDs,
+                    value2: newPrior
+                })
+            }
+            if(newProc != '') {
+                callAPI({
+                    mode: 'change_opts',
+                    value: strIDs,
+                    value2: newProc
+                })
+            }
+            if(newStatus) {
+                callAPI({
+                    mode: 'queue',
+                    name: newStatus,
+                    value: strIDs
+                })
+            }
+
+            // Wat a little and do the refresh
+            // Only if anything changed!
+            if(newStatus || newProc != '' || newPrior != '' || newScript != '' || newCat != '') {
+                setTimeout(parent.refresh, 100)
+            }
+        }
+
         // What is changed?
         if(newCat != '') {
             callAPI({
                 mode: 'change_cat',
                 value: strIDs,
                 value2: newCat
-            })
-        }
-        if(newScript != '') {
-            callAPI({
-                mode: 'change_script',
-                value: strIDs,
-                value2: newScript
-            })
-        }
-        if(newPrior != '') {
-            callAPI({
-                mode: 'queue',
-                name: 'priority',
-                value: strIDs,
-                value2: newPrior
-            })
-        }
-        if(newProc != '') {
-            callAPI({
-                mode: 'change_opts',
-                value: strIDs,
-                value2: newProc
-            })
-        }
-        if(newStatus) {
-            callAPI({
-                mode: 'queue',
-                name: newStatus,
-                value: strIDs
-            })
+            }).then(nonCatUpdates)
+        } else {
+            nonCatUpdates()
         }
 
-        // Wat a little and do the refresh
-        // Only if anything changed!
-        if(newStatus || newProc != '' || newPrior != '' || newScript != '' || newCat != '') {
-            setTimeout(parent.refresh, 100)
-        }
     }
 
     // Selete all selected
@@ -693,8 +679,6 @@ function QueueModel(parent, data) {
         })
     }
     self.changeScript = function(item) {
-        // Not on empty handlers
-        if(!item.script() || parent.scriptsList().length <= 1) return;
         callAPI({
             mode: 'change_script',
             value: item.id,

interfaces/Glitter/templates/static/javascripts/jquery.hotkeys.min.js

@@ -0,0 +1,12 @@
+/*
+ * jQuery Hotkeys Plugin
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Based upon the plugin by Tzury Bar Yochay:
+ * https://github.com/tzuryby/jquery.hotkeys
+ *
+ * Original idea by:
+ * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
+ */
+!function(c){function e(e){var o,f;"string"==typeof e.data&&(e.data={keys:e.data}),e.data&&e.data.keys&&"string"==typeof e.data.keys&&(o=e.handler,f=e.data.keys.toLowerCase().split(" "),e.handler=function(a){if(this===a.target||!(/textarea|select/i.test(a.target.nodeName)||c.hotkeys.options.filterTextInputs&&-1<c.inArray(a.target.type,c.hotkeys.textAcceptingInputTypes))){var s="keypress"!==a.type&&c.hotkeys.specialKeys[a.which],e=String.fromCharCode(a.which).toLowerCase(),r="",t={};c.each(["alt","ctrl","shift"],function(e,t){a[t+"Key"]&&s!==t&&(r+=t+"+")}),a.metaKey&&!a.ctrlKey&&"meta"!==s&&(r+="meta+"),a.metaKey&&"meta"!==s&&-1<r.indexOf("alt+ctrl+shift+")&&(r=r.replace("alt+ctrl+shift+","hyper+")),s?t[r+s]=!0:(t[r+e]=!0,t[r+c.hotkeys.shiftNums[e]]=!0,"shift+"===r&&(t[c.hotkeys.shiftNums[e]]=!0));for(var i=0,n=f.length;i<n;i++)if(t[f[i]])return o.apply(this,arguments)}})}c.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",10:"return",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",59:";",61:"=",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"},shiftNums:{"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(",0:")","-":"_","=":"+",";":": ","'":'"',",":"<",".":">","/":"?","\\":"|"},textAcceptingInputTypes:["text","password","number","email","url","range","date","month","week","time","datetime","datetime-local","search","color","tel"],options:{filterTextInputs:!0}},c.each(["keydown","keyup","keypress"],function(){c.event.special[this]={add:e}})}(jQuery||this.jQuery||window.jQuery);

interfaces/Glitter/templates/static/javascripts/search-query-parser.js

@@ -0,0 +1,317 @@
+/*!
+ * search-search-query-parser.js
+ * Copyright(c) 2014-2019
+ * MIT Licensed
+ *
+ * Modified for SABnzbd use!
+ * Adapted to use without NPM.
+ */
+
+function search_query_parse(string, options) {
+    // Set a default options object when none is provided
+    if (!options) {
+        options = {offsets: true};
+    } else {
+        // If options offsets was't passed, set it to true
+        options.offsets = (typeof options.offsets === 'undefined' ? true : options.offsets)
+    }
+
+    if (!string) {
+        string = '';
+    }
+
+    // When no keywords or ranges set, treat as a simple string
+    else if (!options.keywords && !options.ranges && !options.tokenize) {
+        return string;
+    }
+    // Otherwise parse the advanced query syntax
+    else {
+        // Our object to store the query object
+        var query = {text: []};
+        // When offsets is true, create their array
+        if (options.offsets) {
+            query.offsets = [];
+        }
+        var exclusion = {};
+        var terms = [];
+        // Get a list of search terms respecting single and double quotes
+        var regex = /(\S+:'(?:[^'\\]|\\.)*')|(\S+:"(?:[^"\\]|\\.)*")|\S+|\S+:\S+/g;
+        /*
+        Removed exclusion matching for SABnzbd, original regex:
+        var regex = /(\S+:'(?:[^'\\]|\\.)*')|(\S+:"(?:[^"\\]|\\.)*")|(-?"(?:[^"\\]|\\.)*")|(-?'(?:[^'\\]|\\.)*')|\S+|\S+:\S+/g;
+        See: https://github.com/sabnzbd/sabnzbd/issues/2342
+         */
+        var match;
+        while ((match = regex.exec(string)) !== null) {
+            var term = match[0];
+            var sepIndex = term.indexOf(':');
+            if (sepIndex !== -1) {
+                var split = term.split(':'),
+                    key = term.slice(0, sepIndex),
+                    val = term.slice(sepIndex + 1);
+                // Strip surrounding quotes
+                val = val.replace(/^\"|\"$|^\'|\'$/g, '');
+                // Strip backslashes respecting escapes
+                val = (val + '').replace(/\\(.?)/g, function (s, n1) {
+                    switch (n1) {
+                        case '\\':
+                            return '\\';
+                        case '0':
+                            return '\u0000';
+                        case '':
+                            return '';
+                        default:
+                            return n1;
+                    }
+                });
+                terms.push({
+                    keyword: key,
+                    value: val,
+                    offsetStart: match.index,
+                    offsetEnd: match.index + term.length
+                });
+            } else {
+                var isExcludedTerm = false;
+                /*
+                    Removed for SABnzbd
+                    See: https://github.com/sabnzbd/sabnzbd/issues/2342
+
+                if (term[0] === '-') {
+                    isExcludedTerm = true;
+                    term = term.slice(1);
+                }
+                */
+
+                // Strip surrounding quotes
+                term = term.replace(/^\"|\"$|^\'|\'$/g, '');
+                // Strip backslashes respecting escapes
+                term = (term + '').replace(/\\(.?)/g, function (s, n1) {
+                    switch (n1) {
+                        case '\\':
+                            return '\\';
+                        case '0':
+                            return '\u0000';
+                        case '':
+                            return '';
+                        default:
+                            return n1;
+                    }
+                });
+
+                if (isExcludedTerm) {
+                    if (exclusion['text']) {
+                        if (exclusion['text'] instanceof Array) {
+                            exclusion['text'].push(term);
+                        } else {
+                            exclusion['text'] = [exclusion['text']];
+                            exclusion['text'].push(term);
+                        }
+                    } else {
+                        // First time seeing an excluded text term
+                        exclusion['text'] = term;
+                    }
+                } else {
+                    terms.push({
+                        text: term,
+                        offsetStart: match.index,
+                        offsetEnd: match.index + term.length
+                    });
+                }
+            }
+        }
+        // Reverse to ensure proper order when pop()'ing.
+        terms.reverse();
+        // For each search term
+        var term;
+        while (term = terms.pop()) {
+            // When just a simple term
+            if (term.text) {
+                // We add it as pure text
+                query.text.push(term.text);
+                // When offsets is true, push a new offset
+                if (options.offsets) {
+                    query.offsets.push(term);
+                }
+            }
+            // We got an advanced search syntax
+            else {
+                var key = term.keyword;
+                // Check if the key is a registered keyword
+                options.keywords = options.keywords || [];
+                var isKeyword = false;
+                var isExclusion = false;
+                if (!/^-/.test(key)) {
+                    isKeyword = !(-1 === options.keywords.indexOf(key));
+                } else if (key[0] === '-') {
+                    var _key = key.slice(1);
+                    isKeyword = !(-1 === options.keywords.indexOf(_key))
+                    if (isKeyword) {
+                        key = _key;
+                        isExclusion = true;
+                    }
+                }
+
+                // Check if the key is a registered range
+                options.ranges = options.ranges || [];
+                var isRange = !(-1 === options.ranges.indexOf(key));
+                // When the key matches a keyword
+                if (isKeyword) {
+                    // When offsets is true, push a new offset
+                    if (options.offsets) {
+                        query.offsets.push({
+                            keyword: key,
+                            value: term.value,
+                            offsetStart: isExclusion ? term.offsetStart + 1 : term.offsetStart,
+                            offsetEnd: term.offsetEnd
+                        });
+                    }
+
+                    var value = term.value;
+                    // When value is a thing
+                    if (value.length) {
+                        // Get an array of values when several are there
+                        var values = value.split(',');
+                        if (isExclusion) {
+                            if (exclusion[key]) {
+                                // ...many times...
+                                if (exclusion[key] instanceof Array) {
+                                    // ...and got several values this time...
+                                    if (values.length > 1) {
+                                        // ... concatenate both arrays.
+                                        exclusion[key] = exclusion[key].concat(values);
+                                    } else {
+                                        // ... append the current single value.
+                                        exclusion[key].push(value);
+                                    }
+                                }
+                                // We saw that keyword only once before
+                                else {
+                                    // Put both the current value and the new
+                                    // value in an array
+                                    exclusion[key] = [exclusion[key]];
+                                    exclusion[key].push(value);
+                                }
+                            }
+                            // First time we see that keyword
+                            else {
+                                // ...and got several values this time...
+                                if (values.length > 1) {
+                                    // ...add all values seen.
+                                    exclusion[key] = values;
+                                }
+                                // Got only a single value this time
+                                else {
+                                    // Record its value as a string
+                                    if (options.alwaysArray) {
+                                        // ...but we always return an array if option alwaysArray is true
+                                        exclusion[key] = [value];
+                                    } else {
+                                        // Record its value as a string
+                                        exclusion[key] = value;
+                                    }
+                                }
+                            }
+                        } else {
+                            // If we already have seen that keyword...
+                            if (query[key]) {
+                                // ...many times...
+                                if (query[key] instanceof Array) {
+                                    // ...and got several values this time...
+                                    if (values.length > 1) {
+                                        // ... concatenate both arrays.
+                                        query[key] = query[key].concat(values);
+                                    } else {
+                                        // ... append the current single value.
+                                        query[key].push(value);
+                                    }
+                                }
+                                // We saw that keyword only once before
+                                else {
+                                    // Put both the current value and the new
+                                    // value in an array
+                                    query[key] = [query[key]];
+                                    query[key].push(value);
+                                }
+                            }
+                            // First time we see that keyword
+                            else {
+                                // ...and got several values this time...
+                                if (values.length > 1) {
+                                    // ...add all values seen.
+                                    query[key] = values;
+                                }
+                                // Got only a single value this time
+                                else {
+                                    if (options.alwaysArray) {
+                                        // ...but we always return an array if option alwaysArray is true
+                                        query[key] = [value];
+                                    } else {
+                                        // Record its value as a string
+                                        query[key] = value;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                // The key allows a range
+                else if (isRange) {
+                    // When offsets is true, push a new offset
+                    if (options.offsets) {
+                        query.offsets.push(term);
+                    }
+
+                    var value = term.value;
+                    // Range are separated with a dash
+                    var rangeValues = value.split('-');
+                    // When both end of the range are specified
+                    // keyword:XXXX-YYYY
+                    query[key] = {};
+                    if (2 === rangeValues.length) {
+                        query[key].from = rangeValues[0];
+                        query[key].to = rangeValues[1];
+                    }
+                        // When pairs of ranges are specified
+                    // keyword:XXXX-YYYY,AAAA-BBBB
+                    else if (!rangeValues.length % 2) {
+                    }
+                        // When only getting a single value,
+                    // or an odd number of values
+                    else {
+                        query[key].from = value;
+                    }
+                } else {
+                    // We add it as pure text
+                    var text = term.keyword + ':' + term.value;
+                    query.text.push(text);
+
+                    // When offsets is true, push a new offset
+                    if (options.offsets) {
+                        query.offsets.push({
+                            text: text,
+                            offsetStart: term.offsetStart,
+                            offsetEnd: term.offsetEnd
+                        });
+                    }
+                }
+            }
+        }
+
+        // Concatenate all text terms if any
+        if (query.text.length) {
+            if (!options.tokenize) {
+                query.text = query.text.join(' ').trim();
+            }
+        }
+        // Just remove the attribute text when it's empty
+        else {
+            delete query.text;
+        }
+
+        // Return forged query object
+        query.exclude = exclusion;
+        return query;
+    }
+
+}
+

interfaces/Glitter/templates/static/stylesheets/glitter.css

@@ -1009,10 +1009,6 @@ tr.queue-item>td:first-child>a {
     font-weight: bold;
 }
 
-.history-table td.name.name-has-ratings .row-wrap-text {
-    max-width: calc(100% - 80px) ;
-}
-
 .history-failed-download:hover .retry-button .glyphicon:before,
 .retry-button:hover .glyphicon:before {
     content: " \e030 ";
@@ -1077,83 +1073,6 @@ tr.queue-item>td:first-child>a {
 .history-status-hidden {
     display: none;
 }
-
-.history-ratings {
-    display: inline-block;
-}
-
-.history-ratings.open a {
-    opacity: 1;
-}
-
-.history-ratings .name-icons {
-    float: none !important;
-}
-
-.history-ratings-menu {
-    width: 300px;
-    padding: 10px;
-    margin-top: 4px !important;
-}
-
-.history-ratings-menu .divider {
-    background-color: black;
-}
-
-.history-ratings-menu label {
-    margin-right: 12px;
-    font-weight: normal;
-}
-
-.history-ratings-basic input[type="radio"] {
-    display: none;
-}
-
-.history-ratings-basic input[type="radio"]+span {
-    opacity: 0.6;
-    cursor: pointer;
-    font-size: 1.3em;
-    font-weight: bold;
-    top: 3px;
-    margin-left: 3px;
-}
-
-.history-ratings-basic input[type="radio"]+span+span {
-    opacity: 0.3;
-}
-
-.history-ratings-basic input[type="radio"]:checked+span,
-.history-ratings-basic input[type="radio"]:checked+span+span {
-    opacity: 1;
-}
-
-.history-ratings-basic .history-ratings-spacer {
-    margin-left: 10px;
-}
-
-.history-ratings-basic select {
-    margin-left: 3px;
-    background-color: transparent;
-    border: 1px solid #ccc;
-}
-
-.history-ratings-basic select:disabled {
-    background-color: #F5F5F5;
-}
-
-.history-ratings-report label {
-    width: 100%;
-}
-
-.history-ratings-report .ratings-report-hidden {
-    display: none;
-}
-
-.history-ratings-report input[type="radio"]:checked+input,
-.history-ratings-report input[type="radio"]:checked+select {
-    display: block;
-}
-
 #history-options {
     margin-top: 0;
     margin-left: 10px;
@@ -1960,10 +1879,6 @@ input[name="nzbURL"] {
     #feedback-slider {
         display: none;
     }
-
-    .glyphicon-facetime-video {
-        top: 2px;
-    }
 }
 
 @media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:portrait) {
@@ -2042,7 +1957,6 @@ a:focus {
     text-decoration: none;
 }
 
-.glyphicon-volume-up,
 .glyphicon-trash {
     top: 2px;
 }
@@ -2111,15 +2025,6 @@ a:focus {
     content: '';
 }
 
-.history-ratings-menu:after {
-    right: inherit !important;
-    left: 23px;
-}
-.history-ratings-menu:before {
-    right: inherit !important;
-    left: 22px;
-}
-
 .open > .dropdown-menu {
     opacity: 1;
     visibility: visible;

interfaces/Glitter/templates/static/stylesheets/glitter.mobile.css

@@ -180,14 +180,6 @@ tr.queue-item>td:first-child>a {
     min-width: 0px;
 }
 
-.history-table .history-ratings {
-    display: none;
-}
-
-.name-has-ratings .row-wrap-text {
-    max-width: calc(100% - 1px) !important;
-}
-
 .history-table .delete .dropdown-menu {
     width: 100%;
     left: 0;

interfaces/wizard/one.html

@@ -15,6 +15,8 @@
 
                 <br /><br />
 
+                <input type="hidden" name="server" value="$server" />
+
                 <div class="row">
                     <div class="col-md-7 form-horizontal">
                         <div class="form-group">

licenses/License-kronos.txt

@@ -1,5 +1,5 @@
 Kronos.py is written by Irmen de Jong.
-Retreived from:
+Retrieved from:
 http://www.razorvine.net/download/kronos.py
 
 Quote from the module:

linux/org.sabnzbd.sabnzbd.appdata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2022 The SABnzbd-Team <team@sabnzbd.org> -->
+<!-- Copyright 2022-2023 The SABnzbd-Team <team@sabnzbd.org> -->
 <component type="desktop-application">
   <id>org.sabnzbd.sabnzbd</id>
   <metadata_license>MIT</metadata_license>
@@ -23,16 +23,26 @@
   </categories>
   <url type="homepage">https://sabnzbd.org</url>
   <url type="bugtracker">https://github.com/sabnzbd/sabnzbd/issues</url>
+  <url type="vcs-browser">https://github.com/sabnzbd/sabnzbd</url>
   <url type="translate">https://sabnzbd.org/wiki/translate</url>
   <url type="donation">https://sabnzbd.org/donate</url>
   <url type="help">https://sabnzbd.org/wiki/</url>
   <url type="faq">https://sabnzbd.org/wiki/faq</url>
-  <url type="contact">https://forums.sabnzbd.org</url>
+  <url type="contact">https://sabnzbd.org/live-chat.html</url>
   <launchable type="desktop-id">sabnzbd.desktop</launchable>
   <provides>
     <mediatype>application/x-nzb</mediatype>
     <mediatype>application/x-compressed-nzb</mediatype>
   </provides>
+  <supports>
+    <control>pointing</control>
+    <control>keyboard</control>
+    <control>touch</control>
+  </supports>
+  <recommends>
+    <display_length compare="ge">small</display_length>
+    <internet>always</internet>
+  </recommends>
   <project_license>GPL-2.0-or-later</project_license>
   <developer_name>The SABnzbd-team</developer_name>
   <screenshots>

linux/sabnzbd.bash-completion

@@ -0,0 +1,63 @@
+# bash completion for sabnzbd
+
+_sabnzbd()
+{
+    local cur prev words cword split
+    # list all options here
+    local all_options="-f --config-file --pidfile -t --templates --pid -l --logging -w --weblogging -d --daemon -h
+                       --help -v --version -c --clean -p --pause --repair --repair-all --no-login --log-all --console
+                       --disable-file-log --new -b --browser --ipv6_hosting --inet_exposure --https -s --server"
+    _init_completion -s || return
+
+    # handle options that take arguments
+    case $prev in
+        # 0..1
+        --browser|--ipv6_hosting|-!(-*)[b])
+            COMPREPLY=( $(compgen -W '{0..1}' -- "$cur") )
+            return
+            ;;
+        # -1..2
+        --logging|-!(-*)[l])
+            COMPREPLY=( $(compgen -W '{-1..2}' -- "$cur") )
+            return
+            ;;
+        # 0..5
+        --inet_exposure)
+            COMPREPLY=( $(compgen -W '{0..5}' -- "$cur") )
+            return
+            ;;
+        # directory path
+        --templates|--pid|-!(-*)[t])
+            compopt +o nospace
+            _filedir -d
+            return
+            ;;
+        # file path
+        --config-file|--pidfile|-!(-*)[f])
+            compopt +o nospace
+            _filedir
+            return
+            ;;
+        # port number
+        --https)
+            COMPREPLY=( $(compgen -W '{0..65535}' -- "$cur") )
+            return
+            ;;
+        # host:port
+        --server|-!(-*)[s])
+            # suggest possible formats
+            COMPREPLY=( $(compgen -W 'hostname :port hostname:port ipv4 ipv4:port [ipv6] [ipv6]:port' -- "$cur") )
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $(compgen -W "$all_options" -- "$cur") )
+    else
+        _filedir '@(nzb|nzb.gz|nzb.bz2|zip|rar|7z)'
+    fi
+
+} &&
+complete -F _sabnzbd SABnzbd.py sabnzbd sabnzbdplus

po/email/SABemail.pot

@@ -1,11 +1,11 @@
 #
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,10 +1,10 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: email/email.tmpl:1
 msgid ""

po/email/fi.po

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: email/email.tmpl:1
 msgid ""

po/email/he.po

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # ION, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: email/email.tmpl:1
 msgid ""

po/email/ro.po

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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/nsis/SABnsis.pot

@@ -1,11 +1,11 @@
 #
 # SABnzbd Translation Template file NSIS
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,11 +1,15 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
+# Translators:
+# Pavel C <quoing_transifex@mess.cz>, 2022
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
+"Last-Translator: Pavel C <quoing_transifex@mess.cz>, 2022\n"
 "Language-Team: Czech (https://www.transifex.com/sabnzbd/teams/111101/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +23,7 @@ msgstr ""
 
 #: builder/win/NSIS_Installer.nsi
 msgid "Support the project, Donate!"
-msgstr ""
+msgstr "Podpořte projekt!"
 
 #: builder/win/NSIS_Installer.nsi
 msgid "Please close \"SABnzbd.exe\" first"

po/nsis/da.po

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,16 +1,16 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# Simon W., 2021
-# 
+# reloxx13 <reloxx@interia.pl>, 2022
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
-"Last-Translator: Simon W., 2021\n"
+"Last-Translator: reloxx13 <reloxx@interia.pl>, 2022\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"
@@ -44,15 +44,15 @@ msgid ""
 "The installer only supports 64-bit Windows, use the standalone version to "
 "run on 32-bit Windows."
 msgstr ""
-"Der Installer unterstützt nur Windows 64-bit. Benutze die Standalone Version"
-" für Windows 32-bit."
+"Der Installer unterstützt nur Windows 64-Bit. Benutze die Portable Version "
+"für Windows 32-Bit."
 
 #: builder/win/NSIS_Installer.nsi
 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 "
+"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

po/nsis/es.po

@@ -1,14 +1,14 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # Ester Molla Aragones <moarages@gmail.com>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: builder/win/NSIS_Installer.nsi
 msgid "Show Release Notes"

po/nsis/fi.po

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,14 +1,14 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # Fred L <88com88@gmail.com>, 2021
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: builder/win/NSIS_Installer.nsi
 msgid "Show Release Notes"

po/nsis/he.po

@@ -1,14 +1,14 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # ION, 2021
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2021
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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

@@ -1,13 +1,13 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2007-2022 The SABnzbd-Team
+# Copyright 2007-2023 The SABnzbd-Team
 #   team@sabnzbd.org
-# 
+#
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.6.0-develop\n"
+"Project-Id-Version: SABnzbd-3.8.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"