Update text files for 4.6.0Beta2

[skip ci]

.git-blame-ignore-revs

@@ -0,0 +1,43 @@
+# `git blame` master ignore list.
+#
+# This file contains a list of git hashes of revisions to be ignored
+# by `git blame`. These revisions are considered "unimportant" in
+# that they are unlikely to be what you are interested in when blaming.
+# They are typically expected to be formatting-only changes.
+#
+# It can be used for `git blame` using `--ignore-revs-file` or by
+# setting `blame.ignoreRevsFile` in the `git config`[1].
+#
+# Ignore these commits when reporting with blame. Calling
+#
+#   git blame --ignore-revs-file .git-blame-ignore-revs
+#
+# will tell `git blame` to ignore changes made by these revisions when
+# assigning blame, as if the change never happened.
+#
+# You can enable this as a default for your local repository by
+# running
+#
+#   git config blame.ignoreRevsFile .git-blame-ignore-revs
+#
+# This will probably be automatically picked by your IDE
+# (VSCode+GitLens and JetBrains products are confirmed to do this).
+#
+# Important: if you are switching to a branch without this file,
+# `git blame` will fail with an error.
+#
+# GitHub also excludes the commits listed below from its "Blame"
+# views[2][3].
+#
+# [1]: https://git-scm.com/docs/git-blame#Documentation/git-blame.txt-blameignoreRevsFile
+# [2]: https://github.blog/changelog/2022-03-24-ignore-commits-in-the-blame-view-beta/
+# [3]: https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
+
+
+# Black changes
+465a88154152fb0607a63fa24c8446bff43ec886
+f06891926661986fff52d6eb4b4cb120c71972d1
+9bcbcaefdfecc85aedfd8e2f8aaa1ca7f959404e
+433dcab02b29f7bd3827e237434034deecc1b549
+9f6a9f991222efccc87b45a701086c95629c67b6
+f89114ca7e1b20bf8e645ecd0b52b707ec857aa9

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,31 @@
+name: Bug report
+description: >
+  Did you discover a bug in SABnzbd? Report it here!
+  If you are not 100% certain this is a bug please go to our forums, Reddit or Discord server first.
+labels:
+  - Support
+body:
+  - type: input
+    attributes:
+      label: SABnzbd version
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Operating system
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Using Docker image
+      options:
+        - linuxserver
+        - hotio
+        - binhex
+        - Other
+  - type: textarea
+    attributes:
+      label: Description
+      description: Include error logs directly or link to extended logs on https://pastebin.com/
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Support forum
+    url: https://forums.sabnzbd.org/
+    about: Support questions can be asked on our forums, Reddit or Discord server.
+  - name: Discord
+    url: https://discord.sabnzbd.org
+    about: Support questions can be asked on our forums, Reddit or Discord server.
+  - name: Reddit - r/sabnzbd
+    url: https://www.reddit.com/r/sabnzbd
+    about: Support questions can be asked on our forums, Reddit or Discord server.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,10 @@
+name: Feature request
+description: What new feature would you like to have added to SABnzbd?
+labels:
+  - Support
+body:
+  - type: textarea
+    attributes:
+      label: Description
+    validations:
+      required: true

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: "weekly"

.github/renovate.json

@@ -5,23 +5,33 @@
     ":disableDependencyDashboard"
   ],
   "schedule": [
-    "before 3am on Monday"
-  ],
-  "ignorePaths": [
-    "tests/**",
-    ".github/workflows/**"
+    "before 8am on Monday"
   ],
+  "baseBranches": ["develop", "feature/uvicorn"],
   "pip_requirements": {
     "fileMatch": [
       "requirements.txt",
+      "tests/requirements.txt",
       "builder/requirements.txt",
-      "builder/osx/requirements.txt"
+      "builder/release-requirements.txt"
     ]
   },
+  "ignorePaths": [],
   "ignoreDeps": [
-    "jaraco.text"
+    "jaraco.text",
+    "jaraco.context",
+    "jaraco.collections",
+    "sabctools",
+    "paho-mqtt",
+    "werkzeug",
+    "tavern" 
   ],
   "packageRules": [
+    {
+      "matchManagers": ["github-actions"],
+      "matchPackageNames": ["windows", "macos"],
+      "enabled": false
+    },
     {
       "matchPackagePatterns": [
         "*"

.github/stale.yml

@@ -1,23 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 21
-
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - "Feature request"
-  - "Work in progress"
-  - "Bug"
-
-# Label to use when marking an issue as stale
-staleLabel: "Stale"
-
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.github/workflows/build_release.yml

@@ -4,137 +4,135 @@ on: [push, pull_request]
 
 # Setting PYTHONNODEBUGRANGES reduces binary size
 env:
-  AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
   PYTHONNODEBUGRANGES: 1
 
 jobs:
   build_windows:
-    name: Build Windows binary
-    runs-on: windows-latest
-    timeout-minutes: 30
+    name: Build Windows binary (${{ matrix.architecture }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - architecture: x64
+            runs-on: windows-2022
+          - architecture: arm64
+            runs-on: windows-11-arm
+
+    runs-on: ${{ matrix.runs-on }}
+    timeout-minutes: 15
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.11 (64bit)
-      uses: actions/setup-python@v4
+    - uses: actions/checkout@v6
+    - name: Set up Python
+      uses: actions/setup-python@v6
       with:
-        python-version: "3.11"
-        architecture: "x64"
-    - name: Cache Python virtualenv (64bit)
-      uses: syphar/restore-virtualenv@v1.3
-      id: cache-virtualenv-64bit
-      with:
-        custom_virtualenv_dir: "venv64"
-        custom_cache_key_element: "release"
-        requirement_files: |
-          **/requirements.txt
-          PKG-INFO
-    - name: Install Python dependencies (64bit)
-      if: steps.cache-virtualenv-64bit.outputs.cache-hit != 'true'
+        python-version: "3.14"
+        architecture: ${{ matrix.architecture }}
+        cache: pip
+        cache-dependency-path: "**/requirements.txt"
+    - name: Install Python dependencies
+      # Without dependencies to make sure everything is covered in the requirements.txt
       run: |
         python --version
-        pip install --upgrade pip wheel
-        pip install --upgrade -r requirements.txt
-        pip install --upgrade -r builder/requirements.txt
-    - name: Build Windows standalone binary and installer (64bit)
-      run: python builder/package.py installer
-    - name: Upload Windows standalone binary (64bit)
-      uses: actions/upload-artifact@v3
+        python -m pip install --upgrade pip wheel
+        pip install --upgrade -r requirements.txt --no-dependencies
+        pip install --upgrade -r builder/requirements.txt --no-dependencies
+    - name: Build Windows standalone binary
+      id: windows_binary
+      run: python builder/package.py binary
+    - name: Upload Windows standalone binary (unsigned)
+      uses: actions/upload-artifact@v6
+      id: upload-unsigned-binary
       with:
-        path: "*-win64-bin.zip"
-        name: Windows Windows standalone binary (64bit)
-    - name: Upload Windows installer (64bit)
-      uses: actions/upload-artifact@v3
+        path: "*-win*-bin.zip"
+        name: Windows standalone binary (${{ matrix.architecture }})
+    - name: Sign Windows standalone binary
+      uses: signpath/github-action-submit-signing-request@v2
+      if: contains(github.ref, 'refs/tags/')
+      with:
+        api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
+        organization-id: ${{ secrets.SIGNPATH_ORG_ID }}
+        project-slug: "sabnzbd"
+        artifact-configuration-slug: "sabnzbd-binary"
+        signing-policy-slug: "release-signing"
+        github-artifact-id: ${{ steps.upload-unsigned-binary.outputs.artifact-id }}
+        wait-for-completion: true
+        output-artifact-directory: "signed"
+    - name: Upload Windows standalone binary (signed)
+      uses: actions/upload-artifact@v6
+      if: contains(github.ref, 'refs/tags/')
+      with:
+        name: Windows standalone binary (${{ matrix.architecture }}, signed)
+        path: "signed"
+    - name: Build Windows installer
+      if: matrix.architecture == 'x64'
+      run: python builder/package.py installer
+    - name: Upload Windows installer
+      if: matrix.architecture == 'x64'
+      uses: actions/upload-artifact@v6
+      id: upload-unsigned-installer
       with:
         path: "*-win-setup.exe"
-        name: Windows installer
-    - name: Set up Python 3.8 (32bit and legacy)
-      uses: actions/setup-python@v4
+        name: Windows installer (${{ matrix.architecture }})
+    - name: Sign Windows installer
+      if: matrix.architecture == 'x64' && contains(github.ref, 'refs/tags/')
+      uses: signpath/github-action-submit-signing-request@v2
       with:
-        python-version: "3.8"
-        architecture: "x86"
-    - name: Cache Python virtualenv (32bit and legacy)
-      uses: syphar/restore-virtualenv@v1.3
-      id: cache-virtualenv-32bit
+        api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
+        organization-id: ${{ secrets.SIGNPATH_ORG_ID }}
+        project-slug: "sabnzbd"
+        artifact-configuration-slug: "sabnzbd-installer"
+        signing-policy-slug: "release-signing"
+        github-artifact-id: ${{ steps.upload-unsigned-installer.outputs.artifact-id }}
+        wait-for-completion: true
+        output-artifact-directory: "signed"
+    - name: Upload Windows installer (signed)
+      if: matrix.architecture == 'x64' && contains(github.ref, 'refs/tags/')
+      uses: actions/upload-artifact@v6
       with:
-        custom_virtualenv_dir: "venv32"
-        custom_cache_key_element: "release"
-        requirement_files: |
-          **/requirements.txt
-          PKG-INFO
-    - name: Install Python dependencies (32bit and legacy)
-      if: steps.cache-virtualenv-32bit.outputs.cache-hit != 'true'
-      run: |
-        python --version
-        pip install --upgrade pip wheel
-        pip install --upgrade -r requirements.txt
-        pip install --upgrade -r builder/requirements.txt
-    - 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@v3
-      with:
-        path: "*-win32-bin.zip"
-        name: Windows Windows standalone binary (32bit and legacy)
-    - name: Prepare official release
-      if: env.AUTOMATION_GITHUB_TOKEN && startsWith(github.ref, 'refs/tags/')
-      run: python builder/package.py release
+        name: Windows installer (${{ matrix.architecture }}, signed)
+        path: "signed/*-win-setup.exe"
 
   build_macos:
     name: Build macOS binary
-    runs-on: macos-11
-    timeout-minutes: 30
+    runs-on: macos-14
+    timeout-minutes: 15
     env:
       # 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.11.1"
-      MACOSX_DEPLOYMENT_TARGET: "10.9"
+      PYTHON_VERSION: "3.14.2"
+      MACOSX_DEPLOYMENT_TARGET: "10.15"
       # We need to force compile for universal2 support
       CFLAGS: -arch x86_64 -arch arm64
       ARCHFLAGS: -arch x86_64 -arch arm64
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
+    - name: Set up Python
+      # Only use this for the caching of pip packages!
+      uses: actions/setup-python@v6
+      with:
+        python-version: "3.14"
+        cache: pip
+        cache-dependency-path: "**/requirements.txt"
     - name: Cache Python download
       id: cache-python-download
-      uses: actions/cache@v3
+      uses: actions/cache@v5
       with:
         path: ~/python.pkg
         key: cache-macOS-Python-${{ env.PYTHON_VERSION }}
-    - name: Get Python
+    - name: Get Python from python.org
       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
     - name: Install Python
-      run: |
-        sudo installer -pkg ~/python.pkg -target /
-        unlink /usr/local/bin/python
-        ln -s /usr/local/bin/python3 /usr/local/bin/python
-    - name: Cache Python virtualenv
-      uses: syphar/restore-virtualenv@v1.3
-      id: cache-virtualenv
-      with:
-        custom_cache_key_element: "release"
-        requirement_files: |
-          **/requirements.txt
-          PKG-INFO
+      run: sudo installer -pkg ~/python.pkg -target /
     - name: Install Python dependencies
-      # 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
-      # 2.  We need to build the PyInstaller bootloader:
-      #     https://github.com/pyinstaller/pyinstaller/issues/6235
-      if: steps.cache-virtualenv.outputs.cache-hit != 'true'
+      # We have to manually compile some modules as they don't automatically fetch universal2 binaries
       run: |
         python3 --version
         pip3 install --upgrade pip wheel
-        
-        pip3 install --upgrade -r requirements.txt --no-binary cffi
-        
-        pip3 uninstall cryptography -y
-        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
+        pip3 install --upgrade -r requirements.txt --no-binary cffi,CT3,PyYAML,charset_normalizer --no-dependencies
+        pip3 install --upgrade -r builder/requirements.txt --no-dependencies
     - name: Import macOS codesign certificates
       # Taken from https://github.com/Apple-Actions/import-codesign-certs/pull/27 (comments)
       env:
@@ -144,8 +142,8 @@ jobs:
       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 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
@@ -154,7 +152,7 @@ jobs:
       # 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
+      uses: actions/upload-artifact@v6
       with:
         path: "*-src.tar.gz"
         name: Source distribution
@@ -167,27 +165,92 @@ jobs:
         python3 builder/package.py app
         python3 builder/make_dmg.py
     - name: Upload macOS binary
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v6
       with:
-        path: "*-osx.dmg"
-        name: macOS binary (not notarized)
-    - name: Prepare official release
-      if: env.AUTOMATION_GITHUB_TOKEN && startsWith(github.ref, 'refs/tags/')
-      run: python3 builder/package.py release
+        path: "*-macos.dmg"
+        name: macOS binary
+
+  build-snap:
+    name: Build Snap Packages (${{ matrix.linux_arch }})
+    timeout-minutes: 30
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            linux_arch: x64
+          - os: ubuntu-24.04-arm
+            linux_arch: arm64
 
-  release_snap:
-    name: Release Snap
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
-    env:
-      SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
+      - uses: actions/checkout@v6
+      - name: Cache par2cmdline-turbo tarball
+        uses: actions/cache@v5
+        id: cache-par2cmdline
+        # Clearing the cache in case of new version requires manual clearing in GitHub!
         with:
-          python-version: "3.x"
-      - name: Release latest available Snap
+          path: snap/par2cmdline.tar.gz
+          key: cache-par2cmdline
+      - name: Download par2cmdline-turbo tarball
+        if: steps.cache-par2cmdline.outputs.cache-hit != 'true'
         run: |
-          sudo snap install snapcraft --classic
-          python3 snap/local/release_snap.py
+          PAR2_TARBALL=$(curl -sL https://api.github.com/repos/animetosho/par2cmdline-turbo/releases/latest | jq -r '.tarball_url')
+          curl -o snap/par2cmdline.tar.gz -L "$PAR2_TARBALL"
+      - uses: snapcore/action-build@v1
+        name: Build snap
+        id: snapcraft
+      - name: Test snap installation
+        run: |
+          sudo snap install --dangerous *.snap
+          sudo snap connect sabnzbd:removable-media
+          # Basic smoke test - check that the binary exists and can show help
+          timeout 10s snap run sabnzbd --help || true
+          sudo snap remove sabnzbd
+      - name: Upload snap
+        uses: actions/upload-artifact@v6
+        with:
+          name: Snap package (${{ matrix.linux_arch }})
+          path: ${{ steps.snapcraft.outputs.snap }}
+      - name: Publish snap
+        uses: snapcore/action-publish@v1
+        if: contains(github.ref, 'refs/tags/')
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_TOKEN }}
+        with:
+          store_login: ${{ secrets.SNAP_TOKEN }}
+          snap: ${{ steps.snapcraft.outputs.snap }}
+          release: stable
+
+  release:
+    name: Prepare Release
+    runs-on: ubuntu-latest
+    needs: [build_windows, build_macos]
+    steps:
+      - uses: actions/checkout@v6
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.14"
+          cache: pip
+          cache-dependency-path: "builder/release-requirements.txt"
+      - name: Download Source distribution artifact
+        uses: actions/download-artifact@v7
+        with:
+          name: Source distribution
+      - name: Download macOS artifact
+        uses: actions/download-artifact@v7
+        with:
+          name: macOS binary
+      - name: Download Windows artifacts
+        uses: actions/download-artifact@v7
+        with:
+          pattern: ${{ (contains(github.ref, 'refs/tags/')) && '*signed*' || '*Windows*' }}
+          merge-multiple: true
+      - name: Prepare official release
+        env:
+          AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
+          REDDIT_TOKEN: ${{ secrets.REDDIT_TOKEN }}
+        run: |
+          pip3 install -r builder/release-requirements.txt
+          python3 builder/release.py

.github/workflows/integration_testing.yml

@@ -7,7 +7,7 @@ jobs:
     name: Black Code Formatter
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Black Code Formatter
         uses: lgeiger/black-action@master
         with:
@@ -20,51 +20,44 @@ jobs:
             builder/SABnzbd.spec
             tests
             --line-length=120
-            --target-version=py37
+            --target-version=py39
             --check
             --diff
 
   test:
     name: Test ${{ matrix.name }} - Python ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 15
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-        os: [ubuntu-20.04]
+        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13", "3.14" ]
+        name: ["Linux"]
+        os: [ubuntu-latest]
         include:
           - name: macOS
             os: macos-latest
-            python-version: "3.11"
+            python-version: "3.14"
           - name: Windows
-            os: windows-latest
-            python-version: "3.11"
+            os: windows-2022
+            python-version: "3.14"
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
-        architecture: "x64"
+        cache: pip
+        cache-dependency-path: "**/requirements.txt"
     - 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.3
-      id: cache-virtualenv
-      with:
-        custom_cache_key_element: "ci"
-        requirement_files: |
-          **/requirements.txt
-          PKG-INFO
+      run: sudo apt-get install unrar 7zip par2
     - name: Install Python dependencies
-      if: steps.cache-virtualenv.outputs.cache-hit != 'true'
       run: |
         python --version
-        pip install --upgrade pip wheel
-        pip install --upgrade -r requirements.txt
+        python -m pip install --upgrade pip wheel
+        pip install --upgrade -r requirements.txt --no-dependencies
         pip install --upgrade -r tests/requirements.txt
     - name: Test SABnzbd
       run: pytest -s

.github/workflows/stale.yml

@@ -0,0 +1,33 @@
+name: "Close and lock old issues"
+on:
+  schedule:
+    - cron: "30 1 * * *"
+  workflow_dispatch:
+
+jobs:
+  stale:
+    name: "Close stale issues"
+    if: github.repository_owner == 'sabnzbd'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v10
+        with:
+          days-before-stale: 21
+          days-before-close: 7
+          stale-issue-label: "Stale"
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs. Thank you
+            for your contributions.
+          exempt-issue-labels: "Feature request, Work in progress, Bug"
+
+  lock:
+    name: "Lock old issues"
+    if: github.repository_owner == 'sabnzbd'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v6
+        with:
+          log-output: true
+          issue-inactive-days: 60
+          pr-inactive-days: 60

.github/workflows/translations.yml

@@ -12,7 +12,7 @@ jobs:
     env:
       TX_TOKEN: ${{ secrets.TX_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           token: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
       - name: Generate translatable texts
@@ -20,18 +20,20 @@ jobs:
           python3 tools/extract_pot.py
       - name: Push/pull Transifex translations
         if: env.TX_TOKEN
+        # Add --translation to the push command in order to update Transifex using local translation edits
+        # However, this prevents modifying existing translations in Transifex as they will be overwritten by the push!
         run: |
           curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
-          ./tx push --translation --source
+          ./tx push --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.16.0
+        uses: stefanzweifel/git-auto-commit-action@v7.1.0
         if: env.TX_TOKEN
         with:
-          commit_message: | 
+          commit_message: |
             Update translatable texts
             [skip ci]
           commit_user_name: SABnzbd Automation

COPYRIGHT.txt

@@ -1,7 +1,7 @@
 
-(c) Copyright 2007-2022 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2025 by The SABnzbd-Team (sabnzbd.org)
 
-The SABnzbd-team is:
+The SABnzbd-Team is:
 
 Active team:
     Safihre

INSTALL.txt

@@ -4,7 +4,7 @@
 0) LICENSE
 -------------------------------------------------------------------------------
 
-(c) Copyright 2007-2022 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2025 by The SABnzbd-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
@@ -52,10 +52,10 @@ Specific guides to install from source are available for Windows and macOS:
     https://sabnzbd.org/wiki/installation/install-macos
     https://sabnzbd.org/wiki/installation/install-from-source-windows
 
-Only Python 3.7 and above is supported.
+Only Python 3.9 and above is supported.
 
 On Linux systems you need to install:
-    par2 unrar unzip python3-setuptools python3-pip
+    par2 unrar python3-setuptools python3-pip
 
 On non-X86 platforms, for which PyPI does not provide all pre-compiled packages,
 you also need to install these development libraries (exact names might differ per platform):

ISSUES.txt

@@ -48,11 +48,3 @@
   You can make SABnzbd wait for a mount of the "temporary download folder" by setting
   Config->Special->wait_for_dfolder to 1.
   SABnzbd will appear to hang until the drive is mounted.
-
-- If you experience speed-drops to KB/s when using a VPN, try setting the number of connections
-  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-2025 by The SABnzbd-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,10 +0,0 @@
-Metadata-Version: 1.0
-Name: SABnzbd
-Version: 3.8.0-develop
-Summary: SABnzbd-3.8.0-develop
-Home-page: https://sabnzbd.org
-Author: The SABnzbd Team
-Author-email: team@sabnzbd.org
-License: GNU General Public License 2 (GPL2 or later)
-Description: Fully automated Usenet Binary Downloader
-Platform: posix

README.md

@@ -2,7 +2,7 @@ SABnzbd - The automated Usenet download tool
 ============================================
 
 [![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)
+[![Join our Discord](https://img.shields.io/discord/976737547558461480?color=7289DA&label=Discord&logo=Discord&logoColor=white)](https://discord.sabnzbd.org)
 
 SABnzbd is an Open Source Binary Newsreader written in Python.
 
@@ -16,7 +16,7 @@ If you want to know more you can head over to our website: https://sabnzbd.org.
 
 SABnzbd has a few dependencies you'll need before you can get running. If you've previously run SABnzbd from one of the various Linux packages, then you likely already have all the needed dependencies. If not, here's what you're looking for:
 
-- `python` (Python 3.7 and above, often called `python3`)
+- `python` (Python 3.9 and above, often called `python3`)
 - Python modules listed in `requirements.txt`. Install with `python3 -m pip install -r requirements.txt -U`
 - `par2` (Multi-threaded par2 installation guide can be found [here](https://sabnzbd.org/wiki/installation/multicore-par2))
 - `unrar` (make sure you get the "official" non-free version of unrar)
@@ -66,3 +66,12 @@ Conditions:
 - Bugfixes created specifically for a release branch are done there (because they are specific, they're not cherry-picked to `develop`).
 - Bugfixes done on `develop` may be cherry-picked to a release branch.
 - We will not release a 1.0.2 if a 1.1.0 has already been released.
+
+## Privacy Policy
+
+This program will not transfer any information to other networked systems unless
+specifically requested by the user or the person installing or operating it.
+
+## Code Signing Policy
+
+For our Windows release, free code signing is provided by [SignPath.io](https://signpath.io), certificate by [SignPath Foundation](https://signpath.org).

README.mkd

@@ -1,53 +1,52 @@
-Release Notes - SABnzbd 3.7.0 Beta 1
+Release Notes - SABnzbd 4.6.0 Beta 2
 =========================================================
 
-## 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.11rc2, boosting overall performance.
-- macOS/Windows: Updated UnRar to 6.12.
-- Windows: Updated MultiPar to 1.3.2.5.
+This is the second beta release of version 4.6.
 
-# API changes since 3.6.1
-- Minor improvements in API call performance.
-- Removed fields `scripts` and `categories` from `queue` API call.
-- Moved `loadavg` from `queue` to `status` API call.
+## New features in 4.6.0
+
+* Added support for NNTP Pipelining which eliminates idle waiting between
+  requests, significantly improving speeds on high-latency connections.
+  Read more here: https://sabnzbd.org/wiki/advanced/nntp-pipelining
+* Dynamically increase Assembler limits on faster connections.
+* Improved disk speed measurement in Status window.
+* Enable `verify_xff_header` by default.
+* Reduce delays between jobs during post-processing.
+* If a download only has `.nzb` files inside, the new downloads
+  will include the name of the original download.
+* Dropped support for Python 3.8.
+* Windows: Added Windows ARM (portable) release.
+
+## Bug fixes since 4.5.0
+
+* `Check before download` could get stuck or fail to reject.
+* No error was shown in case NZB upload failed.
+* Correct mobile layout if `Full Width` is enabled.
+* Aborted Direct Unpack could result in no files being unpacked.
+* Windows: Tray icon disappears after Explorer restart.
+* macOS: Slow to start on some network setups.
 
-# 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
-  version. If you downgrade to 3.1.x or lower, detailed download
-  statistics will be lost.
+
+* You can directly upgrade from version 3.0.0 and newer.
+* Upgrading from older versions will require performing a `Queue repair`.
+* Downgrading from version 4.2.0 or newer to 3.7.2 or older will require
+  performing a `Queue repair` due to changes in the internal data format.
 
 ## Known problems and solutions
-- Read the file "ISSUES.txt"
+
+* Read `ISSUES.txt` or https://sabnzbd.org/wiki/introduction/known-issues
+
+## Code Signing Policy
+
+Windows code signing is provided by SignPath.io using a SignPath Foundation certificate.
 
 ## About
-  SABnzbd is an open-source cross-platform binary newsreader.
-  It simplifies the process of downloading from Usenet dramatically, thanks
-  to its web-based user interface and advanced built-in post-processing options
-  that automatically verify, repair, extract and clean up posts downloaded
-  from Usenet.
 
-  (c) Copyright 2007-2022 by "The SABnzbd-team" \<team@sabnzbd.org\>
+SABnzbd is an open-source cross-platform binary newsreader.
+It simplifies the process of downloading from Usenet dramatically, thanks to its web-based
+user interface and advanced built-in post-processing options that automatically verify, repair,
+extract and clean up posts downloaded from Usenet.
+
+(c) Copyright 2007-2025 by The SABnzbd-Team (sabnzbd.org)

builder/SABnzbd.spec

@@ -1,46 +1,20 @@
 # -*- mode: python -*-
 import os
-import re
 import sys
-import pkginfo
 
 from PyInstaller.building.api import EXE, COLLECT, PYZ
 from PyInstaller.building.build_main import Analysis
 from PyInstaller.building.osx import BUNDLE
 from PyInstaller.utils.hooks import collect_data_files, collect_submodules
 
+from builder.constants import EXTRA_FILES, EXTRA_FOLDERS, RELEASE_VERSION, RELEASE_VERSION_TUPLE
+
 # Add extra files in the PyInstaller-spec
 extra_pyinstaller_files = []
 
-# Also modify these in "package.py"!
-extra_files = [
-    "README.txt",
-    "INSTALL.txt",
-    "LICENSE.txt",
-    "GPL2.txt",
-    "GPL3.txt",
-    "COPYRIGHT.txt",
-    "ISSUES.txt",
-    "PKG-INFO",
-]
-
-extra_folders = [
-    "scripts/",
-    "licenses/",
-    "locale/",
-    "email/",
-    "interfaces/Glitter/",
-    "interfaces/wizard/",
-    "interfaces/Config/",
-    "scripts/",
-    "icons/",
-]
-
-# Get the version
-RELEASE_VERSION = pkginfo.Develop(".").version
-
 # Add hidden imports
 extra_hiddenimports = ["Cheetah.DummyTransaction", "cheroot.ssl.builtin", "certifi"]
+extra_hiddenimports.extend(collect_submodules("apprise"))
 extra_hiddenimports.extend(collect_submodules("babelfish.converters"))
 extra_hiddenimports.extend(collect_submodules("guessit.data"))
 
@@ -48,9 +22,9 @@ extra_hiddenimports.extend(collect_submodules("guessit.data"))
 if sys.platform == "darwin":
     extra_hiddenimports.extend(["objc", "PyObjCTools"])
     # macOS folders
-    extra_folders += ["osx/par2/", "osx/unrar/", "osx/7zip/"]
+    EXTRA_FOLDERS += ["macos/par2/", "macos/unrar/", "macos/7zip/"]
     # Add NZB-icon file
-    extra_pyinstaller_files.append(("builder/osx/image/nzbfile.icns", "."))
+    extra_pyinstaller_files.append(("builder/macos/image/nzbfile.icns", "."))
     # Version information is set differently on macOS
     version_info = None
 else:
@@ -66,20 +40,16 @@ else:
     )
 
     # Windows
-    extra_hiddenimports.append("win32timezone")
-    extra_folders += ["win/multipar/", "win/unrar/", "win/7zip/"]
-    extra_files += ["portable.cmd"]
-
-    # Parse the version info
-    version_regexed = re.search(r"(\d+)\.(\d+)\.(\d+)([a-zA-Z]*)(\d*)", RELEASE_VERSION)
-    version_tuple = (int(version_regexed.group(1)), int(version_regexed.group(2)), int(version_regexed.group(3)), 0)
+    extra_hiddenimports.extend(["win32timezone", "winrt.windows.foundation.collections"])
+    EXTRA_FOLDERS += ["win/par2/", "win/unrar/", "win/7zip/"]
+    EXTRA_FILES += ["portable.cmd"]
 
     # Detailed instructions are in the PyInstaller documentation
     # We don't include the alpha/beta/rc in the counters
     version_info = VSVersionInfo(
         ffi=FixedFileInfo(
-            filevers=version_tuple,
-            prodvers=version_tuple,
+            filevers=RELEASE_VERSION_TUPLE,
+            prodvers=RELEASE_VERSION_TUPLE,
             mask=0x3F,
             flags=0x0,
             OS=0x40004,
@@ -109,20 +79,23 @@ else:
     )
 
 # Process the extra-files and folders
-for file_item in extra_files:
+for file_item in EXTRA_FILES:
     extra_pyinstaller_files.append((file_item, "."))
-for folder_item in extra_folders:
+for folder_item in EXTRA_FOLDERS:
     extra_pyinstaller_files.append((folder_item, folder_item))
 
 # Add babelfish data files
 extra_pyinstaller_files.extend(collect_data_files("babelfish"))
 extra_pyinstaller_files.extend(collect_data_files("guessit"))
+extra_pyinstaller_files.extend(collect_data_files("apprise"))
+extra_pyinstaller_files.extend(collect_data_files("dateutil"))
 
 pyi_analysis = Analysis(
     ["SABnzbd.py"],
     datas=extra_pyinstaller_files,
     hiddenimports=extra_hiddenimports,
-    excludes=["ujson", "FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter"],
+    excludes=["ujson", "FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter", "pydoc", "pydoc_data.topics"],
+    module_collection_mode={"apprise.plugins": "py"},
 )
 
 pyz = PYZ(pyi_analysis.pure, pyi_analysis.zipped_data)
@@ -139,13 +112,13 @@ exe = EXE(
     [],
     exclude_binaries=True,
     name="SABnzbd",
-    upx=True,
     console=False,
     append_pkg=False,
     icon="icons/sabnzbd.ico",
+    contents_directory=".",
     version=version_info,
     target_arch="universal2",
-    entitlements_file="builder/osx/entitlements.plist",
+    entitlements_file="builder/macos/entitlements.plist",
     codesign_identity=codesign_identity,
 )
 
@@ -160,9 +133,9 @@ if sys.platform == "win32":
         [],
         exclude_binaries=True,
         name="SABnzbd-console",
-        upx=True,
         append_pkg=False,
         icon="icons/sabnzbd.ico",
+        contents_directory=".",
         version=version_info,
     )
 
@@ -171,7 +144,6 @@ if sys.platform == "win32":
         pyi_analysis.binaries,
         pyi_analysis.zipfiles,
         pyi_analysis.datas,
-        upx=True,
         name="SABnzbd-console",
     )
 
@@ -194,14 +166,14 @@ if sys.platform == "darwin":
                 "NSPersistentStoreTypeKey": "Binary",
             }
         ],
-        "LSMinimumSystemVersion": "10.9",
+        "LSMinimumSystemVersion": "10.13",
         "LSEnvironment": {"LANG": "en_US.UTF-8", "LC_ALL": "en_US.UTF-8"},
     }
 
     app = BUNDLE(
         coll,
         name="SABnzbd.app",
-        icon="builder/osx/image/sabnzbdplus.icns",
+        icon="builder/macos/image/sabnzbdplus.icns",
         bundle_identifier="org.sabnzbd.sabnzbd",
         info_plist=info_plist,
     )

builder/constants.py

@@ -0,0 +1,79 @@
+#!/usr/bin/python3 -OO
+# Copyright 2008-2025 by The SABnzbd-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
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+import os
+import platform
+import re
+
+# Constants
+VERSION_FILE = "sabnzbd/version.py"
+APPDATA_FILE = "linux/org.sabnzbd.sabnzbd.appdata.xml"
+
+# To draft a release or not to draft a release?
+ON_GITHUB_ACTIONS = os.environ.get("CI", False)
+RELEASE_THIS = "refs/tags/" in os.environ.get("GITHUB_REF", "")
+
+# Import version.py without the sabnzbd overhead
+with open(VERSION_FILE) as version_file:
+    exec(version_file.read())
+RELEASE_VERSION = __version__
+
+# Pre-releases are longer than 6 characters (e.g. 3.1.0Beta1 vs 3.1.0, but also 3.0.11)
+PRERELEASE = len(RELEASE_VERSION) > 5
+
+# Parse the version info for Windows file properties information
+version_regexed = re.search(r"(\d+)\.(\d+)\.(\d+)([a-zA-Z]*)(\d*)", RELEASE_VERSION)
+RELEASE_VERSION_TUPLE = (int(version_regexed.group(1)), int(version_regexed.group(2)), int(version_regexed.group(3)), 0)
+RELEASE_VERSION_BASE = f"{RELEASE_VERSION_TUPLE[0]}.{RELEASE_VERSION_TUPLE[1]}.{RELEASE_VERSION_TUPLE[2]}"
+
+# Define release name
+RELEASE_NAME = "SABnzbd-%s" % RELEASE_VERSION
+RELEASE_TITLE = "SABnzbd %s" % RELEASE_VERSION
+RELEASE_SRC = RELEASE_NAME + "-src.tar.gz"
+RELEASE_WIN_BIN_X64 = RELEASE_NAME + "-win64-bin.zip"
+RELEASE_WIN_BIN_ARM64 = RELEASE_NAME + "-win-arm64-bin.zip"
+RELEASE_WIN_INSTALLER = RELEASE_NAME + "-win-setup.exe"
+RELEASE_MACOS = RELEASE_NAME + "-macos.dmg"
+RELEASE_README = "README.mkd"
+
+# Detect architecture
+RELEASE_WIN_BIN = RELEASE_WIN_BIN_X64
+if platform.machine() == "ARM64":
+    RELEASE_WIN_BIN = RELEASE_WIN_BIN_ARM64
+
+# Used in package.py and SABnzbd.spec
+EXTRA_FILES = [
+    RELEASE_README,
+    "README.txt",
+    "INSTALL.txt",
+    "LICENSE.txt",
+    "GPL2.txt",
+    "GPL3.txt",
+    "COPYRIGHT.txt",
+    "ISSUES.txt",
+]
+EXTRA_FOLDERS = [
+    "scripts/",
+    "licenses/",
+    "locale/",
+    "email/",
+    "interfaces/Glitter/",
+    "interfaces/wizard/",
+    "interfaces/Config/",
+    "scripts/",
+    "icons/",
+]

builder/make_dmg.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python3 -OO
-# Copyright 2008-2017 The SABnzbd-Team <team@sabnzbd.org>
+# Copyright 2008-2025 by The SABnzbd-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
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import os
-import pkginfo
+from constants import RELEASE_VERSION
 
 
 # We need to call dmgbuild from command-line, so here we can setup how
@@ -24,7 +24,7 @@ if __name__ == "__main__":
     # Check for DMGBuild
     try:
         import dmgbuild
-    except:
+    except Exception:
         print("Requires dmgbuild-module, use pip install dmgbuild")
         exit()
 
@@ -37,9 +37,9 @@ if __name__ == "__main__":
 
     # Extract version info and set DMG path
     # Create sub-folder to upload later
-    release = pkginfo.Develop(".").version
+    release = RELEASE_VERSION
     prod = "SABnzbd-" + release
-    fileDmg = prod + "-osx.dmg"
+    fileDmg = prod + "-macos.dmg"
 
     # Path to app file
     apppath = "dist/SABnzbd.app"
@@ -48,8 +48,8 @@ if __name__ == "__main__":
     readmepath = os.path.join(apppath, "Contents/Resources/README.txt")
 
     # Path to background and the icon
-    backgroundpath = "builder/osx/image/sabnzbd_new_bg.png"
-    iconpath = "builder/osx/image/sabnzbdplus.icns"
+    backgroundpath = "builder/macos/image/sabnzbd_new_bg.png"
+    iconpath = "builder/macos/image/sabnzbdplus.icns"
 
     # Make DMG
     print("Building DMG")

builder/osx/requirements.txt

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

builder/package.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python3 -OO
-# Copyright 2008-2017 The SABnzbd-Team <team@sabnzbd.org>
+# Copyright 2008-2025 by The SABnzbd-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
@@ -16,8 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import glob
-import hashlib
-import platform
 import re
 import sys
 import os
@@ -29,37 +27,22 @@ import tarfile
 import urllib.request
 import urllib.error
 import configobj
-import pkginfo
-import github
-from typing import List
+import packaging.version
 
-
-VERSION_FILE = "sabnzbd/version.py"
-SPEC_FILE = "SABnzbd.spec"
-
-# Also modify these in "SABnzbd.spec"!
-extra_files = [
-    "README.mkd",
-    "INSTALL.txt",
-    "LICENSE.txt",
-    "GPL2.txt",
-    "GPL3.txt",
-    "COPYRIGHT.txt",
-    "ISSUES.txt",
-    "PKG-INFO",
-]
-
-extra_folders = [
-    "scripts/",
-    "licenses/",
-    "locale/",
-    "email/",
-    "interfaces/Glitter/",
-    "interfaces/wizard/",
-    "interfaces/Config/",
-    "scripts/",
-    "icons/",
-]
+from constants import (
+    RELEASE_VERSION,
+    RELEASE_VERSION_TUPLE,
+    VERSION_FILE,
+    RELEASE_README,
+    RELEASE_NAME,
+    RELEASE_WIN_BIN,
+    RELEASE_WIN_INSTALLER,
+    ON_GITHUB_ACTIONS,
+    RELEASE_THIS,
+    RELEASE_SRC,
+    EXTRA_FILES,
+    EXTRA_FOLDERS,
+)
 
 
 # Support functions
@@ -74,16 +57,21 @@ def safe_remove(path):
             os.remove(path)
 
 
-def delete_files_glob(name):
-    """Delete one file or set of files from wild-card spec"""
-    for f in glob.glob(name):
-        if os.path.exists(f):
-            os.remove(f)
+def delete_files_glob(glob_pattern: str, allow_no_matches: bool = False):
+    """Delete one file or set of files from wild-card spec.
+    We expect to match at least 1 file, to force expected behavior"""
+    if files_to_remove := glob.glob(glob_pattern):
+        for path in files_to_remove:
+            if os.path.exists(path):
+                os.remove(path)
+    else:
+        if not allow_no_matches:
+            raise FileNotFoundError(f"No files found that match '{glob_pattern}'")
 
 
-def run_external_command(command: List[str], print_output: bool = True):
+def run_external_command(command: list[str], print_output: bool = True, **kwargs):
     """Wrapper to ease the use of calling external programs"""
-    process = subprocess.Popen(command, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    process = subprocess.Popen(command, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kwargs)
     output, _ = process.communicate()
     ret = process.wait()
     if (output and print_output) or ret != 0:
@@ -120,6 +108,52 @@ def patch_version_file(release_name):
         ver.write(version_file)
 
 
+def test_macos_min_version(binary_path: str):
+    # Skip check if nothing was set
+    if macos_min_version := os.environ.get("MACOSX_DEPLOYMENT_TARGET"):
+        # Skip any arm64 specific files
+        if "arm64" in binary_path:
+            print(f"Skipping arm64 binary {binary_path}")
+            return
+
+        # Check minimum macOS version is at least mac OS10.13
+        # We only check the x86_64 since for arm64 it's always macOS 11+
+        print(f"Checking if binary supports macOS {macos_min_version} and above: {binary_path}")
+        otool_output = run_external_command(
+            [
+                "otool",
+                "-arch",
+                "x86_64",
+                "-l",
+                binary_path,
+            ],
+            print_output=False,
+        )
+
+        # Parse the output for LC_BUILD_VERSION minos
+        # The output is very large, so that's why we enumerate over it
+        req_version = packaging.version.parse(macos_min_version)
+        bin_version = None
+        lines = otool_output.split("\n")
+        for line_nr, line in enumerate(lines):
+            if "LC_VERSION_MIN_MACOSX" in line:
+                # Display the version in the next lines
+                bin_version = packaging.version.parse(lines[line_nr + 2].split()[1])
+            elif "minos" in line:
+                bin_version = packaging.version.parse(line.split()[1])
+
+            if bin_version and bin_version > req_version:
+                raise ValueError(f"{binary_path} requires {bin_version}, we want {req_version}")
+            else:
+                # We got the information we need
+                break
+        else:
+            print(lines)
+            raise RuntimeError(f"Could not determine minimum macOS version for {binary_path}")
+    else:
+        print(f"Skipping macOS version check, MACOSX_DEPLOYMENT_TARGET not set")
+
+
 def test_sab_binary(binary_path: str):
     """Wrapper to have a simple start-up test for the binary"""
     with tempfile.TemporaryDirectory() as config_dir:
@@ -132,13 +166,16 @@ def test_sab_binary(binary_path: str):
 
         # Wait for SAB to respond
         base_url = "http://127.0.0.1:8080/"
-        for _ in range(10):
+        for _ in range(30):
             try:
                 urllib.request.urlopen(base_url, timeout=1).read()
                 break
-            except:
+            except Exception:
                 time.sleep(1)
         else:
+            # Print console output and give some time to print
+            print(sabnzbd_process.stdout.read())
+            time.sleep(1)
             raise urllib.error.URLError("Could not connect to SABnzbd")
 
         # Open a number of API calls and pages, to see if we are really up
@@ -170,10 +207,13 @@ def test_sab_binary(binary_path: str):
 
         # Print logs for verification
         with open(os.path.join(config_dir, "logs", "sabnzbd.log"), "r") as log_file:
-            print(log_file.read())
+            # Wait after printing so the output is nicely displayed in case of problems
+            print(log_text := log_file.read())
+            time.sleep(5)
 
-        # So we have time to print the file before the directory is removed
-        time.sleep(1)
+            # Make sure no extra errors/warnings were reported
+            if "ERROR" in log_text or "WARNING" in log_text:
+                raise RuntimeError("Warning or error reported during execution")
 
 
 if __name__ == "__main__":
@@ -185,32 +225,15 @@ if __name__ == "__main__":
     if not os.path.exists("builder"):
         raise FileNotFoundError("Run from the main SABnzbd source folder: python builder/package.py")
 
-    # Extract version info
-    RELEASE_VERSION = pkginfo.Develop(".").version
-
     # Check if we have the needed certificates
     try:
         import certifi
     except ImportError:
         raise FileNotFoundError("Need certifi module")
 
-    # Define release name
-    RELEASE_NAME = "SABnzbd-%s" % RELEASE_VERSION
-    RELEASE_TITLE = "SABnzbd %s" % RELEASE_VERSION
-    RELEASE_SRC = RELEASE_NAME + "-src.tar.gz"
-    RELEASE_BINARY_32 = RELEASE_NAME + "-win32-bin.zip"
-    RELEASE_BINARY_64 = RELEASE_NAME + "-win64-bin.zip"
-    RELEASE_INSTALLER = RELEASE_NAME + "-win-setup.exe"
-    RELEASE_MACOS = RELEASE_NAME + "-osx.dmg"
-    RELEASE_README = "README.mkd"
-
     # Patch release file
     patch_version_file(RELEASE_VERSION)
 
-    # To draft a release or not to draft a release?
-    ON_GITHUB_ACTIONS = os.environ.get("CI", False)
-    RELEASE_THIS = "refs/tags/" in os.environ.get("GITHUB_REF", "")
-
     # Rename release notes file
     safe_remove("README.txt")
     shutil.copyfile(RELEASE_README, "README.txt")
@@ -223,78 +246,74 @@ if __name__ == "__main__":
         if not os.path.exists("locale"):
             raise FileNotFoundError("Failed to compile language files")
 
-    # Make sure we remove any existing build-folders
-    safe_remove("build")
-    safe_remove("dist")
-    safe_remove(RELEASE_NAME)
-
-    # Copy the specification
-    shutil.copyfile("builder/%s" % SPEC_FILE, SPEC_FILE)
-
-    if "binary" in sys.argv or "installer" in sys.argv:
+    if "binary" in sys.argv:
         # Must be run on Windows
         if sys.platform != "win32":
             raise RuntimeError("Binary should be created on Windows")
 
-        # Check what architecture we are on
-        RELEASE_BINARY = RELEASE_BINARY_32
-        if platform.architecture()[0] == "64bit":
-            RELEASE_BINARY = RELEASE_BINARY_64
+        # Make sure we remove any existing build-folders
+        safe_remove("build")
+        safe_remove("dist")
 
         # Remove any leftovers
-        safe_remove(RELEASE_BINARY)
+        safe_remove(RELEASE_NAME)
+        safe_remove(RELEASE_WIN_BIN)
 
         # Run PyInstaller and check output
+        shutil.copyfile("builder/SABnzbd.spec", "SABnzbd.spec")
         run_external_command([sys.executable, "-O", "-m", "PyInstaller", "SABnzbd.spec"])
 
         shutil.copytree("dist/SABnzbd-console", "dist/SABnzbd", dirs_exist_ok=True)
         safe_remove("dist/SABnzbd-console")
 
         # Remove unwanted DLL's
-        delete_files_glob("dist/SABnzbd/api-ms-win*.dll")
-        delete_files_glob("dist/SABnzbd/mfc140u.dll")
-        delete_files_glob("dist/SABnzbd/ucrtbase.dll")
+        shutil.rmtree("dist/SABnzbd/Pythonwin")
+        delete_files_glob("dist/SABnzbd/api-ms-win*.dll", allow_no_matches=True)
+        delete_files_glob("dist/SABnzbd/ucrtbase.dll", allow_no_matches=True)
 
-        # Remove other files we don't need
-        delete_files_glob("dist/SABnzbd/PKG-INFO")
-        delete_files_glob("dist/SABnzbd/win32ui.pyd")
-        delete_files_glob("dist/SABnzbd/winxpgui.pyd")
-
-        if "installer" in sys.argv:
-            # Needs to be run on 64 bit
-            if RELEASE_BINARY != RELEASE_BINARY_64:
-                raise RuntimeError("Installer should be created on 64bit Python")
-
-            # Compile NSIS translations
-            safe_remove("NSIS_Installer.nsi")
-            safe_remove("NSIS_Installer.nsi.tmp")
-            shutil.copyfile("builder/win/NSIS_Installer.nsi", "NSIS_Installer.nsi")
-            run_external_command([sys.executable, "tools/make_mo.py", "nsis"])
-
-            # Remove 32bit external executables
-            delete_files_glob("dist/SABnzbd/win/par2/multipar/par2j.exe")
-            delete_files_glob("dist/SABnzbd/win/unrar/UnRAR.exe")
-
-            # Run NSIS to build installer
-            run_external_command(
-                [
-                    "makensis.exe",
-                    "/V3",
-                    "/DSAB_PRODUCT=%s" % RELEASE_NAME,
-                    "/DSAB_VERSION=%s" % RELEASE_VERSION,
-                    "/DSAB_FILE=%s" % RELEASE_INSTALLER,
-                    "NSIS_Installer.nsi.tmp",
-                ]
-            )
-
-        # Rename the folder
-        shutil.copytree("dist/SABnzbd", RELEASE_NAME)
+        # Test the release
+        test_sab_binary("dist/SABnzbd/SABnzbd.exe")
 
         # Create the archive
-        run_external_command(["win/7zip/7za.exe", "a", RELEASE_BINARY, RELEASE_NAME])
+        run_external_command(["win/7zip/7za.exe", "a", RELEASE_WIN_BIN, "SABnzbd"], cwd="dist")
+        shutil.move(f"dist/{RELEASE_WIN_BIN}", RELEASE_WIN_BIN)
 
-        # Test the release, as the very last step to not mess with any release code
-        test_sab_binary("dist/SABnzbd/SABnzbd.exe")
+    if "installer" in sys.argv:
+        # Check if we have the dist folder
+        if not os.path.exists("dist/SABnzbd/SABnzbd.exe"):
+            raise FileNotFoundError("SABnzbd executable not found, run binary creation first")
+
+        # Check if we have a signed version
+        if os.path.exists(f"signed/{RELEASE_WIN_BIN}"):
+            print("Using signed version of SABnzbd binaries")
+            safe_remove("dist/SABnzbd")
+            run_external_command(["win/7zip/7za.exe", "x", "-odist", f"signed/{RELEASE_WIN_BIN}"])
+
+            # Make sure it exists
+            if not os.path.exists("dist/SABnzbd/SABnzbd.exe"):
+                raise FileNotFoundError("SABnzbd executable not found, signed zip extraction failed")
+        elif RELEASE_THIS:
+            raise FileNotFoundError("Signed SABnzbd executable not found, required for release!")
+        else:
+            print("Using unsigned version of SABnzbd binaries")
+
+        # Compile NSIS translations
+        safe_remove("NSIS_Installer.nsi")
+        safe_remove("NSIS_Installer.nsi.tmp")
+        shutil.copyfile("builder/win/NSIS_Installer.nsi", "NSIS_Installer.nsi")
+        run_external_command([sys.executable, "tools/make_mo.py", "nsis"])
+
+        # Run NSIS to build installer
+        run_external_command(
+            [
+                "makensis.exe",
+                "/V3",
+                "/DSAB_VERSION=%s" % RELEASE_VERSION,
+                "/DSAB_VERSIONKEY=%s" % ".".join(map(str, RELEASE_VERSION_TUPLE)),
+                "/DSAB_FILE=%s" % RELEASE_WIN_INSTALLER,
+                "NSIS_Installer.nsi.tmp",
+            ]
+        )
 
     if "app" in sys.argv:
         # Must be run on macOS
@@ -310,15 +329,17 @@ if __name__ == "__main__":
         # Otherwise the signature of the main application becomes invalid
         if authority:
             files_to_sign = [
-                "osx/par2/par2-sl64",
-                "osx/par2/arm64/par2",
-                "osx/par2/arm64/libomp.dylib",
-                "osx/unrar/unrar",
-                "osx/unrar/arm64/unrar",
-                "osx/7zip/7zz",
+                "macos/par2/par2",
+                "macos/unrar/unrar",
+                "macos/unrar/arm64/unrar",
+                "macos/7zip/7zz",
             ]
             for file_to_sign in files_to_sign:
-                print("Signing %s with hardended runtime" % file_to_sign)
+                # Make sure it supports the macOS versions we want first
+                test_macos_min_version(file_to_sign)
+
+                # Then sign in
+                print("Signing %s with hardened runtime" % file_to_sign)
                 run_external_command(
                     [
                         "codesign",
@@ -328,7 +349,7 @@ if __name__ == "__main__":
                         "--options",
                         "runtime",
                         "--entitlements",
-                        "builder/osx/entitlements.plist",
+                        "builder/macos/entitlements.plist",
                         "-s",
                         authority,
                         file_to_sign,
@@ -338,17 +359,21 @@ if __name__ == "__main__":
                 print("Signed %s!" % file_to_sign)
 
         # Run PyInstaller and check output
+        shutil.copyfile("builder/SABnzbd.spec", "SABnzbd.spec")
         run_external_command([sys.executable, "-O", "-m", "PyInstaller", "SABnzbd.spec"])
 
         # Make sure we created a fully universal2 release when releasing or during CI
         if RELEASE_THIS or ON_GITHUB_ACTIONS:
-            for bin_to_check in glob.glob("dist/SABnzbd.app/Contents/MacOS/**/*.so", recursive=True):
+            for bin_to_check in glob.glob("dist/SABnzbd.app/**/*.so", recursive=True):
                 print("Checking if binary is universal2: %s" % bin_to_check)
                 file_output = run_external_command(["file", bin_to_check], print_output=False)
                 # Make sure we have both arm64 and x86
                 if not ("x86_64" in file_output and "arm64" in file_output):
                     raise RuntimeError("Non-universal2 binary found!")
 
+                # Make sure it supports the macOS versions we want
+                test_macos_min_version(bin_to_check)
+
         # Only continue if we can sign
         if authority:
             # We use PyInstaller to sign the main SABnzbd executable and the SABnzbd.app
@@ -378,8 +403,8 @@ if __name__ == "__main__":
                 if authority not in sign_result or "adhoc" in sign_result or "invalid" in sign_result:
                     raise RuntimeError("Signature of %s seems invalid!" % file_to_check)
 
-            # Only notarize for real builds that we want to deploy
-            if notarization_user and notarization_pass and RELEASE_THIS:
+            # Always notarize, as newer macOS versions don't allow any code without it
+            if notarization_user and notarization_pass:
                 # Prepare zip to upload to notarization service
                 print("Creating zip to send to Apple notarization service")
                 # We need to use ditto, otherwise the signature gets lost!
@@ -413,8 +438,6 @@ if __name__ == "__main__":
                 # Staple the notarization!
                 print("Approved! Stapling the result to the app")
                 run_external_command(["xcrun", "stapler", "staple", "dist/SABnzbd.app"])
-            elif notarization_user and notarization_pass:
-                print("Notarization skipped, tag commit to trigger notarization!")
             else:
                 print("Notarization skipped, NOTARIZATION_USER or NOTARIZATION_PASS missing.")
         else:
@@ -435,15 +458,15 @@ if __name__ == "__main__":
         safe_remove(RELEASE_SRC)
 
         # Add extra files and folders need for source dist
-        extra_folders.extend(["sabnzbd/", "po/", "linux/", "tools/", "tests/"])
-        extra_files.extend(["SABnzbd.py", "requirements.txt"])
+        EXTRA_FOLDERS.extend(["sabnzbd/", "po/", "linux/", "tools/", "tests/"])
+        EXTRA_FILES.extend(["SABnzbd.py", "requirements.txt"])
 
         # Copy all folders and files to the new folder
-        for source_folder in extra_folders:
+        for source_folder in EXTRA_FOLDERS:
             shutil.copytree(source_folder, os.path.join(src_folder, source_folder), dirs_exist_ok=True)
 
         # Copy all files
-        for source_file in extra_files:
+        for source_file in EXTRA_FILES:
             shutil.copyfile(source_file, os.path.join(src_folder, source_file))
 
         # Make sure all line-endings are correct
@@ -472,7 +495,7 @@ if __name__ == "__main__":
                     tarinfo.uid = 0
                     tarinfo.gid = 0
                     if _file in ("SABnzbd.py", "Sample-PostProc.sh", "make_mo.py", "msgfmt.py"):
-                        # Force Linux/OSX scripts as executable
+                        # Force Linux/macOS scripts as executable
                         tarinfo.mode = 0o755
                     else:
                         tarinfo.mode = 0o644
@@ -483,173 +506,6 @@ 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
-        gh_token = os.environ.get("AUTOMATION_GITHUB_TOKEN", "")
-        if RELEASE_THIS and gh_token:
-            gh_obj = github.Github(gh_token)
-            gh_repo = gh_obj.get_repo("sabnzbd/sabnzbd")
-
-            # Read the release notes
-            with open(RELEASE_README, "r") as readme_file:
-                readme_data = readme_file.read()
-
-            # Pre-releases are longer than 6 characters (e.g. 3.1.0Beta1 vs 3.1.0, but also 3.0.11)
-            prerelease = len(RELEASE_VERSION) > 5
-
-            # We have to manually check if we already created this release
-            for release in gh_repo.get_releases():
-                if release.tag_name == RELEASE_VERSION:
-                    gh_release = release
-                    print("Found existing release %s" % gh_release.title)
-                    break
-            else:
-                # Did not find it, so create the release, use the GitHub tag we got as input
-                print("Creating GitHub release SABnzbd %s" % RELEASE_VERSION)
-                gh_release = gh_repo.create_git_release(
-                    tag=RELEASE_VERSION,
-                    name=RELEASE_TITLE,
-                    message=readme_data,
-                    draft=True,
-                    prerelease=prerelease,
-                )
-
-            # Fetch existing assets, as overwriting is not allowed by GitHub
-            gh_assets = gh_release.get_assets()
-
-            # Upload the assets
-            files_to_check = (
-                RELEASE_SRC,
-                RELEASE_BINARY_32,
-                RELEASE_BINARY_64,
-                RELEASE_INSTALLER,
-                RELEASE_MACOS,
-                RELEASE_README,
-            )
-            for file_to_check in files_to_check:
-                if os.path.exists(file_to_check):
-                    # Check if this file was previously uploaded
-                    if gh_assets.totalCount:
-                        for gh_asset in gh_assets:
-                            if gh_asset.name == file_to_check:
-                                print("Removing existing asset %s " % gh_asset.name)
-                                gh_asset.delete_asset()
-                    # Upload the new one
-                    print("Uploading %s to release %s" % (file_to_check, gh_release.title))
-                    gh_release.upload_asset(file_to_check)
-
-            # Check if we now have all files
-            gh_new_assets = gh_release.get_assets()
-            if gh_new_assets.totalCount:
-                all_assets = [gh_asset.name for gh_asset in gh_new_assets]
-
-                # Check if we have all files, using set-comparison
-                if set(files_to_check) == set(all_assets):
-                    print("All assets present, releasing %s" % RELEASE_VERSION)
-                    # Publish release
-                    gh_release.update_release(
-                        tag_name=RELEASE_VERSION,
-                        name=RELEASE_TITLE,
-                        message=readme_data,
-                        draft=False,
-                        prerelease=prerelease,
-                    )
-
-            # Update the website
-            gh_repo_web = gh_obj.get_repo("sabnzbd/sabnzbd.github.io")
-            # Check if the branch already exists, only create one if it doesn't
-            skip_website_update = False
-            try:
-                gh_repo_web.get_branch(RELEASE_VERSION)
-                print("Branch %s on sabnzbd/sabnzbd.github.io already exists, skipping update" % RELEASE_VERSION)
-                skip_website_update = True
-            except github.GithubException:
-                # Create a new branch to have the changes
-                sb = gh_repo_web.get_branch("master")
-                print("Creating branch %s on sabnzbd/sabnzbd.github.io" % RELEASE_VERSION)
-                new_branch = gh_repo_web.create_git_ref(ref="refs/heads/" + RELEASE_VERSION, sha=sb.commit.sha)
-
-            # Update the files
-            if not skip_website_update:
-                # We need bytes version to interact with GitHub
-                RELEASE_VERSION_BYTES = RELEASE_VERSION.encode()
-
-                # Get all the version files
-                latest_txt = gh_repo_web.get_contents("latest.txt")
-                latest_txt_items = latest_txt.decoded_content.split()
-                new_latest_txt_items = latest_txt_items[:2]
-                config_yml = gh_repo_web.get_contents("_config.yml")
-                if prerelease:
-                    # If it's a pre-release, we append to current version in latest.txt
-                    new_latest_txt_items.extend([RELEASE_VERSION_BYTES, latest_txt_items[1]])
-                    # And replace in _config.yml
-                    new_config_yml = re.sub(
-                        b"latest_testing: '[^']*'",
-                        b"latest_testing: '%s'" % RELEASE_VERSION_BYTES,
-                        config_yml.decoded_content,
-                    )
-                else:
-                    # New stable release, replace the version
-                    new_latest_txt_items[0] = RELEASE_VERSION_BYTES
-                    # And replace in _config.yml
-                    new_config_yml = re.sub(
-                        b"latest_testing: '[^']*'",
-                        b"latest_testing: ''",
-                        config_yml.decoded_content,
-                    )
-                    new_config_yml = re.sub(
-                        b"latest_stable: '[^']*'",
-                        b"latest_stable: '%s'" % RELEASE_VERSION_BYTES,
-                        new_config_yml,
-                    )
-                    # Also update the wiki-settings, these only use x.x notation
-                    new_config_yml = re.sub(
-                        b"wiki_version: '[^']*'",
-                        b"wiki_version: '%s'" % RELEASE_VERSION_BYTES[:3],
-                        new_config_yml,
-                    )
-
-                # Update the files
-                print("Updating latest.txt")
-                gh_repo_web.update_file(
-                    "latest.txt",
-                    "Release %s: latest.txt" % RELEASE_VERSION,
-                    b"\n".join(new_latest_txt_items),
-                    latest_txt.sha,
-                    RELEASE_VERSION,
-                )
-                print("Updating _config.yml")
-                gh_repo_web.update_file(
-                    "_config.yml",
-                    "Release %s: _config.yml" % RELEASE_VERSION,
-                    new_config_yml,
-                    config_yml.sha,
-                    RELEASE_VERSION,
-                )
-
-                # Create pull-request
-                print("Creating pull request in sabnzbd/sabnzbd.github.io for the update")
-                gh_repo_web.create_pull(
-                    title=RELEASE_VERSION,
-                    base="master",
-                    body="Automated update of release files",
-                    head=RELEASE_VERSION,
-                )
-        else:
-            print("To push release to GitHub, first tag the commit.")
-            print("Or missing the AUTOMATION_GITHUB_TOKEN, cannot push to GitHub without it.")
-
     # Reset!
     run_git_command(["reset", "--hard"])
     run_git_command(["clean", "-f"])

builder/release-requirements.txt

@@ -0,0 +1,2 @@
+PyGithub==2.8.1
+praw==7.8.1

builder/release.py

@@ -0,0 +1,272 @@
+#!/usr/bin/python3 -OO
+# Copyright 2008-2025 by The SABnzbd-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
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+import hashlib
+import json
+import os
+import re
+import xml.etree.ElementTree as ET
+
+import github
+import praw
+
+from constants import (
+    RELEASE_VERSION,
+    RELEASE_VERSION_BASE,
+    PRERELEASE,
+    RELEASE_SRC,
+    RELEASE_WIN_BIN_X64,
+    RELEASE_WIN_BIN_ARM64,
+    RELEASE_WIN_INSTALLER,
+    RELEASE_MACOS,
+    RELEASE_README,
+    RELEASE_THIS,
+    RELEASE_TITLE,
+    APPDATA_FILE,
+    ON_GITHUB_ACTIONS,
+)
+
+# Verify we have all assets
+files_to_check = (
+    RELEASE_SRC,
+    RELEASE_WIN_BIN_X64,
+    RELEASE_WIN_BIN_ARM64,
+    RELEASE_WIN_INSTALLER,
+    RELEASE_MACOS,
+    RELEASE_README,
+)
+for file_to_check in files_to_check:
+    if not os.path.exists(file_to_check):
+        raise RuntimeError("Not all release files are present!")
+print("All release files are present")
+
+# Verify that appdata file is updated
+if not isinstance(ET.parse(APPDATA_FILE).find(f"./releases/release[@version='{RELEASE_VERSION_BASE}']"), ET.Element):
+    release_missing = f"Could not find {RELEASE_VERSION_BASE} in {APPDATA_FILE}"
+    if RELEASE_THIS:
+        raise RuntimeError(release_missing)
+    elif ON_GITHUB_ACTIONS:
+        print(f"::warning file={APPDATA_FILE},title=Missing release::{release_missing}")
+    else:
+        print(release_missing)
+
+# Calculate hashes for Synology release
+with open(RELEASE_SRC, "rb") as inp_file:
+    source_data = inp_file.read()
+
+print("---- Synology spksrc digest hashes ---- ")
+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("----")
+
+# Check if tagged as release and check for token
+gh_token = os.environ.get("AUTOMATION_GITHUB_TOKEN", "")
+if RELEASE_THIS and gh_token:
+    gh_obj = github.Github(auth=github.Auth.Token(gh_token))
+    gh_repo = gh_obj.get_repo("sabnzbd/sabnzbd")
+
+    # Read the release notes
+    with open(RELEASE_README, "r") as readme_file:
+        readme_data = readme_file.read()
+
+    # We have to manually check if we already created this release
+    for release in gh_repo.get_releases():
+        if release.tag_name == RELEASE_VERSION:
+            gh_release = release
+            print("Found existing release %s" % gh_release.name)
+            break
+    else:
+        # Did not find it, so create the release, use the GitHub tag we got as input
+        print("Creating GitHub release SABnzbd %s" % RELEASE_VERSION)
+        gh_release = gh_repo.create_git_release(
+            tag=RELEASE_VERSION,
+            name=RELEASE_TITLE,
+            message=readme_data,
+            draft=True,
+            prerelease=PRERELEASE,
+        )
+
+    # Fetch existing assets, as overwriting is not allowed by GitHub
+    gh_assets = gh_release.get_assets()
+
+    # Upload the assets
+    for file_to_check in files_to_check:
+        if os.path.exists(file_to_check):
+            # Check if this file was previously uploaded
+            if gh_assets.totalCount:
+                for gh_asset in gh_assets:
+                    if gh_asset.name == file_to_check:
+                        print("Removing existing asset %s " % gh_asset.name)
+                        gh_asset.delete_asset()
+            # Upload the new one
+            print("Uploading %s to release %s" % (file_to_check, gh_release.name))
+            gh_release.upload_asset(file_to_check)
+
+    # Check if we now have all files
+    gh_new_assets = gh_release.get_assets()
+    if gh_new_assets.totalCount:
+        all_assets = [gh_asset.name for gh_asset in gh_new_assets]
+
+        # Check if we have all files, using set-comparison
+        if set(files_to_check) == set(all_assets):
+            print("All assets present, releasing %s" % RELEASE_VERSION)
+            # Publish release
+            gh_release.update_release(
+                tag_name=RELEASE_VERSION,
+                name=RELEASE_TITLE,
+                message=readme_data,
+                draft=False,
+                prerelease=PRERELEASE,
+            )
+
+    # Update the website
+    gh_repo_web = gh_obj.get_repo("sabnzbd/sabnzbd.github.io")
+    # Check if the branch already exists, only create one if it doesn't
+    skip_website_update = False
+    try:
+        gh_repo_web.get_branch(RELEASE_VERSION)
+        print("Branch %s on sabnzbd/sabnzbd.github.io already exists, skipping update" % RELEASE_VERSION)
+        skip_website_update = True
+    except github.GithubException:
+        # Create a new branch to have the changes
+        sb = gh_repo_web.get_branch("master")
+        print("Creating branch %s on sabnzbd/sabnzbd.github.io" % RELEASE_VERSION)
+        new_branch = gh_repo_web.create_git_ref(ref="refs/heads/" + RELEASE_VERSION, sha=sb.commit.sha)
+
+    # Update the files
+    if not skip_website_update:
+        # We need bytes version to interact with GitHub
+        RELEASE_VERSION_BYTES = RELEASE_VERSION.encode()
+
+        # Get all the version files
+        latest_txt = gh_repo_web.get_contents("latest.txt")
+        latest_txt_items = latest_txt.decoded_content.split()
+        new_latest_txt_items = latest_txt_items[:2]
+        config_yml = gh_repo_web.get_contents("_config.yml")
+        if PRERELEASE:
+            # If it's a pre-release, we append to current version in latest.txt
+            new_latest_txt_items.extend([RELEASE_VERSION_BYTES, latest_txt_items[1]])
+            # And replace in _config.yml
+            new_config_yml = re.sub(
+                b"latest_testing: '[^']*'",
+                b"latest_testing: '%s'" % RELEASE_VERSION_BYTES,
+                config_yml.decoded_content,
+            )
+        else:
+            # New stable release, replace the version
+            new_latest_txt_items[0] = RELEASE_VERSION_BYTES
+            # And replace in _config.yml
+            new_config_yml = re.sub(
+                b"latest_testing: '[^']*'",
+                b"latest_testing: ''",
+                config_yml.decoded_content,
+            )
+            new_config_yml = re.sub(
+                b"latest_stable: '[^']*'",
+                b"latest_stable: '%s'" % RELEASE_VERSION_BYTES,
+                new_config_yml,
+            )
+            # Also update the wiki-settings, these only use x.x notation
+            new_config_yml = re.sub(
+                b"wiki_version: '[^']*'",
+                b"wiki_version: '%s'" % RELEASE_VERSION_BYTES[:3],
+                new_config_yml,
+            )
+
+        # Update the files
+        print("Updating latest.txt")
+        gh_repo_web.update_file(
+            "latest.txt",
+            "Release %s: latest.txt" % RELEASE_VERSION,
+            b"\n".join(new_latest_txt_items),
+            latest_txt.sha,
+            RELEASE_VERSION,
+        )
+        print("Updating _config.yml")
+        gh_repo_web.update_file(
+            "_config.yml",
+            "Release %s: _config.yml" % RELEASE_VERSION,
+            new_config_yml,
+            config_yml.sha,
+            RELEASE_VERSION,
+        )
+
+        # Create pull-request
+        print("Creating pull request in sabnzbd/sabnzbd.github.io for the update")
+        update_pr = gh_repo_web.create_pull(
+            title="Release %s" % RELEASE_VERSION,
+            base="master",
+            body="Automated update of release files",
+            head=RELEASE_VERSION,
+        )
+
+        # Merge pull-request
+        print("Merging pull request in sabnzbd/sabnzbd.github.io for the update")
+        update_pr.merge(merge_method="squash")
+
+    # Only with GitHub success we proceed to Reddit
+    if reddit_token := os.environ.get("REDDIT_TOKEN", ""):
+        # Token format (without whitespace):
+        # {
+        #     "client_id":"XXX",
+        #     "client_secret":"XXX",
+        #     "user_agent":"SABnzbd release script",
+        #     "username":"Safihre",
+        #     "password":"XXX"
+        # }
+        credentials = json.loads(reddit_token)
+        reddit = praw.Reddit(**credentials)
+
+        subreddit_sabnzbd = reddit.subreddit("sabnzbd")
+        subreddit_usenet = reddit.subreddit("usenet")
+
+        # Read the release notes
+        with open(RELEASE_README, "r") as readme_file:
+            readme_lines = readme_file.readlines()
+
+        # Put the download link after the title
+        readme_lines[2] = "## https://sabnzbd.org/downloads\n\n"
+
+        # Use the header in the readme as title
+        title = readme_lines[0]
+        release_notes_text = "".join(readme_lines[2:])
+        print("Posting release notes to Reddit")
+
+        # Only stable releases to r/usenet
+        if not PRERELEASE:
+            # Get correct flair-id (required by r/usenet)
+            for flair in subreddit_usenet.flair.link_templates.user_selectable():
+                if flair["flair_text"] == "News":
+                    print("Posting to r/usenet")
+                    submission = subreddit_usenet.submit(
+                        title, selftext=release_notes_text, flair_id=flair["flair_template_id"]
+                    )
+                    break
+            else:
+                raise ValueError("Could not locate flair_text for posting to r/usenet")
+
+        # Post always to r/SABnzbd
+        print("Posting to r/sabnzbd")
+        subreddit_sabnzbd.submit(title, selftext=release_notes_text)
+
+    else:
+        print("Missing REDDIT_TOKEN")
+
+else:
+    print("To push release to GitHub, first tag the commit.")
+    print("Or missing the AUTOMATION_GITHUB_TOKEN, cannot push to GitHub without it.")

builder/requirements.txt

@@ -1,22 +1,19 @@
 # Basic build requirements
 # Note that not all sub-dependencies are listed, but only ones we know could cause trouble
-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
+pyinstaller==6.17.0
+packaging==25.0
+pyinstaller-hooks-contrib==2025.10
+altgraph==0.17.5
+wrapt==2.0.1
+setuptools==80.9.0
 
-# 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
-orjson==3.8.4; python_version > '3.8'
+# For the Windows build
+pefile==2024.8.26; sys_platform == 'win32'
+pywin32-ctypes==0.2.3; sys_platform == 'win32'
 
 # For the macOS build
-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'
+dmgbuild==1.6.6; sys_platform == 'darwin'
+mac-alias==2.2.3; sys_platform == 'darwin'
+macholib==1.16.4; sys_platform == 'darwin'
+ds-store==1.3.2; sys_platform == 'darwin'
+PyNaCl==1.6.1; sys_platform == 'darwin'

builder/win/NSIS_Installer.nsi

@@ -1,6 +1,6 @@
 ; -*- coding: utf-8 -*-
 ;
-; Copyright 2008-2015 The SABnzbd-Team <team@sabnzbd.org>
+; Copyright 2008-2015 The SABnzbd-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
@@ -29,10 +29,11 @@ Unicode true
 !include "nsProcess.nsh"
 !include "x64.nsh"
 !include "servicelib.nsh"
+!include "StdUtils.nsh"
 
 ;------------------------------------------------------------------
 ;
-; Marco for removing existing and the current installation
+; Macro for removing existing and the current installation
 ; It shared by the installer and the uninstaller.
 ;
 !define RemovePrev "!insertmacro RemovePrev"
@@ -42,13 +43,47 @@ Unicode true
   RMDir /r "${idir}"
 !macroend
 
+!define RemovePrevShortcuts "!insertmacro RemovePrevShortcuts"
+!macro RemovePrevShortcuts
+  ; Remove shortcuts, starting with current user ones (from old installs)
+  SetShellVarContext current
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - SafeMode.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - Documentation.url"
+  RMDir  "$SMPROGRAMS\$MUI_TEMP"
+  Delete "$SMPROGRAMS\Startup\SABnzbd.lnk"
+  Delete "$DESKTOP\SABnzbd.lnk"
+
+  SetShellVarContext all
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - SafeMode.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - Documentation.url"
+  RMDir  "$SMPROGRAMS\$MUI_TEMP"
+  Delete "$SMPROGRAMS\Startup\SABnzbd.lnk"
+  Delete "$DESKTOP\SABnzbd.lnk"
+!macroend
+
 ;------------------------------------------------------------------
 ; Define names of the product
-  Name "${SAB_PRODUCT}"
+  Name "SABnzbd ${SAB_VERSION}"
+  VIProductVersion "${SAB_VERSIONKEY}"
+  VIFileVersion "${SAB_VERSIONKEY}"
+
+  VIAddVersionKey "Comments" "SABnzbd ${SAB_VERSION}"
+  VIAddVersionKey "CompanyName" "The SABnzbd-Team"
+  VIAddVersionKey "FileDescription" "SABnzbd ${SAB_VERSION}"
+  VIAddVersionKey "FileVersion" "${SAB_VERSION}"
+  VIAddVersionKey "LegalCopyright" "The SABnzbd-Team"
+  VIAddVersionKey "ProductName" "SABnzbd ${SAB_VERSION}"
+  VIAddVersionKey "ProductVersion" "${SAB_VERSION}"
+
   OutFile "${SAB_FILE}"
   InstallDir "$PROGRAMFILES\SABnzbd"
 
-
 ;------------------------------------------------------------------
 ; Some default compiler settings (uncomment and change at will):
   SetCompress auto ; (can be off or force)
@@ -66,7 +101,6 @@ Unicode true
   RequestExecutionLevel admin
   FileErrorText "If you have no admin rights, try to install into a user directory."
 
-
 ;------------------------------------------------------------------
 ;Variables
   Var MUI_TEMP
@@ -106,9 +140,9 @@ Unicode true
   !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
 
   !insertmacro MUI_PAGE_INSTFILES
-  ; !define MUI_FINISHPAGE_RUN
-  ; !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
-  ; !define MUI_FINISHPAGE_RUN_TEXT $(MsgRunSAB)
+  !define MUI_FINISHPAGE_RUN
+  !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
+  !define MUI_FINISHPAGE_RUN_TEXT $(MsgRunSAB)
   !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
   !define MUI_FINISHPAGE_SHOWREADME_TEXT $(MsgShowRelNote)
   !define MUI_FINISHPAGE_LINK $(MsgSupportUs)
@@ -121,12 +155,21 @@ Unicode true
   !insertmacro MUI_UNPAGE_COMPONENTS
   !insertmacro MUI_UNPAGE_INSTFILES
 
+
 ;------------------------------------------------------------------
 ; Run as user-level at end of install
-; DOES NOT WORK
-; Function PageFinishRun
-;   !insertmacro UAC_AsUser_ExecShell "" "$INSTDIR\SABnzbd.exe" "" "" ""
-; FunctionEnd
+Function PageFinishRun
+  ; Check if SABnzbd service is installed
+  !insertmacro SERVICE "installed" "SABnzbd" ""
+  Pop $0 ;response
+  ${If} $0 == true
+    ; Service is installed, start the service
+    !insertmacro SERVICE "start" "SABnzbd" ""
+  ${Else}
+    ; Service not installed, run executable as user
+    ${StdUtils.ExecShellAsUser} $0 "$INSTDIR\SABnzbd.exe" "" ""
+  ${EndIf}
+FunctionEnd
 
 
 ;------------------------------------------------------------------
@@ -142,18 +185,19 @@ Unicode true
   !insertmacro MUI_LANGUAGE "Polish"
   !insertmacro MUI_LANGUAGE "Swedish"
   !insertmacro MUI_LANGUAGE "Danish"
+  !insertmacro MUI_LANGUAGE "Italian"
   !insertmacro MUI_LANGUAGE "Norwegian"
   !insertmacro MUI_LANGUAGE "Romanian"
   !insertmacro MUI_LANGUAGE "Spanish"
   !insertmacro MUI_LANGUAGE "PortugueseBR"
   !insertmacro MUI_LANGUAGE "Serbian"
+  !insertmacro MUI_LANGUAGE "Turkish"
   !insertmacro MUI_LANGUAGE "Hebrew"
   !insertmacro MUI_LANGUAGE "Russian"
   !insertmacro MUI_LANGUAGE "Czech"
   !insertmacro MUI_LANGUAGE "SimpChinese"
 
 
-
 ;------------------------------------------------------------------
 ;Reserve Files
   ;If you are using solid compression, files that are required before
@@ -169,21 +213,43 @@ Unicode true
 Section "SABnzbd" SecDummy
 
   SetOutPath "$INSTDIR"
+  SetShellVarContext all
+
+  DetailPrint $(MsgShutting)
+
+  ;------------------------------------------------------------------
+  ; Shutdown any running service
+
+  !insertmacro SERVICE "stop" "SABnzbd" ""
+
+  ;------------------------------------------------------------------
+  ; Terminate SABnzbd.exe
+  loop:
+    ${nsProcess::FindProcess} "SABnzbd.exe" $R0
+    StrCmp $R0 0 0 endcheck
+    ${nsProcess::CloseProcess} "SABnzbd.exe" $R0
+    Sleep 500
+    Goto loop
+  endcheck:
+  ${nsProcess::Unload}
 
   ;------------------------------------------------------------------
   ; Make sure old versions are gone (reg-key already read in onInt)
   StrCmp $PREV_INST_DIR "" noPrevInstallRemove
     ${RemovePrev} "$PREV_INST_DIR"
+    Goto continueSetupAfterRemove
+
+  ;------------------------------------------------------------------
+  ; Add firewall rules for new installs
   noPrevInstallRemove:
+    liteFirewallW::AddRule "$INSTDIR\SABnzbd.exe" "SABnzbd"
+    liteFirewallW::AddRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"
+
+  continueSetupAfterRemove:
 
   ; add files / whatever that need to be installed here.
   File /r "dist\SABnzbd\*"
 
-  ;------------------------------------------------------------------
-  ; Add firewall rules
-  liteFirewallW::AddRule "$INSTDIR\SABnzbd.exe" "SABnzbd"
-  liteFirewallW::AddRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"
-
   ;------------------------------------------------------------------
   ; Add to registry
   WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd" "" "$INSTDIR"
@@ -191,15 +257,20 @@ Section "SABnzbd" SecDummy
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "DisplayName" "SABnzbd ${SAB_VERSION}"
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "UninstallString" '"$INSTDIR\uninstall.exe"'
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "DisplayVersion" '${SAB_VERSION}'
-  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "Publisher" 'The SABnzbd Team'
+  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "Publisher" 'The SABnzbd-Team'
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "HelpLink" 'https://forums.sabnzbd.org/'
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "URLInfoAbout" 'https://sabnzbd.org/wiki/'
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "URLUpdateInfo" 'https://sabnzbd.org/'
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "Comments" 'The automated Usenet download tool'
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "DisplayIcon" '$INSTDIR\icons\sabnzbd.ico'
-  WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "EstimatedSize"  25674
+
+  WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "EstimatedSize"  40674
   WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "NoRepair" -1
   WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "NoModify" -1
+
+  WriteRegStr HKEY_CURRENT_USER "Software\Classes\AppUserModelId\SABnzbd" "DisplayName" "SABnzbd"
+  WriteRegStr HKEY_CURRENT_USER "Software\Classes\AppUserModelId\SABnzbd" "IconUri" '$INSTDIR\icons\sabnzbd16_32.ico'
+
   ; write out uninstaller
   WriteUninstaller "$INSTDIR\Uninstall.exe"
 
@@ -232,15 +303,13 @@ Function .onInit
   ${If} ${RunningX64}
       StrCpy $INSTDIR "$PROGRAMFILES64\SABnzbd"
   ${Else}
-      MessageBox MB_OK $(MsgOnly64bit)
-      ExecShell "open" "https://sabnzbd.org/downloads"
+      MessageBox MB_OK|MB_ICONSTOP $(MsgOnly64bit)
       Abort
   ${EndIf}
 
   ; Python 3.9 no longer supports Windows 7
   ${If} ${AtMostWin8}
-      MessageBox MB_OK $(MsgNoWin7)
-      ExecShell "open" "https://sabnzbd.org/downloads"
+      MessageBox MB_OK|MB_ICONSTOP $(MsgNoWin7)
       Abort
   ${EndIf}
 
@@ -248,7 +317,7 @@ Function .onInit
   ; Change settings based on if SAB was already installed
   ReadRegStr $PREV_INST_DIR HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd" ""
   StrCmp $PREV_INST_DIR "" noPrevInstall
-    ; We want to use the user's costom dir if he used one
+    ; We want to use the user's custom dir if he used one
     StrCmp $PREV_INST_DIR "$PROGRAMFILES\SABnzbd" noSpecialDir
       StrCmp $PREV_INST_DIR "$PROGRAMFILES64\SABnzbd" noSpecialDir
         ; Set what the user had before
@@ -257,13 +326,23 @@ Function .onInit
 
     ;------------------------------------------------------------------
     ; Check what the user has currently set for install options
+    SetShellVarContext current
+    IfFileExists "$SMPROGRAMS\Startup\SABnzbd.lnk" 0 endCheckStartupCurrent
+      SectionSetFlags ${startup} 1
+    endCheckStartupCurrent:
+    SetShellVarContext all
     IfFileExists "$SMPROGRAMS\Startup\SABnzbd.lnk" 0 endCheckStartup
       SectionSetFlags ${startup} 1
     endCheckStartup:
 
+    SetShellVarContext current
     IfFileExists "$DESKTOP\SABnzbd.lnk" endCheckDesktop 0
-      SectionSetFlags ${desktop} 0 ; SAB is installed but desktop-icon not, so uncheck it
+      ; If not present for current user, first check all user folder
+      SetShellVarContext all
+      IfFileExists "$DESKTOP\SABnzbd.lnk" endCheckDesktop 0
+        SectionSetFlags ${desktop} 0 ; SAB is installed but desktop-icon not, so uncheck it
     endCheckDesktop:
+    SetShellVarContext all
 
     Push $1
     ReadRegStr $1 HKCR ".nzb" ""  ; read current file association
@@ -275,31 +354,6 @@ Function .onInit
   ; Display language chooser
   !insertmacro MUI_LANGDLL_DISPLAY
 
-  ;------------------------------------------------------------------
-  ; make sure user terminates sabnzbd.exe or else abort
-  ;
-  loop:
-    ${nsProcess::FindProcess} "SABnzbd.exe" $R0
-    StrCmp $R0 0 0 endcheck
-    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION $(MsgCloseSab) IDOK loop IDCANCEL exitinstall
-    exitinstall:
-      ${nsProcess::Unload}
-      Abort
-  endcheck:
-
-  ;------------------------------------------------------------------
-  ; make sure both services aren't running
-  ;
-  !insertmacro SERVICE "running" "SABnzbd" ""
-  Pop $0 ;response
-  !insertmacro SERVICE "running" "SABHelper" ""
-  Pop $1
-  ${If} $0 == true
-  ${OrIf} $1 == true
-    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION $(MsgCloseSab) IDOK loop IDCANCEL exitinstall
-    ; exitinstall already defined above
-  ${EndIf}
-
   ;------------------------------------------------------------------
   ; Tell users about the service change
   ;
@@ -307,7 +361,8 @@ Function .onInit
   Pop $0 ;response
   ${If} $0 == true
     MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION $(MsgServChange) IDOK removeservices IDCANCEL exitinstall
-    ; exitinstall already defined above
+    exitinstall:
+      Abort
     removeservices:
         !insertmacro SERVICE "delete" "SABHelper" ""
         !insertmacro SERVICE "delete" "SABnzbd" ""
@@ -315,45 +370,29 @@ Function .onInit
 
 FunctionEnd
 
-;------------------------------------------------------------------
-; Show the shortcuts at end of install so user can start SABnzbd
-; This is instead of us trying to run SAB from the installer
-;
-Function .onInstSuccess
-  ExecShell "open" "$SMPROGRAMS\$STARTMENU_FOLDER"
-FunctionEnd
-
 ;--------------------------------
 ; begin uninstall settings/section
 UninstallText $(MsgUninstall)
 
 Section "un.$(MsgDelProgram)" Uninstall
 ;make sure sabnzbd.exe isn't running..if so shut it down
+  DetailPrint $(MsgShutting)
   ${nsProcess::KillProcess} "SABnzbd.exe" $R0
   ${nsProcess::Unload}
-  DetailPrint "Process Killed"
-
 
   ; add delete commands to delete whatever files/registry keys/etc you installed here.
   Delete "$INSTDIR\uninstall.exe"
   DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd"
   DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd"
+  DeleteRegKey HKEY_CURRENT_USER "Software\Classes\AppUserModelId\SABnzbd"
+  DeleteRegKey HKEY_CURRENT_USER "Software\SABnzbd"
 
   ${RemovePrev} "$INSTDIR"
+  ${RemovePrevShortcuts}
 
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - SafeMode.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - Documentation.url"
-  RMDir  "$SMPROGRAMS\$MUI_TEMP"
-
-  Delete "$SMPROGRAMS\Startup\SABnzbd.lnk"
-
-  Delete "$DESKTOP\SABnzbd.lnk"
-
-  DeleteRegKey HKEY_CURRENT_USER  "Software\SABnzbd"
+  ; Remove firewall entries
+  liteFirewallW::RemoveRule "$INSTDIR\SABnzbd.exe" "SABnzbd"
+  liteFirewallW::RemoveRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"
 
   ${unregisterExtension} ".nzb" "NZB File"
   ${RefreshShellIcons}
@@ -372,15 +411,17 @@ SectionEnd
 ;Language strings
   LangString MsgShowRelNote ${LANG_ENGLISH} "Show Release Notes"
 
-  LangString MsgSupportUs   ${LANG_ENGLISH} "Support the project, Donate!"
+  LangString MsgRunSAB      ${LANG_ENGLISH} "Run SABnzbd"
 
-  LangString MsgCloseSab    ${LANG_ENGLISH} "Please close $\"SABnzbd.exe$\" first"
+  LangString MsgSupportUs   ${LANG_ENGLISH} "Support the project, Donate!"
 
   LangString MsgServChange  ${LANG_ENGLISH} "The SABnzbd Windows Service changed in SABnzbd 3.0.0. $\nYou will need to reinstall the SABnzbd service. $\n$\nClick `OK` to remove the existing services or `Cancel` to cancel this upgrade."
 
-  LangString MsgOnly64bit   ${LANG_ENGLISH} "The installer only supports 64-bit Windows, use the standalone version to run on 32-bit Windows."
+  LangString MsgOnly64bit   ${LANG_ENGLISH} "SABnzbd only supports 64-bit Windows."
 
-  LangString MsgNoWin7      ${LANG_ENGLISH} "The installer only supports Windows 8.1 and above, use the standalone legacy version to run on older Windows version."
+  LangString MsgNoWin7      ${LANG_ENGLISH} "SABnzbd only supports Windows 8.1 and above."
+
+  LangString MsgShutting    ${LANG_ENGLISH} "Shutting down SABnzbd"
 
   LangString MsgUninstall   ${LANG_ENGLISH} "This will uninstall SABnzbd from your system"
 
@@ -394,10 +435,6 @@ SectionEnd
 
   LangString MsgDelSettings ${LANG_ENGLISH} "Delete Settings"
 
-  LangString MsgRemoveOld   ${LANG_ENGLISH} "You cannot overwrite an existing installation. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade."
-
-  LangString MsgRemoveOld2  ${LANG_ENGLISH} "Your settings and data will be preserved."
-
   LangString MsgLangCode    ${LANG_ENGLISH} "en"
 
 Function un.onInit

builder/win/nsis/Include/StdUtils.nsh

@@ -0,0 +1,501 @@
+#################################################################################
+# StdUtils plug-in for NSIS
+# Copyright (C) 2004-2018 LoRd_MuldeR <MuldeR2@GMX.de>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# http://www.gnu.org/licenses/lgpl-2.1.txt
+#################################################################################
+
+# DEVELOPER NOTES:
+# - Please see "https://github.com/lordmulder/stdutils/" for news and updates!
+# - Please see "Docs\StdUtils\StdUtils.html" for detailed function descriptions!
+# - Please see "Examples\StdUtils\StdUtilsTest.nsi" for usage examples!
+
+#################################################################################
+# FUNCTION DECLARTIONS
+#################################################################################
+
+!ifndef ___STDUTILS__NSH___
+!define ___STDUTILS__NSH___
+
+!define StdUtils.Time             '!insertmacro _StdU_Time'          #time(), as in C standard library
+!define StdUtils.GetMinutes       '!insertmacro _StdU_GetMinutes'    #GetSystemTimeAsFileTime(), returns the number of minutes
+!define StdUtils.GetHours         '!insertmacro _StdU_GetHours'      #GetSystemTimeAsFileTime(), returns the number of hours
+!define StdUtils.GetDays          '!insertmacro _StdU_GetDays'       #GetSystemTimeAsFileTime(), returns the number of days
+!define StdUtils.Rand             '!insertmacro _StdU_Rand'          #rand(), as in C standard library
+!define StdUtils.RandMax          '!insertmacro _StdU_RandMax'       #rand(), as in C standard library, with maximum value
+!define StdUtils.RandMinMax       '!insertmacro _StdU_RandMinMax'    #rand(), as in C standard library, with minimum/maximum value
+!define StdUtils.RandList         '!insertmacro _StdU_RandList'      #rand(), as in C standard library, with list support
+!define StdUtils.RandBytes        '!insertmacro _StdU_RandBytes'     #Generates random bytes, returned as Base64-encoded string
+!define StdUtils.FormatStr        '!insertmacro _StdU_FormatStr'     #sprintf(), as in C standard library, one '%d' placeholder
+!define StdUtils.FormatStr2       '!insertmacro _StdU_FormatStr2'    #sprintf(), as in C standard library, two '%d' placeholders
+!define StdUtils.FormatStr3       '!insertmacro _StdU_FormatStr3'    #sprintf(), as in C standard library, three '%d' placeholders
+!define StdUtils.ScanStr          '!insertmacro _StdU_ScanStr'       #sscanf(), as in C standard library, one '%d' placeholder
+!define StdUtils.ScanStr2         '!insertmacro _StdU_ScanStr2'      #sscanf(), as in C standard library, two '%d' placeholders
+!define StdUtils.ScanStr3         '!insertmacro _StdU_ScanStr3'      #sscanf(), as in C standard library, three '%d' placeholders
+!define StdUtils.TrimStr          '!insertmacro _StdU_TrimStr'       #Remove whitspaces from string, left and right
+!define StdUtils.TrimStrLeft      '!insertmacro _StdU_TrimStrLeft'   #Remove whitspaces from string, left side only
+!define StdUtils.TrimStrRight     '!insertmacro _StdU_TrimStrRight'  #Remove whitspaces from string, right side only
+!define StdUtils.RevStr           '!insertmacro _StdU_RevStr'        #Reverse a string, e.g. "reverse me" <-> "em esrever"
+!define StdUtils.ValidFileName    '!insertmacro _StdU_ValidFileName' #Test whether string is a valid file name - no paths allowed
+!define StdUtils.ValidPathSpec    '!insertmacro _StdU_ValidPathSpec' #Test whether string is a valid full(!) path specification
+!define StdUtils.ValidDomainName  '!insertmacro _StdU_ValidDomain'   #Test whether string is a valid host name or domain name
+!define StdUtils.StrToUtf8        '!insertmacro _StdU_StrToUtf8'     #Convert string from Unicode (UTF-16) or ANSI to UTF-8 bytes
+!define StdUtils.StrFromUtf8      '!insertmacro _StdU_StrFromUtf8'   #Convert string from UTF-8 bytes to Unicode (UTF-16) or ANSI
+!define StdUtils.SHFileMove       '!insertmacro _StdU_SHFileMove'    #SHFileOperation(), using the FO_MOVE operation
+!define StdUtils.SHFileCopy       '!insertmacro _StdU_SHFileCopy'    #SHFileOperation(), using the FO_COPY operation
+!define StdUtils.AppendToFile     '!insertmacro _StdU_AppendToFile'  #Append contents of an existing file to another file
+!define StdUtils.ExecShellAsUser  '!insertmacro _StdU_ExecShlUser'   #ShellExecute() as NON-elevated user from elevated installer
+!define StdUtils.InvokeShellVerb  '!insertmacro _StdU_InvkeShlVrb'   #Invokes a "shell verb", e.g. for pinning items to the taskbar
+!define StdUtils.ExecShellWaitEx  '!insertmacro _StdU_ExecShlWaitEx' #ShellExecuteEx(), returns the handle of the new process
+!define StdUtils.WaitForProcEx    '!insertmacro _StdU_WaitForProcEx' #WaitForSingleObject(), e.g. to wait for a running process
+!define StdUtils.GetParameter     '!insertmacro _StdU_GetParameter'  #Get the value of a specific command-line option
+!define StdUtils.TestParameter    '!insertmacro _StdU_TestParameter' #Test whether a specific command-line option has been set
+!define StdUtils.ParameterCnt     '!insertmacro _StdU_ParameterCnt'  #Get number of command-line tokens, similar to argc in main()
+!define StdUtils.ParameterStr     '!insertmacro _StdU_ParameterStr'  #Get the n-th command-line token, similar to argv[i] in main()
+!define StdUtils.GetAllParameters '!insertmacro _StdU_GetAllParams'  #Get complete command-line, but without executable name
+!define StdUtils.GetRealOSVersion '!insertmacro _StdU_GetRealOSVer'  #Get the *real* Windows version number, even on Windows 8.1+
+!define StdUtils.GetRealOSBuildNo '!insertmacro _StdU_GetRealOSBld'  #Get the *real* Windows build number, even on Windows 8.1+
+!define StdUtils.GetRealOSName    '!insertmacro _StdU_GetRealOSStr'  #Get the *real* Windows version, as a "friendly" name
+!define StdUtils.GetOSEdition     '!insertmacro _StdU_GetOSEdition'  #Get the Windows edition, i.e. "workstation" or "server"
+!define StdUtils.GetOSReleaseId   '!insertmacro _StdU_GetOSRelIdNo'  #Get the Windows release identifier (on Windows 10)
+!define StdUtils.GetOSReleaseName '!insertmacro _StdU_GetOSRelIdStr' #Get the Windows release (on Windows 10), as a "friendly" name
+!define StdUtils.VerifyOSVersion  '!insertmacro _StdU_VrfyRealOSVer' #Compare *real* operating system to an expected version number
+!define StdUtils.VerifyOSBuildNo  '!insertmacro _StdU_VrfyRealOSBld' #Compare *real* operating system to an expected build number
+!define StdUtils.HashText         '!insertmacro _StdU_HashText'      #Compute hash from text string (CRC32, MD5, SHA1/2/3, BLAKE2)
+!define StdUtils.HashFile         '!insertmacro _StdU_HashFile'      #Compute hash from file (CRC32, MD5, SHA1/2/3, BLAKE2)
+!define StdUtils.NormalizePath    '!insertmacro _StdU_NormalizePath' #Simplifies the path to produce a direct, well-formed path
+!define StdUtils.GetParentPath    '!insertmacro _StdU_GetParentPath' #Get parent path by removing the last component from the path
+!define StdUtils.SplitPath        '!insertmacro _StdU_SplitPath'     #Split the components of the given path
+!define StdUtils.GetDrivePart     '!insertmacro _StdU_GetDrivePart'  #Get drive component of path
+!define StdUtils.GetDirectoryPart '!insertmacro _StdU_GetDirPart'    #Get directory component of path
+!define StdUtils.GetFileNamePart  '!insertmacro _StdU_GetFNamePart'  #Get file name component of path
+!define StdUtils.GetExtensionPart '!insertmacro _StdU_GetExtnPart'   #Get file extension component of path
+!define StdUtils.TimerCreate      '!insertmacro _StdU_TimerCreate'   #Create a new event-timer that will be triggered periodically
+!define StdUtils.TimerDestroy     '!insertmacro _StdU_TimerDestroy'  #Destroy a running timer created with TimerCreate()
+!define StdUtils.ProtectStr       '!insertmacro _StdU_PrtctStr'      #Protect a given String using Windows' DPAPI
+!define StdUtils.UnprotectStr     '!insertmacro _StdU_UnprtctStr'    #Unprotect a string that was protected via ProtectStr()
+!define StdUtils.GetLibVersion    '!insertmacro _StdU_GetLibVersion' #Get the current StdUtils library version (for debugging)
+!define StdUtils.SetVerbose       '!insertmacro _StdU_SetVerbose'    #Enable or disable "verbose" mode (for debugging)
+
+
+#################################################################################
+# MACRO DEFINITIONS
+#################################################################################
+
+!macro _StdU_Time out
+	StdUtils::Time /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetMinutes out
+	StdUtils::GetMinutes /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetHours out
+	StdUtils::GetHours /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetDays out
+	StdUtils::GetDays /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_Rand out
+	StdUtils::Rand /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_RandMax out max
+	push ${max}
+	StdUtils::RandMax /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_RandMinMax out min max
+	push ${min}
+	push ${max}
+	StdUtils::RandMinMax /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_RandList count max
+	push ${max}
+	push ${count}
+	StdUtils::RandList /NOUNLOAD
+!macroend
+
+!macro _StdU_RandBytes out count
+	push ${count}
+	StdUtils::RandBytes /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_FormatStr out format val
+	push `${format}`
+	push ${val}
+	StdUtils::FormatStr /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_FormatStr2 out format val1 val2
+	push `${format}`
+	push ${val1}
+	push ${val2}
+	StdUtils::FormatStr2 /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_FormatStr3 out format val1 val2 val3
+	push `${format}`
+	push ${val1}
+	push ${val2}
+	push ${val3}
+	StdUtils::FormatStr3 /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ScanStr out format input default
+	push `${format}`
+	push `${input}`
+	push ${default}
+	StdUtils::ScanStr /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ScanStr2 out1 out2 format input default1 default2
+	push `${format}`
+	push `${input}`
+	push ${default1}
+	push ${default2}
+	StdUtils::ScanStr2 /NOUNLOAD
+	pop ${out1}
+	pop ${out2}
+!macroend
+
+!macro _StdU_ScanStr3 out1 out2 out3 format input default1 default2 default3
+	push `${format}`
+	push `${input}`
+	push ${default1}
+	push ${default2}
+	push ${default3}
+	StdUtils::ScanStr3 /NOUNLOAD
+	pop ${out1}
+	pop ${out2}
+	pop ${out3}
+!macroend
+
+!macro _StdU_TrimStr var
+	push ${var}
+	StdUtils::TrimStr /NOUNLOAD
+	pop ${var}
+!macroend
+
+!macro _StdU_TrimStrLeft var
+	push ${var}
+	StdUtils::TrimStrLeft /NOUNLOAD
+	pop ${var}
+!macroend
+
+!macro _StdU_TrimStrRight var
+	push ${var}
+	StdUtils::TrimStrRight /NOUNLOAD
+	pop ${var}
+!macroend
+
+!macro _StdU_RevStr var
+	push ${var}
+	StdUtils::RevStr /NOUNLOAD
+	pop ${var}
+!macroend
+
+!macro _StdU_ValidFileName out test
+	push `${test}`
+	StdUtils::ValidFileName /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ValidPathSpec out test
+	push `${test}`
+	StdUtils::ValidPathSpec /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ValidDomain out test
+	push `${test}`
+	StdUtils::ValidDomainName /NOUNLOAD
+	pop ${out}
+!macroend
+
+
+!macro _StdU_StrToUtf8 out str
+	push `${str}`
+	StdUtils::StrToUtf8 /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_StrFromUtf8 out trnc str
+	push ${trnc}
+	push `${str}`
+	StdUtils::StrFromUtf8 /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_SHFileMove out from to hwnd
+	push `${from}`
+	push `${to}`
+	push ${hwnd}
+	StdUtils::SHFileMove /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_SHFileCopy out from to hwnd
+	push `${from}`
+	push `${to}`
+	push ${hwnd}
+	StdUtils::SHFileCopy /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_AppendToFile out from dest offset maxlen
+	push `${from}`
+	push `${dest}`
+	push ${offset}
+	push ${maxlen}
+	StdUtils::AppendToFile /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ExecShlUser out file verb args
+	push `${file}`
+	push `${verb}`
+	push `${args}`
+	StdUtils::ExecShellAsUser /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_InvkeShlVrb out path file verb_id
+	push "${path}"
+	push "${file}"
+	push ${verb_id}
+	StdUtils::InvokeShellVerb /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ExecShlWaitEx out_res out_val file verb args
+	push `${file}`
+	push `${verb}`
+	push `${args}`
+	StdUtils::ExecShellWaitEx /NOUNLOAD
+	pop ${out_res}
+	pop ${out_val}
+!macroend
+
+!macro _StdU_WaitForProcEx out handle
+	push `${handle}`
+	StdUtils::WaitForProcEx /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetParameter out name default
+	push `${name}`
+	push `${default}`
+	StdUtils::GetParameter /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_TestParameter out name
+	push `${name}`
+	StdUtils::TestParameter /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ParameterCnt out
+	StdUtils::ParameterCnt /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ParameterStr out index
+	push ${index}
+	StdUtils::ParameterStr /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetAllParams out truncate
+	push `${truncate}`
+	StdUtils::GetAllParameters /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetRealOSVer out_major out_minor out_spack
+	StdUtils::GetRealOsVersion /NOUNLOAD
+	pop ${out_major}
+	pop ${out_minor}
+	pop ${out_spack}
+!macroend
+
+!macro _StdU_GetRealOSBld out
+	StdUtils::GetRealOsBuildNo /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetRealOSStr out
+	StdUtils::GetRealOsName /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_VrfyRealOSVer out major minor spack
+	push `${major}`
+	push `${minor}`
+	push `${spack}`
+	StdUtils::VerifyRealOsVersion /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_VrfyRealOSBld out build
+	push `${build}`
+	StdUtils::VerifyRealOsBuildNo /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetOSEdition out
+	StdUtils::GetOsEdition /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetOSRelIdNo out
+	StdUtils::GetOsReleaseId /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetOSRelIdStr out
+	StdUtils::GetOsReleaseName /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_HashText out type text
+	push `${type}`
+	push `${text}`
+	StdUtils::HashText /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_HashFile out type file
+	push `${type}`
+	push `${file}`
+	StdUtils::HashFile /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_NormalizePath out path
+	push `${path}`
+	StdUtils::NormalizePath /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetParentPath out path
+	push `${path}`
+	StdUtils::GetParentPath /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_SplitPath out_drive out_dir out_fname out_ext path
+	push `${path}`
+	StdUtils::SplitPath /NOUNLOAD
+	pop ${out_drive}
+	pop ${out_dir}
+	pop ${out_fname}
+	pop ${out_ext}
+!macroend
+
+!macro _StdU_GetDrivePart out path
+	push `${path}`
+	StdUtils::GetDrivePart /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetDirPart out path
+	push `${path}`
+	StdUtils::GetDirectoryPart /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetFNamePart out path
+	push `${path}`
+	StdUtils::GetFileNamePart /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetExtnPart out path
+	push `${path}`
+	StdUtils::GetExtensionPart /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_TimerCreate out callback interval
+	GetFunctionAddress ${out} ${callback}
+	push ${out}
+	push ${interval}
+	StdUtils::TimerCreate /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_TimerDestroy out timer_id
+	push ${timer_id}
+	StdUtils::TimerDestroy /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_PrtctStr out dpsc salt text
+	push `${dpsc}`
+	push `${salt}`
+	push `${text}`
+	StdUtils::ProtectStr /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_UnprtctStr out trnc salt data
+	push `${trnc}`
+	push `${salt}`
+	push `${data}`
+	StdUtils::UnprotectStr /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetLibVersion out_ver out_tst
+	StdUtils::GetLibVersion /NOUNLOAD
+	pop ${out_ver}
+	pop ${out_tst}
+!macroend
+
+!macro _StdU_SetVerbose enable
+	Push ${enable}
+	StdUtils::SetVerboseMode /NOUNLOAD
+!macroend
+
+
+#################################################################################
+# MAGIC NUMBERS
+#################################################################################
+
+!define StdUtils.Const.ShellVerb.PinToTaskbar     0
+!define StdUtils.Const.ShellVerb.UnpinFromTaskbar 1
+!define StdUtils.Const.ShellVerb.PinToStart       2
+!define StdUtils.Const.ShellVerb.UnpinFromStart   3
+
+!endif # !___STDUTILS__NSH___

email/badfetch-en.tmpl

@@ -1,7 +1,7 @@
 ##
 ## Bad URL Fetch Email template for SABnzbd
 ## This a Cheetah template
-## Documentation: http://sabnzbd.wikidot.com/email-templates
+## Documentation: https://sabnzbd.org/wiki/extra/email-templates
 ##
 ## Newlines and whitespace are significant!
 ##

email/email-en.tmpl

@@ -1,7 +1,7 @@
 ##
 ## Default Email template for SABnzbd
 ## This a Cheetah template
-## Documentation: http://sabnzbd.wikidot.com/email-templates
+## Documentation: https://sabnzbd.org/wiki/extra/email-templates
 ##
 ## Newlines and whitespace are significant!
 ##

email/rss-en.tmpl

@@ -1,7 +1,7 @@
 ##
 ## RSS Email template for SABnzbd
 ## This a Cheetah template
-## Documentation: http://sabnzbd.wikidot.com/email-templates
+## Documentation: https://sabnzbd.org/wiki/extra/email-templates
 ##
 ## Newlines and whitespace are significant!
 ##

interfaces/Config/templates/_inc_footer_uc.tmpl

@@ -12,13 +12,13 @@
                     <div class="modal-body">
                     </div>
                     <div class="modal-footer">
-                        <!--#if not $windows#-->
+
                         <div class="checkbox">
                             <label>
                                 <input type="checkbox" id="show_hidden_folders"> <span>$T('hiddenFolders')</span>
                             </label>
                         </div>
-                        <!--#end if#-->
+
                         <button type="button" class="btn btn-danger" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span> $T('cancel')</button>
                         <button type="button" class="btn btn-default" id="filebrowser_modal_accept"><span class="glyphicon glyphicon-ok"></span> $T('rss-accept')</button>
                     </div>

interfaces/Config/templates/_inc_header_uc.tmpl

@@ -34,6 +34,9 @@
     <link rel="stylesheet" type="text/css" href="${root}staticcfg/bootstrap/css/bootstrap.min.css?v=$version" />
     <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/chartist.min.css" />
     <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/style.css?v=$version" />
+    <!--#if $color_scheme not in ('Light', '') #-->
+    <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/${color_scheme}.css?v=$version"/>
+    <!--#end if#-->
 
     <link rel="shortcut icon" href="${root}staticcfg/ico/favicon.ico?v=$version" />
 
@@ -67,27 +70,7 @@
     <script type="text/javascript" src="${root}staticcfg/js/script.js?v=$version"></script>
     <script type="text/javascript">
         // Set default functions for the autocomplete everywhere
-        \$.extend(\$.fn.typeahead.defaults, {
-            source: function (query, process) {
-                // 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;
-                }
-                // Get info from the API
-                return \$.get(folderBrowseUrl + '&compact=1&term=' + query, function (data) {
-                    return process(data);
-                });
-            },
-            updater: function(item) {
-                // Is it a relative path?
-                if(item.indexOf(this.\$element.data('initialdir')) === 0) {
-                    // Remove start
-                    return item.replace(this.\$element.data('initialdir')+folderSeperator, '');
-                }
-                // Full path
-                return item
-            }
-        })
+
 
         // to top right away
         if(window.location.hash) {
@@ -109,7 +92,7 @@
                 <span class="icon-bar"></span>
             </button>
 
-            <a class="navbar-logo navbar-logo-small" href="${root}" title="$T('Home')">
+            <a class="navbar-logo navbar-logo-small" href="${root}" title="$T('Home')" data-placement="bottom">
                 #include $webdir + "/staticcfg/images/logo-small.svg"#
             </a>
         </div>
@@ -181,7 +164,7 @@
                     </a>
                 </li>
                 <li>
-                    <a href="$helpuri$help_uri" target="_blank">
+                    <a href="$help_uri" target="_blank">
                         <span class="glyphicon glyphicon-question-sign"></span>
                         <strong>$T('menu-help')</strong>
                     </a>

interfaces/Config/templates/config.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Config"#-->
-<!--#set global $help_uri="configuration/3.7/configure"#-->
+<!--#set global $help_uri = $confighelpuri + "configure"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#from sabnzbd.encoding import CODEPAGE#-->
@@ -25,59 +25,31 @@
                 </tr>
                 <tr>
                     <th scope="row">$T('pythonVersion'): </th>
-                    <td>$sys.version[:120] [$CODEPAGE]</td>
+                    <td>$sys.version [$CODEPAGE]</td>
                 </tr>
                 <tr>
                     <th scope="row">OpenSSL:</th>
-                    <td>
-                        $ssl_version
-                    </td>
+                    <td>$ssl_version</td>
                 </tr>
-                <!--#if not $certificate_validation#-->
-                <tr>
-                    <th scope="row"></th>
-                    <td>
-                        <span class="label label-danger">$T('warning')</span> $T('explain-nosslcontext')
-                    </td>
-                </tr>
-                <!--#end if#-->
                 <!--#if not $windows and not $macos#-->
                 <tr>
-                    <th scope="row">$T('opt-multicore-par2')</th>
+                    <th scope="row">Par2cmdline-turbo:</th>
                     <td>
-                        <!--#if $have_mt_par2#-->
+                        <!--#if $have_par2_turbo#-->
                         <span class="glyphicon glyphicon-ok"></span>
                         <!--#else#-->
-                        <span class="label label-warning">$T('notAvailable')</span> $T('explain-getpar2mt')
-                        <a href="${helpuri}installation/multicore-par2" target="_blank">${helpuri}installation/multicore-par2</a>
+                        <span class="label label-warning">$T('notAvailable')</span> $T('explain-getpar2turbo')<br>
+                        <a href="https://sabnzbd.org/wiki/installation/par2cmdline-turbo" target="_blank">https://sabnzbd.org/wiki/installation/par2cmdline-turbo</a>
                         <!--#end if#-->
                     </td>
                 </tr>
                 <!--#end if#-->
-                <!--#if not $have_sabyenc#-->
-                <tr>
-                    <th scope="row">SABYenc:</th>
-                    <td>
-                        <span class="label label-danger">$T('notAvailable')</span>
-                        <a href="$helpuri$help_uri#no_sabyenc" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
-                    </td>
-                </tr>
-                <!--#end if#-->
-                <!--#if not $have_unzip and not $have_7zip #-->
-                <tr>
-                    <th scope="row">$T('opt-enable_unzip'):</th>
-                    <td>
-                        <span class="label label-warning">$T('notAvailable')</span>
-                        <a href="${helpuri}installation/install-off-modules#toc8" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
-                    </td>
-                </tr>
-                <!--#end if#-->
                 <!--#if not $have_7zip #-->
                 <tr>
                     <th scope="row">$T('opt-enable_7zip'):</th>
                     <td>
                         <span class="label label-warning">$T('notAvailable')</span>
-                        <a href="${helpuri}installation/install-off-modules#toc8" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+                        <a href="https://sabnzbd.org/wiki/installation/install-off-modules#toc8" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
                     </td>
                 </tr>
                 <!--#end if#-->
@@ -106,8 +78,8 @@
                     <td><a href="https://github.com/sabnzbd/sabnzbd" target="_blank">https://github.com/sabnzbd/sabnzbd</a></td>
                 </tr>
                 <tr>
-                    <th scope="row">$T('menu-irc') </th>
-                    <td><a href="irc://irc.synirc.net/#sabnzbd"><i>#sabnzbd</i> on <i>irc.synirc.net</i></a> $T('or') (<a href="http://sabnzbd.org/live-chat/" target="_blank">webchat</a>)</td>
+                    <th scope="row">$T('menu-live-chat') </th>
+                    <td><a href="https://sabnzbd.org/live-chat/" target="_blank">https://sabnzbd.org/live-chat/</a> (IRC &amp; Discord)</td>
                 </tr>
                 <tr>
                     <th scope="row">$T('menu-issues') </th>
@@ -123,8 +95,8 @@
 </div>
 
 <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>
+    <div class="padding">
+        <h5 class="copyright">Copyright &copy; 2007-2025 by The SABnzbd-Team (<a href="https://sabnzbd.org/" target="_blank">sabnzbd.org</a>)</h5>
         <p class="copyright"><small>$T('yourRights')</small></p>
     </div>
 

interfaces/Config/templates/config_cat.tmpl

@@ -1,15 +1,16 @@
 <!--#set global $pane="Categories"#-->
-<!--#set global $help_uri="configuration/3.7/categories"#-->
+<!--#set global $help_uri = $confighelpuri + "categories"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
     <div class="section">
-        <div class="padTable"> <a class="main-helplink" href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+        <div class="padTable">
+            <a class="main-helplink" href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
             <p>$T('explain-catTags2')<br/>$T('explain-catTags')</p>
             <hr>
             <h5 class="darkred"><strong>$T('explain-relFolder'):</strong> <span class="path">$defdir</span></h5>
             <!--#for $cur, $slot in enumerate($slotinfo)#-->
                 <!--#set $cansort = $slot.name != '*' and $slot.name != ''#-->
-                <form action="save" method="get" <!--#if $cansort#-->class="sorting-row"<!--#end if#-->>
+                <form action="save" method="post" <!--#if $cansort#-->class="sorting-row"<!--#end if#-->>
                     <table class="catTable">
                         <!--#if $cur == 0#-->
                         <tr>
@@ -104,29 +105,29 @@
 </div>
 <script type="text/javascript" src="${root}staticcfg/js/jquery-ui.min.js"></script>
 <script type="text/javascript">
-    \$(document).ready(function() {
-        \$('.delCat').click(function() {
-            var theForm = \$(this).closest("form");
+    jQuery(document).ready(function() {
+        jQuery('.delCat').click(function() {
+            var theForm = jQuery(this).closest("form");
             theForm.attr("action", "delete").submit();
         });
 
         // Add autocomplete and file-browser
-        \$('.fileBrowserSmall').typeahead({appendTo: 'body'}).fileBrowser();
+        jQuery('.fileBrowserSmall').typeahead({appendTo: 'body'}).fileBrowser();
 
         // Make categories sortable
-        \$('.padTable').sortable({
+        jQuery('.padTable').sortable({
             items: '.sorting-row',
             containment: '.colmask',
             axis: 'y',
             update: function(event, ui) {
-                \$('.Categories form.sorting-row').each(function(index, elm) {
+                jQuery('.Categories form.sorting-row').each(function(index, elm) {
                     // Update order of all elements
-                    if(index != elm.order.value) {
+                    if(index !== elm.order.value) {
                         elm.order.value = index
                         // Submit changed order
                         var data = {}
-                        \$(elm).extractFormDataTo(data);
-                        \$.ajax({
+                        jQuery(elm).extractFormDataTo(data);
+                        jQuery.ajax({
                             type: "GET",
                             url: window.location.pathname + 'save',
                             data: data,

interfaces/Config/templates/config_folders.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Folders"#-->
-<!--#set global $help_uri="configuration/3.7/folders"#-->
+<!--#set global $help_uri = $confighelpuri + "folders"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -14,7 +14,7 @@
     <input type="hidden" id="ajax" name="ajax" value="1" />
     <div class="section">
         <div class="col2">
-            <h3>$T('userFolders') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('userFolders') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <p>$T('explain-folderConfig')</p>
         </div><!-- /col2 -->
         <div class="col1">
@@ -35,7 +35,8 @@
                 <div class="field-pair">
                     <label class="config" for="complete_dir">$T('opt-complete_dir')</label>
                     <input type="text" name="complete_dir" id="complete_dir" value="$complete_dir" data-initialdir="$my_home" />
-                    <span class="desc">$T('explain-complete_dir')</span>
+                    <a class="btn btn-default" href="${root}config/sorting/"><span class="glyphicon glyphicon-sort-by-alphabet"></span> $T('cmenu-sorting')</a>
+                    <span class="desc">$T('explain-complete_dir') <br/> $T('explain-complete_dir-sorting')</span>
                 </div>
                 <div class="field-pair advanced-settings">
                     <label class="config" for="complete_free">$T('opt-complete_free')</label>
@@ -57,7 +58,7 @@
                 <div class="field-pair">
                     <label class="config" for="dirscan_dir">$T('opt-dirscan_dir')</label>
                     <input type="text" name="dirscan_dir" id="dirscan_dir" value="$dirscan_dir" data-initialdir="$my_home" />
-                    <span class="desc">$T('explain-dirscan_dir')</span>
+                    <span class="desc">$T('explain-dirscan_dir').replace(".nzb", $file_exts)</span>
                 </div>
                 <div class="field-pair advanced-settings">
                     <label class="config" for="dirscan_speed">$T('opt-dirscan_speed')</label>
@@ -76,7 +77,7 @@
                 </div>
                 <div class="field-pair advanced-settings">
                     <label class="config" for="password_file">$T('opt-password_file')</label>
-                    <input type="text" name="password_file" id="password_file" value="$password_file" />
+                    <input type="text" name="password_file" id="password_file" value="$password_file" class="fileBrowserField" data-initialdir="$my_home" data-files="1" />
                     <span class="desc">$T('explain-password_file')</span>
                 </div>
                 <div class="field-pair">
@@ -90,7 +91,7 @@
     </div><!-- /section -->
     <div class="section advanced-settings">
         <div class="col2">
-            <h3>$T('systemFolders') <a href="$helpuri$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('systemFolders') <a href="$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <p>$T('explain-folderConfig')</p>
         </div><!-- /col2 -->
         <div class="col1">
@@ -112,6 +113,7 @@
                 <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" />
+                    <a class="btn btn-default" id="purge_log_files" href="${root}"><span class="glyphicon glyphicon-trash"></span> $T('purge_log_files')</a>
                     <span class="desc">$T('explain-log_dir')</span>
                 </div>
                 <div class="field-pair">
@@ -131,7 +133,19 @@
 <script type="text/javascript">
     jQuery(document).ready(function() {
         // Add autocomplete and file-browser
-        \$('.col1 input[name$="_dir"]').typeahead().fileBrowser();
+        jQuery('.col1 input[name$="_dir"], #password_file').typeahead().fileBrowser();
+
+        jQuery('#purge_log_files').click(function () {
+            if ( confirm("$T('confirm')") ) {
+                $.ajax({
+                    type: "POST",
+                    url: "../../api",
+                    data: {mode: 'config', name: 'purge_log_files', output: 'json', apikey: jQuery('#apikey').val()}
+                })
+            } else {
+                return false;
+            }
+        })
     })
 </script>
 <!--#include $webdir + "/_inc_footer_uc.tmpl"#-->

interfaces/Config/templates/config_general.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="General"#-->
-<!--#set global $help_uri="configuration/3.7/general"#-->
+<!--#set global $help_uri = $confighelpuri + "general"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -14,7 +14,7 @@
         <input type="hidden" name="output" value="json" />
         <div class="section">
             <div class="col2">
-                <h3>$T('webServer') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('webServer') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
                 <p><b>$T('restartRequired')</b></p>
             </div><!-- /col2 -->
             <div class="col1">
@@ -26,7 +26,7 @@
                     </div>
                     <div class="field-pair">
                         <label class="config" for="port">$T('opt-port')</label>
-                        <input type="number" name="port" id="port" value="$port" size="8" data-original="$port" />
+                        <input type="number" name="port" id="port" value="$port" size="8" data-original="$port" min="0" max="65535" />
                         <span class="desc">$T('explain-port')</span>
                     </div>
                     <div class="field-pair">
@@ -35,7 +35,7 @@
                         <span class="desc">$T('explain-enable_https')</span>
                         <span class="desc"><span class="label label-warning">$T('warning').upper()</span> $T('explain-enable_https_warning')</span>
                     </div>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
                         <label class="config" for="web_dir">$T('opt-web_dir')</label>
                         <select name="web_dir" id="web_dir">
                         <!--#for $webline in $web_list#-->
@@ -69,12 +69,12 @@
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="https_port">$T('opt-https_port')</label>
-                        <input type="number" name="https_port" id="https_port" value="$https_port" size="8" data-original="$https_port" />
+                        <input type="number" name="https_port" id="https_port" value="$https_port" size="8" data-original="$https_port" min="0" max="65535" />
                         <span class="desc">$T('explain-https_port')</span>
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="https_cert">$T('opt-https_cert')</label>
-                        <input type="text" name="https_cert" id="https_cert" value="$https_cert" />
+                        <input type="text" name="https_cert" id="https_cert" value="$https_cert" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
                         <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
                             <span class="glyphicon glyphicon-repeat"></span>
                         </button>
@@ -82,7 +82,7 @@
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="https_key">$T('opt-https_key')</label>
-                        <input type="text" name="https_key" id="https_key" value="$https_key" />
+                        <input type="text" name="https_key" id="https_key" value="$https_key" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
                         <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
                             <span class="glyphicon glyphicon-repeat"></span>
                         </button>
@@ -90,7 +90,7 @@
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="https_chain">$T('opt-https_chain')</label>
-                        <input type="text" name="https_chain" id="https_chain" value="$https_chain" />
+                        <input type="text" name="https_chain" id="https_chain" value="$https_chain" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
                         <span class="desc">$T('explain-https_chain')</span>
                     </div>
                     <div class="field-pair">
@@ -102,7 +102,7 @@
         </div>
         <div class="section">
             <div class="col2">
-                <h3>$T('security') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('security') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
                 <p><b>$T('restartRequired')</b></p>
             </div><!-- /col2 -->
             <div class="col1">
@@ -136,14 +136,14 @@
                     </div>
                     <div class="field-pair">
                         <label class="config" for="apikey_display">$T('opt-apikey')</label>
-                        <input type="text" id="apikey_display" class="fileBrowserField" value="$apikey" readonly />
+                        <input type="text" id="apikey_display" value="$apikey" readonly />
                         <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$apikey" ><span class="glyphicon glyphicon-qrcode"></span></button>
                         <button class="btn btn-default generate_key" id="generate_new_apikey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
                         <span class="desc">$T('explain-apikey')</span>
                     </div>
                     <div class="field-pair">
                         <label class="config" for="nzbkey">$T('opt-nzbkey')</label>
-                        <input type="text" id="nzbkey" class="fileBrowserField" value="$nzb_key" readonly />
+                        <input type="text" id="nzbkey" value="$nzb_key" readonly />
                         <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$nzb_key" ><span class="glyphicon glyphicon-qrcode"></span></button>
                         <button class="btn btn-default generate_key" id="generate_new_nzbkey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
                         <span class="desc">$T('explain-nzbkey')</span>
@@ -156,7 +156,7 @@
         </div><!-- /section -->
         <div class="section">
             <div class="col2">
-                <h3>$T('cmenu-switches') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('cmenu-switches') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -172,11 +172,10 @@
                             <option value="1" <!--#if $check_new_rel == 1 then 'selected="selected"' else ""#--> >$T('on')</option>
                             <option value="2" <!--#if $check_new_rel == 2 then 'selected="selected"' else ""#--> >$T('also-test')</option>
                         </select>
-                        <span class="desc">$T('explain-check_new_rel')</span>
                     </div>
-                    <div class="field-pair advanced-settings <!--#if int($certificate_validation) == 0 then "disabled" else ""#-->">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="enable_https_verification">$T('opt-enable_https_verification')</label>
-                        <input type="checkbox" name="enable_https_verification" id="enable_https_verification" value="1" <!--#if int($enable_https_verification) > 0 then 'checked="checked"' else ""#--> <!--#if int($certificate_validation) == 0 then "disabled=\"disabled\"" else ""#--> />
+                        <input type="checkbox" name="enable_https_verification" id="enable_https_verification" value="1" <!--#if int($enable_https_verification) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-enable_https_verification')</span>
                     </div>
                     <div class="field-pair advanced-settings">
@@ -192,7 +191,7 @@
         </div><!-- /section -->
         <div class="section">
             <div class="col2">
-                <h3>$T('tuning') <a href="$helpuri$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('tuning') <a href="$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -230,7 +229,7 @@
         <input type="hidden" name="output" value="json" />
         <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>
+                <h3>$T('backup') <a href="$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -264,41 +263,41 @@
 </div>
 
 <script type="text/javascript">
-\$(document).ready(function(){
+jQuery(document).ready(function(){
     // Show the message about translating when it's non-English
     function hideOrShowTranslate() {
-        if(\$('#language').val() == 'en') {
-            \$('.alert-translate').hide()
+        if(jQuery('#language').val() === 'en') {
+            jQuery('.alert-translate').hide()
         } else {
-            \$('.alert-translate').show()
+            jQuery('.alert-translate').show()
         }
     }
-    \$('#language').on('change', function() {
+    jQuery('#language').on('change', function() {
         // Show message
         hideOrShowTranslate()
         // Re-load page on submit
-        \$('.fullform').submit(function() {
+        jQuery('.fullform').submit(function() {
             // Skip the fancy stuff, just submit
             this.submit()
         })
         // No JSON response
-        \$('#ajax').val('')
+        jQuery('#ajax').val('')
     })
     hideOrShowTranslate()
 
     // Highlight in case user is not safe
     // So when exposed to internet and no password, no external limit or no username/password
-    var safeCheck = \$('#host, #inet_exposure, #${pid}_wu, #${pid}_wp')
+    var safeCheck = jQuery('#host, #inet_exposure, #${pid}_wu, #${pid}_wp')
     function checkSafety() {
-        if(\$('#host').val() != 'localhost' && \$('#host').val() != '127.0.0.1') {
+        if(jQuery('#host').val() !== 'localhost' && jQuery('#host').val() !== '127.0.0.1') {
             // No limitation on local-network
-            if(\$('#inet_exposure').val() > 3) {
+            if(jQuery('#inet_exposure').val() > 3) {
                 // And no username and password?
-                if(!\$('#${pid}_wu').val() || !\$('#${pid}_wp').val()) {
+                if(!jQuery('#${pid}_wu').val() || !jQuery('#${pid}_wp').val()) {
                     // Add warning icon if not there already
-                    if(!\$('.host-warning').length) {
+                    if(!jQuery('.host-warning').length) {
                         safeCheck.after('<span class="glyphicon glyphicon-alert host-warning"></span>')
-                        \$('.host-warning').tooltip({'title': '$T('checkSafety')'})
+                        jQuery('.host-warning').tooltip({'title': '$T('checkSafety')'})
                         safeCheck.addClass('host-warning-highlight')
                     }
                     return
@@ -306,57 +305,60 @@
             }
         }
         // Remove warnings
-        \$('.host-warning').remove()
+        jQuery('.host-warning').remove()
         safeCheck.removeClass('host-warning-highlight')
     }
     checkSafety()
     safeCheck.on('change', checkSafety)
 
     // Click functions
-    \$('#apikey, #nzbkey').click(function () { \$(this).select() });
+    jQuery('#apikey, #nzbkey').click(function () { jQuery(this).select() });
 
-    \$('#generate_new_apikey').click(function () {
+    jQuery('#generate_new_apikey').click(function () {
       if (confirm("$T('confirm')")) {
         $.ajax({
           type: "POST",
           url: "../../api",
-          data: {mode:'config', name:'set_apikey', apikey: \$('#apikey').val()},
+          data: {mode:'config', name:'set_apikey', apikey: jQuery('#apikey').val()},
           success: function(msg){
-            \$('#apikey').val(msg);
+            jQuery('#apikey').val(msg);
             document.location = document.location;
           }
         });
       }
     });
-    \$('#generate_new_nzbkey').click(function () {
+    jQuery('#generate_new_nzbkey').click(function () {
       if (confirm("$T('confirm')")) {
         $.ajax({
           type: "POST",
           url: "../../api",
-          data: { mode:'config', name:'set_nzbkey', apikey: \$('#apikey').val() },
+          data: { mode:'config', name:'set_nzbkey', apikey: jQuery('#apikey').val() },
           success: function(msg){
-            \$('#nzbkey').val(msg);
+            jQuery('#nzbkey').val(msg);
             document.location = document.location;
           }
         });
       }
     });
 
-    \$('.show_qrcode').click(function (e) {
+    // Add autocomplete and file-browser
+    jQuery('.fileBrowserField').typeahead().fileBrowser();
+
+    jQuery('.show_qrcode').click(function (e) {
         // Show in modal
-        \$('#modal_qr .modal-dialog').width(330)
-        \$('#modal_qr .modal-body').html('').qrcode({
+        jQuery('#modal_qr .modal-dialog').width(330)
+        jQuery('#modal_qr .modal-body').html('').qrcode({
             "size": 280,
             "color": "#3a3",
-            "text": \$(this).attr('rel')
+            "text": jQuery(this).attr('rel')
         });
-        \$('#modal_qr').modal('show');
+        jQuery('#modal_qr').modal('show');
 
         // No save on this button click
         e.preventDefault();
     });
 
-    \$('.generate_cert').click(function(e) {
+    jQuery('.generate_cert').click(function(e) {
         if(!confirm('$T('explain-new-cert')')) {
             return;
         }
@@ -365,7 +367,7 @@
         $.ajax({
             type: "POST",
             url: "../../api",
-            data: { mode: 'config', name: 'regenerate_certs', apikey: \$('#apikey').val() },
+            data: { mode: 'config', name: 'regenerate_certs', apikey: jQuery('#apikey').val() },
             success: function(msg) {
                 do_restart()
             }
@@ -375,35 +377,35 @@
     })
 
     // Only allow re-generate if default certs
-    if(\$('#https_cert').val() != 'server.cert') {
-        \$('.generate_cert').attr('disabled', 'disabled')
+    if(jQuery('#https_cert').val() !== '$def_https_cert_file') {
+        jQuery('.generate_cert').attr('disabled', 'disabled')
     }
 
     // Parse the text
-    var bandwidthLimit = \$('#bandwidth_max').val()
+    var bandwidthLimit = jQuery('#bandwidth_max').val()
     if(bandwidthLimit) {
         var bandwithLimitNumber = parseFloat(bandwidthLimit)
         var bandwithLimitText = bandwidthLimit.replace(/[^a-zA-Z]+/g, '');
         if(bandwithLimitNumber) {
-            \$('#bandwidth_max_value').val(bandwithLimitNumber)
-            \$('#bandwidth_max_dropdown').val(bandwithLimitText)
+            jQuery('#bandwidth_max_value').val(bandwithLimitNumber)
+            jQuery('#bandwidth_max_dropdown').val(bandwithLimitText)
         }
     }
 
     // Update the value
-    \$('#bandwidth_max_value, #bandwidth_max_dropdown').on('change', function() {
-        if(\$('#bandwidth_max_value').val()) {
-            \$('#bandwidth_max').val(\$('#bandwidth_max_value').val() + \$('#bandwidth_max_dropdown').val())
+    jQuery('#bandwidth_max_value, #bandwidth_max_dropdown').on('change', function() {
+        if(jQuery('#bandwidth_max_value').val()) {
+            jQuery('#bandwidth_max').val(jQuery('#bandwidth_max_value').val() + jQuery('#bandwidth_max_dropdown').val())
         } else {
-            \$('#bandwidth_max').val('')
+            jQuery('#bandwidth_max').val('')
         }
     })
 
-    \$('#create_backup').click(function () {
+    jQuery('#create_backup').click(function () {
         $.ajax({
           type: "POST",
           url: "../../api",
-          data: {mode:'config', name:'create_backup', output:'json', apikey: \$('#apikey').val()},
+          data: {mode:'config', name:'create_backup', output:'json', apikey: jQuery('#apikey').val()},
           success: function(data) {
               if(data.value.result) {
                   alert("$T('backup'):\n" + data.value.message)

interfaces/Config/templates/config_notify.tmpl

@@ -1,23 +1,25 @@
 <!--#set global $pane="Email"#-->
-<!--#set global $help_uri="configuration/3.7/notifications"#-->
+<!--#set global $help_uri = $confighelpuri + "notifications"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
+<!--#import apprise#-->
+
 <!--#def show_notify_checkboxes($section_label)#-->
     <!--#for $type in $notify_types#-->
         <div class="field-pair">
             <label class="config wide" for="${section_label}_prio_$type">
                 $T($notify_types[$type]).replace('/', ' / ')
             </label>
-            <input type="checkbox" name="${section_label}_prio_$type" id="${section_label}_prio_$type" value="1" <!--#if int($getVar($section_label + '_prio_' + $type)) > 0 then 'checked="checked"' else ""#--> />
+            <input type="checkbox" name="${section_label}_prio_$type" id="${section_label}_prio_$type" value="1" <!--#if $getVar($section_label + '_prio_' + $type) then 'checked="checked"' else ""#--> />
         </div>
     <!--#end for#-->
 <!--#end def#-->
 
 <!--#def show_cat_box($section_label)#-->
-    <div class="col2-cats" <!--#if int($getVar($section_label + '_enable')) > 0 then '' else 'style="display:none"'#-->>
+    <div class="col2-cats" <!--#if $getVar($section_label + '_enable') then '' else 'style="display:none"'#-->>
         <hr>
         <b>$T('affectedCat')</b><br/>
-        <select name="${section_label}_cats" multiple="multiple" class="multiple_cats">
+        <select name="${section_label}_cats" multiple="multiple" class="multiple_cats" size="$len($categories)">
             <!--#for $ct in $categories#-->
                 <option value="$ct" <!--#if $ct in $getVar($section_label + '_cats') then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
             <!--#end for#-->
@@ -33,10 +35,10 @@
     <input type="hidden" id="ajax" name="ajax" value="1" />
     <div class="section" id="email">
         <div class="col2">
-            <h3>$T('cmenu-email') <a href="$helpuri$help_uri#toc0" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('cmenu-email') <a href="$help_uri#toc0" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <div class="col2-cats" <!--#if int($email_endjob) > 0 then '' else 'style="display:none"'#-->>
                 <b>$T('affectedCat')</b><br/>
-                <select name="email_cats" multiple="multiple" class="multiple_cats">
+                <select name="email_cats" multiple="multiple" class="multiple_cats" size="$len($categories)">
                     <!--#for $ct in $categories#-->
                         <option value="$ct" <!--#if $ct in $email_cats then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
                     <!--#end for#-->
@@ -56,12 +58,12 @@
                 </div>
                 <div class="field-pair">
                     <label class="config" for="email_full">$T('opt-email_full')</label>
-                    <input type="checkbox" name="email_full" id="email_full" value="1" <!--#if int($email_full) > 0 then 'checked="checked"' else ""#--> />
+                    <input type="checkbox" name="email_full" id="email_full" value="1" <!--#if $email_full then 'checked="checked"' else ""#--> />
                     <span class="desc">$T('explain-email_full')</span>
                 </div>
                 <div class="field-pair">
                     <label class="config" for="email_rss">$T('opt-email_rss')</label>
-                    <input type="checkbox" name="email_rss" id="email_rss" value="1" <!--#if int($email_rss) > 0 then 'checked="checked"' else ""#--> />
+                    <input type="checkbox" name="email_rss" id="email_rss" value="1" <!--#if $email_rss then 'checked="checked"' else ""#--> />
                     <span class="desc">$T('explain-email_rss')</span>
                 </div>
                 <div class="field-pair">
@@ -105,12 +107,12 @@
             <h3>$T('section-NC')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="ncenter_enable" id="ncenter_enable" value="1" <!--#if int($ncenter_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="ncenter_enable" id="ncenter_enable" value="1" <!--#if $ncenter_enable then 'checked="checked"' else ""#--> /></td>
                     <td><label for="ncenter_enable"> $T('opt-ncenter_enable')</label></td>
                 </tr>
             </table>
         </div>
-        <div class="col1" <!--#if int($ncenter_enable) > 0 then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if $ncenter_enable then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('ncenter')
                 <div class="field-pair no-field-pair-bg">
@@ -130,13 +132,13 @@
             <h3>$T('section-AC')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="acenter_enable" id="acenter_enable" value="1" <!--#if int($acenter_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="acenter_enable" id="acenter_enable" value="1" <!--#if $acenter_enable then 'checked="checked"' else ""#--> /></td>
                     <td><label for="acenter_enable"> $T('opt-acenter_enable')</label></td>
                 </tr>
             </table>
             $show_cat_box('acenter')
         </div>
-        <div class="col1" <!--#if int($acenter_enable) > 0 then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if $acenter_enable then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('acenter')
                 <div class="field-pair no-field-pair-bg">
@@ -153,16 +155,16 @@
     <!--#if $have_ntfosd#-->
     <div class="section">
         <div class="col2">
-            <h3>$T('section-OSD') <a href="$helpuri$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('section-OSD') <a href="$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="ntfosd_enable" id="ntfosd_enable" value="1" <!--#if int($ntfosd_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="ntfosd_enable" id="ntfosd_enable" value="1" <!--#if $ntfosd_enable then 'checked="checked"' else ""#--> /></td>
                     <td><label for="ntfosd_enable"> $T('opt-ntfosd_enable')</label></td>
                 </tr>
             </table>
             $show_cat_box('ntfosd')
         </div>
-        <div class="col1" <!--#if int($ntfosd_enable) > 0 then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if $ntfosd_enable then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('ntfosd')
                 <div class="field-pair no-field-pair-bg">
@@ -176,19 +178,64 @@
        </div>
     </div>
     <!--#end if#-->
-    <div class="section" id="nscript">
+    <div class="section" id="apprise">
         <div class="col2">
-            <h3>$T('section-NScript') <a href="$helpuri$help_uri#nscript" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>Apprise <a href="$help_uri#apprise" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="nscript_enable" id="nscript_enable" value="1" <!--#if int($nscript_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="apprise_enable" id="apprise_enable" value="1" <!--#if $apprise_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><label for="apprise_enable"> $T('opt-apprise_enable')</label></td>
+                </tr>
+            </table>
+            <p>$T('explain-apprise_enable')</p>
+            <p>$T('version'): ${apprise.__version__}</p>
+
+            $show_cat_box('apprise')
+        </div>
+        <div class="col1" <!--#if $apprise_enable then '' else 'style="display:none"'#-->>
+            <fieldset>
+                <div class="field-pair">
+                    <label class="config" for="apprise_urls">$T('opt-apprise_urls')</label>
+                    <input type="text" name="apprise_urls" id="apprise_urls" value="$apprise_urls" />
+                    <span class="desc">$T('explain-apprise_urls')</span>
+                </div>
+                <div class="field-pair">
+                    <span class="desc">$T('explain-apprise_extra_urls')</span>
+                </div>
+                <!--#set $section_label = 'apprise'#-->
+                <!--#for $type in $notify_types#-->
+                    <div class="field-pair">
+                        <label class="config" for="${section_label}_target_${type}">
+                            $T($notify_types[$type]).replace('/', ' / ')
+                        </label>
+                        <input type="checkbox" name="${section_label}_target_${type}_enable" id="${section_label}_target_${type}_enable" value="1" <!--#if $getVar($section_label + '_target_' + $type + '_enable') then 'checked="checked"' else ""#--> />
+                        <input type="text" name="${section_label}_target_${type}" id="${section_label}_target_${type}" value="$getVar($section_label + '_target_' + $type)"  placeholder="$T('opt-apprise_urls')" />
+                    </div>
+                <!--#end for#-->
+
+                <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" type="button" id="test_apprise"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
+                </div>
+                <div class="field-pair result-box">
+                    <div class="alert"></div>
+                </div>
+           </fieldset>
+       </div>
+    </div>
+    <div class="section" id="nscript">
+        <div class="col2">
+            <h3>$T('section-NScript') <a href="$help_uri#nscript" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <table>
+                <tr>
+                    <td><input type="checkbox" name="nscript_enable" id="nscript_enable" value="1" <!--#if $nscript_enable then 'checked="checked"' else ""#--> /></td>
                     <td><label for="nscript_enable"> $T('opt-nscript_enable')</label></td>
                 </tr>
             </table>
-            <em>$T('explain-nscript_enable')</em><br><a href="$helpuri$help_uri#nscript" target="_blank">$T('readwiki')</a>
+            <em>$T('explain-nscript_enable')</em><br><a href="$help_uri#nscript" target="_blank">$T('readwiki')</a>
             $show_cat_box('nscript')
         </div>
-        <div class="col1" <!--#if int($nscript_enable) > 0 then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if $nscript_enable then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
                     <label class="config" for="nscript_script">$T('opt-nscript_script')</label>
@@ -202,7 +249,7 @@
                 <div class="field-pair">
                     <label class="config" for="nscript_parameters">$T('opt-nscript_parameters')</label>
                     <input type="text" name="nscript_parameters" id="nscript_parameters" value="$nscript_parameters" />
-                    <span class="desc">$T('Optional') - $T('explain-nscript_parameters')</span>
+                    <span class="desc">$T('Optional') - $T('readwiki')</span>
                 </div>
                 $show_notify_checkboxes('nscript')
                 <div class="field-pair no-field-pair-bg">
@@ -220,14 +267,14 @@
             <h3>$T('section-Prowl')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="prowl_enable" id="prowl_enable" value="1" <!--#if int($prowl_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="prowl_enable" id="prowl_enable" value="1" <!--#if $prowl_enable then 'checked="checked"' else ""#--> /></td>
                     <td><label for="prowl_enable"> $T('opt-prowl_enable')</label></td>
                 </tr>
             </table>
             <em>$T('explain-prowl_enable')</em>
             $show_cat_box('prowl')
         </div>
-        <div class="col1" <!--#if int($prowl_enable) > 0 then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if $prowl_enable then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
                     <label class="config" for="prowl_apikey">$T('opt-prowl_apikey')</label>
@@ -241,12 +288,12 @@
                             $T($notify_types[$type]).replace('/', ' / ')
                         </label>
                         <select name="${section_label}_prio_$type" id="${section_label}_prio_$type">
-                            <option value="-3" <!--#if $getVar($section_label + '_prio_' + $type) == "-3" then 'selected="selected"' else ""#--> >$T('prowl-off')</option>
-                            <option value="-2" <!--#if $getVar($section_label + '_prio_' + $type) == "-2" then 'selected="selected"' else ""#--> >$T('prowl-very-low')</option>
-                            <option value="-1" <!--#if $getVar($section_label + '_prio_' + $type) == "-1" then 'selected="selected"' else ""#--> >$T('prowl-moderate')</option>
-                            <option value="0"  <!--#if $getVar($section_label + '_prio_' + $type) == "0"  then 'selected="selected"' else ""#--> >$T('prowl-normal')</option>
-                            <option value="1"  <!--#if $getVar($section_label + '_prio_' + $type) == "1"  then 'selected="selected"' else ""#--> >$T('prowl-high')</option>
-                            <option value="2"  <!--#if $getVar($section_label + '_prio_' + $type) == "2"  then 'selected="selected"' else ""#--> >$T('prowl-emergency')</option>
+                            <option value="-3" <!--#if $getVar($section_label + '_prio_' + $type) == -3 then 'selected="selected"' else ""#--> >$T('prowl-off')</option>
+                            <option value="-2" <!--#if $getVar($section_label + '_prio_' + $type) == -2 then 'selected="selected"' else ""#--> >$T('prowl-very-low')</option>
+                            <option value="-1" <!--#if $getVar($section_label + '_prio_' + $type) == -1 then 'selected="selected"' else ""#--> >$T('prowl-moderate')</option>
+                            <option value="0"  <!--#if $getVar($section_label + '_prio_' + $type) == 0  then 'selected="selected"' else ""#--> >$T('prowl-normal')</option>
+                            <option value="1"  <!--#if $getVar($section_label + '_prio_' + $type) == 1  then 'selected="selected"' else ""#--> >$T('prowl-high')</option>
+                            <option value="2"  <!--#if $getVar($section_label + '_prio_' + $type) == 2  then 'selected="selected"' else ""#--> >$T('prowl-emergency')</option>
                         </select>
                     </div>
                 <!--#end for#-->
@@ -266,14 +313,14 @@
             <h3>$T('section-Pushover')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="pushover_enable" id="pushover_enable" value="1" <!--#if int($pushover_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="pushover_enable" id="pushover_enable" value="1" <!--#if $pushover_enable then 'checked="checked"' else ""#--> /></td>
                     <td><label for="pushover_enable"> $T('opt-pushover_enable')</label></td>
                 </tr>
             </table>
             <em>$T('explain-pushover_enable')</em>
             $show_cat_box('pushover')
         </div>
-        <div class="col1" <!--#if int($pushover_enable) > 0 then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if $pushover_enable then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
                     <label class="config" for="pushover_token">$T('opt-pushover_token')</label>
@@ -307,12 +354,12 @@
                             $T($notify_types[$type]).replace('/', ' / ')
                         </label>
                         <select name="${section_label}_prio_$type" id="${section_label}_prio_$type">
-                            <option value="-3" <!--#if $getVar($section_label + '_prio_' + $type) == "-3" then 'selected="selected"' else ""#--> >$T('pushover-off')</option>
-                            <option value="-2" <!--#if $getVar($section_label + '_prio_' + $type) == "-2" then 'selected="selected"' else ""#--> >$T('prowl-very-low')</option>
-                            <option value="-1" <!--#if $getVar($section_label + '_prio_' + $type) == "-1" then 'selected="selected"' else ""#--> >$T('pushover-low')</option>
-                            <option value="0"  <!--#if $getVar($section_label + '_prio_' + $type) == "0"  then 'selected="selected"' else ""#--> >$T('prowl-normal')</option>
-                            <option value="1"  <!--#if $getVar($section_label + '_prio_' + $type) == "1"  then 'selected="selected"' else ""#--> >$T('pushover-high')</option>
-                            <option value="2"  <!--#if $getVar($section_label + '_prio_' + $type) == "2"  then 'selected="selected"' else ""#--> >$T('prowl-emergency')</option>
+                            <option value="-3" <!--#if $getVar($section_label + '_prio_' + $type) == -3 then 'selected="selected"' else ""#--> >$T('pushover-off')</option>
+                            <option value="-2" <!--#if $getVar($section_label + '_prio_' + $type) == -2 then 'selected="selected"' else ""#--> >$T('prowl-very-low')</option>
+                            <option value="-1" <!--#if $getVar($section_label + '_prio_' + $type) == -1 then 'selected="selected"' else ""#--> >$T('pushover-low')</option>
+                            <option value="0"  <!--#if $getVar($section_label + '_prio_' + $type) == 0  then 'selected="selected"' else ""#--> >$T('prowl-normal')</option>
+                            <option value="1"  <!--#if $getVar($section_label + '_prio_' + $type) == 1  then 'selected="selected"' else ""#--> >$T('pushover-high')</option>
+                            <option value="2"  <!--#if $getVar($section_label + '_prio_' + $type) == 2  then 'selected="selected"' else ""#--> >$T('prowl-emergency')</option>
                         </select>
                     </div>
                 <!--#end for#-->
@@ -331,14 +378,14 @@
             <h3>$T('section-Pushbullet')</h3>
             <table>
                 <tr>
-                    <td><input type="checkbox" name="pushbullet_enable" id="pushbullet_enable" value="1" <!--#if int($pushbullet_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="pushbullet_enable" id="pushbullet_enable" value="1" <!--#if $pushbullet_enable then 'checked="checked"' else ""#--> /></td>
                     <td><label for="pushbullet_enable"> $T('opt-pushbullet_enable')</label></td>
                 </tr>
             </table>
             <em>$T('explain-pushbullet_enable')</em>
             $show_cat_box('pushbullet')
         </div>
-        <div class="col1" <!--#if int($pushbullet_enable) > 0 then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if $pushbullet_enable then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
                     <label class="config" for="pushbullet_apikey">$T('opt-pushbullet_apikey')</label>
@@ -367,24 +414,24 @@
 </div><!-- /colmask -->
 
 <script type="text/javascript">
-\$(document).ready(function(){
+jQuery(document).ready(function(){
     // Expand on enable
-    \$('.col2 input[name$="enable"]').change(function() {
+    jQuery('.col2 input[name$="enable"]').change(function() {
         if(this.checked) {
-            \$(this).parents('.section').find('.col1').show()
-            \$(this).parents('.col2').find('.col2-cats').show()
+            jQuery(this).parents('.section').find('.col1').show()
+            jQuery(this).parents('.col2').find('.col2-cats').show()
         } else {
-            \$(this).parents('.section').find('.col1').hide()
-            \$(this).parents('.col2').find('.col2-cats').hide()
+            jQuery(this).parents('.section').find('.col1').hide()
+            jQuery(this).parents('.col2').find('.col2-cats').hide()
         }
-        \$('form').submit()
+        jQuery('form').submit()
         addRowColor()
     })
-    \$('#email_endjob').change(function() {
-        if(\$(this).val() > 0) {
-            \$(this).parents('.section').find('.col2-cats').show()
+    jQuery('#email_endjob').change(function() {
+        if(jQuery(this).val() > 0) {
+            jQuery(this).parents('.section').find('.col2-cats').show()
         } else {
-            \$(this).parents('.section').find('.col2-cats').hide()
+            jQuery(this).parents('.section').find('.col2-cats').hide()
         }
     })
 
@@ -393,27 +440,27 @@
     **/
     function testNotification(buttonObj) {
         // Confirm?
-        if(\$(buttonObj).attr('rel')) {
-            if(!confirm(\$(buttonObj).attr('rel'))) return false;
+        if(jQuery(buttonObj).attr('rel')) {
+            if(!confirm(jQuery(buttonObj).attr('rel'))) return false;
         }
         // Disable button and get the data
-        \$(buttonObj).attr("disabled", "disabled")
-        \$(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
+        jQuery(buttonObj).attr("disabled", "disabled")
+        jQuery(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
         var data = { mode: buttonObj.id, apikey: '$apikey', output: 'json' };
-        \$(buttonObj).parents('.section').extractFormDataTo(data);
+        jQuery(buttonObj).parents('.section').extractFormDataTo(data);
 
         // Clear up the box
-        resultBox = \$(buttonObj).parents('.section').find('.result-box .alert');
+        resultBox = jQuery(buttonObj).parents('.section').find('.result-box .alert');
 
         // Get the request
-        \$.ajax({
+        jQuery.ajax({
             type: "GET",
             url: "../../api",
             data: data
         }).then(function(data) {
             // Remove disabled and make the box
-            \$(buttonObj).removeAttr("disabled")
-            \$(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
+            jQuery(buttonObj).removeAttr("disabled")
+            jQuery(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
             resultBox.removeClass('alert-success alert-danger').show()
             if(data.status) {
                 resultBox.addClass('alert-success')
@@ -426,7 +473,7 @@
             }
         })
     }
-    \$('#test_email, #test_notif, #test_windows, #test_pushbullet, #test_pushover, #test_prowl, #test_osd, #test_nscript').click(function () {
+    jQuery('#test_email, #test_notif, #test_windows, #test_apprise, #test_pushbullet, #test_pushover, #test_prowl, #test_osd, #test_nscript').click(function () {
         testNotification(this)
     })
 });

interfaces/Config/templates/config_rss.tmpl

@@ -1,12 +1,12 @@
 <!--#set global $pane="RSS"#-->
-<!--#set global $help_uri="configuration/3.7/rss"#-->
+<!--#set global $help_uri = $confighelpuri + "rss"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <!--#import html#-->
 <div class="colmask">
     <!--#if not $active_feed#-->
     <div class="section">
         <div class="padTable">
-            <a class="main-helplink" href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+            <a class="main-helplink" href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
             <p>$T('explain-RSS')</p>
             <form action="add_rss_feed" method="post" autocomplete="off">
                 <input type="hidden" name="apikey" value="$apikey" />
@@ -105,7 +105,7 @@
     <!--#set $feed = html.unescape($active_feed)#-->
     <div class="section rss-section">
         <div class="padTable">
-            <a class="main-helplink" href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+            <a class="main-helplink" href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
             <h2 class="nomargin activeRSS">
                 <a href="${root}config/rss/">$T('cmenu-rss')</a> &raquo;
                 $active_feed
@@ -551,43 +551,43 @@ function urlencode(str) {
     return encodeURIComponent(str).replace(/!/g, '%21').replace(/'/g, '%27').replace(/\(/g, '%28').replace(/\)/g, '%29').replace(/\*/g, '%2A').replace(/%20/g, '+');
 }
 
-\$(document).ready(function(){
-    \$('.favicon').each(function(i, theContainer) {
+jQuery(document).ready(function(){
+    jQuery('.favicon').each(function(i, theContainer) {
         // Easy favicon grabber
-        var favUrl = '//' + \$(theContainer).data('domain') + '/favicon.ico'
+        var favUrl = '//' + jQuery(theContainer).data('domain') + '/favicon.ico'
 
         // Does the image exist? Otherwise place a glyphicon
         var testFavImg = new Image();
         testFavImg.src = favUrl;
         testFavImg.onerror = function (evt){
-            \$(theContainer).append('<span class="glyphicon glyphicon-list"></span>')
+            jQuery(theContainer).append('<span class="glyphicon glyphicon-list"></span>')
         }
     })
 
-    \$('.tabs a').click(function (e) {
+    jQuery('.tabs a').click(function (e) {
         e.preventDefault()
-        \$(this).tab('show')
+        jQuery(this).tab('show')
     })
 
-    \$('.editFeed').click(function(){
-        var oldURI = \$(this).prev().val();
-        var whichFeed = \$(this).attr("rel");
+    jQuery('.editFeed').click(function(){
+        var oldURI = jQuery(this).prev().val();
+        var whichFeed = jQuery(this).attr("rel");
 
         // Fill the values
-        \$('#feed_edit_name_label').text(whichFeed)
-        \$('#feed_edit_old_name').val(whichFeed)
-        \$('#feed_edit_new_name').val(whichFeed)
-        \$('#feed_edit_url').val(oldURI)
+        jQuery('#feed_edit_name_label').text(whichFeed)
+        jQuery('#feed_edit_old_name').val(whichFeed)
+        jQuery('#feed_edit_new_name').val(whichFeed)
+        jQuery('#feed_edit_url').val(oldURI)
 
         // Show the modal
-        \$('#rss_edit_modal').modal('show');
+        jQuery('#rss_edit_modal').modal('show');
     });
 
-    \$('.delFeed').click(function(e){
+    jQuery('.delFeed').click(function(e){
         e.preventDefault();
         if ( confirm("$T('confirm')") ) {
-            var whichFeed = \$(this).attr("rel");
-            \$.ajax({
+            var whichFeed = jQuery(this).attr("rel");
+            jQuery.ajax({
                 type: "POST",
                 url: "del_rss_feed",
                 data: {feed: whichFeed, apikey: "$apikey" }
@@ -600,9 +600,9 @@ function urlencode(str) {
         }
     });
 
-    \$('.toggleFeedCheckbox').click(function(){
-        var whichFeed = \$(this).attr("rel");
-        \$.ajax({
+    jQuery('.toggleFeedCheckbox').click(function(){
+        var whichFeed = jQuery(this).attr("rel");
+        jQuery.ajax({
             type: "POST",
             url: "toggle_rss_feed",
             data: {feed: whichFeed, apikey: "$apikey" }
@@ -615,34 +615,34 @@ function urlencode(str) {
     });
 
     // Only the Accept filter needs all the options
-    \$('form[action="upd_rss_filter"]').find('select[name="filter_type"]').change(function() {
-        \$(this).parent().parent().find('select:not([name="filter_type"])').attr('disabled', \$(this).val() != "A" && \$(this).val() != "S")
+    jQuery('form[action="upd_rss_filter"]').find('select[name="filter_type"]').change(function() {
+        jQuery(this).parent().parent().find('select:not([name="filter_type"])').attr('disabled', jQuery(this).val() !== "A" && jQuery(this).val() !== "S")
     })
     // Trigger on-load for all
-    \$('.disabled_options_rule').find('td select:not([name="filter_type"])').attr('disabled', true)
+    jQuery('.disabled_options_rule').find('td select:not([name="filter_type"])').attr('disabled', true)
 
     function setActiveIcon(objButton) {
         // Let's make it look like things are happening!
-        \$(objButton).attr('disabled', true)
-        \$(objButton).find('span').remove()
-        \$(objButton).prepend('<span class="glyphicon glyphicon-transfer"></span>')
+        jQuery(objButton).attr('disabled', true)
+        jQuery(objButton).find('span').remove()
+        jQuery(objButton).prepend('<span class="glyphicon glyphicon-transfer"></span>')
     }
 
     // Enable sorting and set default
-    if (\$('#rss-tab-matched table').length) {
-        \$('#rss-tab-matched table').tablesort().data('tablesort').sort(\$('#rss-tab-matched th.default-sort'), 'desc');
+    if (jQuery('#rss-tab-matched table').length) {
+        jQuery('#rss-tab-matched table').tablesort().data('tablesort').sort(jQuery('#rss-tab-matched th.default-sort'), 'desc');
     }
-    if (\$('#rss-tab-not-matched table').length) {
-        \$('#rss-tab-not-matched table').tablesort().data('tablesort').sort(\$('#rss-tab-not-matched th.default-sort'), 'desc');
+    if (jQuery('#rss-tab-not-matched table').length) {
+        jQuery('#rss-tab-not-matched table').tablesort().data('tablesort').sort(jQuery('#rss-tab-not-matched th.default-sort'), 'desc');
     }
-    if (\$('#rss-tab-done table').length) {
-        \$('#rss-tab-done table').tablesort().data('tablesort').sort(\$('#rss-tab-done th.default-sort'), 'desc');
+    if (jQuery('#rss-tab-done table').length) {
+        jQuery('#rss-tab-done table').tablesort().data('tablesort').sort(jQuery('#rss-tab-done th.default-sort'), 'desc');
     }
 
-    \$('.testFeed').click(function(){
+    jQuery('.testFeed').click(function(){
         setActiveIcon(this)
-        var whichFeed = \$(this).attr("rel");
-        \$.ajax({
+        var whichFeed = jQuery(this).attr("rel");
+        jQuery.ajax({
             type: "POST",
             url: "test_rss_feed",
             data: {feed: whichFeed, apikey: "$apikey" }
@@ -654,34 +654,34 @@ function urlencode(str) {
         });
     });
 
-    \$('.cleanFeed').click(function(){
+    jQuery('.cleanFeed').click(function(){
         setActiveIcon(this)
-        var theForm = \$(this).closest("form");
+        var theForm = jQuery(this).closest("form");
         theForm.attr("action", "clean_rss_jobs").submit();
     });
 
-    \$('.evalFeed').click(function(){
+    jQuery('.evalFeed').click(function(){
         setActiveIcon(this)
-        var theForm = \$(this).closest("form");
+        var theForm = jQuery(this).closest("form");
         theForm.attr("action", "eval_rss_feed").submit();
     });
 
-    \$('.delFilter').click(function(){
-        var theForm = \$(this).closest("form");
+    jQuery('.delFilter').click(function(){
+        var theForm = jQuery(this).closest("form");
         theForm.attr("action", "del_rss_filter").submit();
     });
 
-    \$('form[action="download"]').ajaxForm({
+    jQuery('form[action="download"]').ajaxForm({
         datatype: 'json',
         beforeSubmit: function (_, form) {
-            \$(form).find('button').attr("disabled", "disabled")
+            jQuery(form).find('button').attr("disabled", "disabled")
             // Remove icon and add new one
-            \$(form).find('button span').remove()
-            \$(form).find('button').prepend('<span class="glyphicon glyphicon-transfer"></span>')
+            jQuery(form).find('button span').remove()
+            jQuery(form).find('button').prepend('<span class="glyphicon glyphicon-transfer"></span>')
         },
         success: function (_, _, _, form) {
             // Set success
-            \$(form).find('button').html('<span class="glyphicon glyphicon-ok"></span> $T('rss-added')')
+            jQuery(form).find('button').html('<span class="glyphicon glyphicon-ok"></span> $T('rss-added')')
         }
     });
 

interfaces/Config/templates/config_scheduling.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Scheduling"#-->
-<!--#set global $help_uri="configuration/3.7/scheduling"#-->
+<!--#set global $help_uri = $confighelpuri + "scheduling"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <%
@@ -15,7 +15,7 @@ else:
 <div class="colmask">
     <div class="section">
         <div class="col2">
-            <h3>$T('addSchedule') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('addSchedule') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
         </div><!-- /col2 -->
         <form action="addSchedule" method="post" autocomplete="off">
         <input type="hidden" id="apikey" name="apikey" value="$apikey" />
@@ -112,32 +112,32 @@ else:
     </div><!-- /section -->
 </div><!-- /colmask -->
 <script type="text/javascript">
-    \$('#action').on('change', function() {
+    jQuery('#action').on('change', function() {
         // Set the action
-        \$('#arguments').val((\$(this).find('option:selected').data('action')))
+        jQuery('#arguments').val((jQuery(this).find('option:selected').data('action')))
 
         // Is it speedlimit?
-        if(\$(this).find('option:selected').val() == 'speedlimit') {
-            \$('#hidden_arguments').show()
-            \$('#hidden_arguments input').attr('placeholder', 'Bytes/s, "1M" = 1 MB/s, "500K" = 500 KB/s')
+        if(jQuery(this).find('option:selected').val() === 'speedlimit') {
+            jQuery('#hidden_arguments').show()
+            jQuery('#hidden_arguments input').attr('placeholder', 'Bytes/s, "1M" = 1 MB/s, "500K" = 500 KB/s')
         } else {
-            \$('#hidden_arguments').hide()
-            \$('#hidden_arguments input').attr('placeholder', '')
+            jQuery('#hidden_arguments').hide()
+            jQuery('#hidden_arguments input').attr('placeholder', '')
         }
 
         /* Arguments - since we only have speedlimit with arguments, disabled for now
-        if(\$(this).find('option:selected').data('noarg')) {
-            \$('#hidden_arguments').hide()
+        if(jQuery(this).find('option:selected').data('noarg')) {
+            jQuery('#hidden_arguments').hide()
         } else {
-            \$('#hidden_arguments').show()
+            jQuery('#hidden_arguments').show()
         }*/
     })
 
-    \$('[name="schedenabled"]').click(function() {
-        \$.ajax({
+    jQuery('[name="schedenabled"]').click(function() {
+        jQuery.ajax({
             type: "POST",
             url: "toggleSchedule",
-            data: {line: \$(this).val(), apikey: "$apikey" }
+            data: {line: jQuery(this).val(), apikey: "$apikey" }
         }).done(function() {
             // Let us leave!
             formWasSubmitted = true;

interfaces/Config/templates/config_server.tmpl

@@ -1,17 +1,25 @@
 <!--#set global $pane="Servers"#-->
-<!--#set global $help_uri="configuration/3.7/servers"#-->
+<!--#set global $help_uri = $confighelpuri + "servers"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#import json#-->
 <!--#import datetime#-->
 
-<script type="text/javascript" xmlns="http://www.w3.org/1999/html">
+<script type="text/javascript">
     // Define variable needed for the server-statistics
     var serverBandwithData = {}
     var serverArticleTries = {}
     var serverArticleFailed = {}
+
+    // Keep track of all used hostnames
+    var hostnames = ""
 </script>
 
+<div class="server-frame">
+    <a href="#">&times;</a>
+    <iframe></iframe>
+</div>
+
 <div class="colmask">
     <div class="padding alt section">
         <button type="button" class="btn btn-default" id="addServerButton"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
@@ -20,7 +28,7 @@
         </label>
 
         <div class="advanced-buttonSeperator"></div>
-        <div class="chart-selector-container" title="$T('selectedDates')">
+        <div class="chart-selector-container" title="$T('selectedDates')" data-placement="bottom">
             <span class="glyphicon glyphicon-signal"></span>
             <!--#set today = datetime.date.today()#-->
             <input type="date" name="chart-start" id="chart-start" value="<!--#echo (today-datetime.timedelta(days=30)).strftime('%Y-%m-%d')#-->"> -
@@ -29,7 +37,7 @@
     </div>
     <div class="section" id="addServerContent" style="display: none;">
         <div class="col2">
-            <h3>$T('addServer') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('addServer') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
         </div>
         <div class="col1">
             <form action="addServer" method="post" autocomplete="off" onsubmit="removeObfuscation();">
@@ -51,25 +59,25 @@
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="port">$T('srv-port')</label>
-                        <input type="number" name="port" id="port" size="8" value="119" min="0" />
+                        <input type="number" name="port" id="port" size="8" value="563" min="0" max="65535" />
                     </div>
                     <div class="field-pair">
                         <label class="config" for="ssl">$T('srv-ssl')</label>
-                        <input type="checkbox" name="ssl" id="ssl" value="1" />
+                        <input type="checkbox" name="ssl" id="ssl" value="1" checked />
                         <span class="desc">$T('explain-ssl')</span>
                     </div>
                     <!-- Tricks to avoid browser auto-fill, fixed on-submit with javascript -->
                     <div class="field-pair">
-                        <label class="config" for="${pid}_00">$T('srv-username')</label>
-                        <input type="text" name="${pid}_00" id="${pid}_00" data-hide="username" />
+                        <label class="config" for="${pid}_000">$T('srv-username')</label>
+                        <input type="text" name="${pid}_000" id="${pid}_000" data-hide="username" />
                     </div>
                     <div class="field-pair">
-                        <label class="config" for="${pid}_01">$T('srv-password')</label>
-                        <input type="text" name="${pid}_01" id="${pid}_01" data-hide="password" />
+                        <label class="config" for="${pid}_001">$T('srv-password')</label>
+                        <input type="text" name="${pid}_001" id="${pid}_001" data-hide="password" />
                     </div>
                     <div class="field-pair">
                         <label class="config" for="connections">$T('srv-connections')</label>
-                        <input type="number" name="connections" id="connections" min="1" max="1000" value="8" required />
+                        <input type="number" name="connections" id="connections" min="1" max="500" value="8" required />
                     </div>
                     <div class="field-pair">
                         <label class="config" for="priority">$T('srv-priority')</label>
@@ -83,25 +91,21 @@
                         <label class="config" for="timeout">$T('srv-timeout')</label>
                         <input type="number" name="timeout" id="timeout" min="20" max="240" /> <i>$T('seconds')</i>
                     </div>
-                    <div class="field-pair <!--#if int($certificate_validation) == 0 then "disabled" else ""#--> advanced-settings">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="ssl_verify">$T('opt-ssl_verify')</label>
-                        <select name="ssl_verify" id="ssl_verify" <!--#if int($certificate_validation) == 0 then "disabled=\"disabled\"" else ""#-->>
-                            <option value="2" selected>$T('ssl_verify-strict')</option>
-                            <option value="1">$T('ssl_verify-normal')</option>
+                        <select name="ssl_verify" id="ssl_verify">
+                            <option value="3" selected>$T('ssl_verify-strict')</option>
+                            <option value="2">$T('ssl_verify-medium')</option>
+                            <option value="1">$T('ssl_verify-minimal')</option>
                             <option value="0">$T('ssl_verify-disabled')</option>
                         </select>
-                        <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
+                        <span class="desc">$T('explain-ssl_verify').replace('-', '<br/>-')</span>
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="ssl_ciphers">$T('opt-ssl_ciphers')</label>
                         <input type="text" name="ssl_ciphers" id="ssl_ciphers" />
                         <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
-                        <a href="${helpuri}advanced/ssl-ciphers" target="_blank">${helpuri}advanced/ssl-ciphers</a></span>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="send_group">$T('srv-send_group')</label>
-                        <input type="checkbox" name="send_group" id="send_group" value="1" />
-                        <span class="desc">$T('srv-explain-send_group')</span>
+                        <a href="https://sabnzbd.org/wiki/advanced/ssl-ciphers" target="_blank">https://sabnzbd.org/wiki/advanced/ssl-ciphers</a></span>
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="required">$T('srv-required')</label>
@@ -113,6 +117,12 @@
                         <input type="checkbox" name="optional" id="optional" value="1" />
                         <span class="desc">$T('explain-optional')</span>
                     </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="pipelining_requests">$T('srv-pipelining_requests')</label>
+                        <input type="number" name="pipelining_requests" id="pipelining_requests" min="1" max="20" value="1" />
+                        <span class="desc">$T('explain-pipelining_requests')<br>$T('readwiki')
+                        <a href="https://sabnzbd.org/wiki/advanced/nntp-pipelining" target="_blank">https://sabnzbd.org/wiki/advanced/nntp-pipelining</a></span>
+                    </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="expire_date">$T('srv-expire_date')</label>
                         <input type="date" name="expire_date" id="expire_date" />
@@ -128,7 +138,7 @@
                         <textarea name="notes" id="notes" rows="3" cols="50"></textarea>
                     </div>
                     <div class="field-pair no-field-pair-bg">
-                        <button class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
+                        <button class="btn btn-default addNewServer" disabled data-toggle="tooltip" data-placement="top" title="$T('wizard-test-server-required')"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
                         <button class="btn btn-default testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button>
                     </div>
                     <div class="field-pair result-box">
@@ -139,7 +149,7 @@
         </div>
     </div>
 
-    <!--#set $prio_colors = ["#59cc33", "#3366cc","#7f33cc", "#cc33a6", "#cc3333"] #-->
+    <!--#set $prio_colors = ["#59cc33", "#26a69a", "#3366cc", "#7f33cc", "#cc33a6", "#f39c12", "#cc3333", "#8d6e63"] #-->
     <!--#set $cur_prio_color = -1 #-->
     <!--#set $last_prio = -1 #-->
     <!--#for $cur, $server in enumerate($servers) #-->
@@ -147,11 +157,11 @@
             <input type="hidden" name="apikey" value="$apikey" />
             <input type="hidden" name="output" value="json" />
             <input type="hidden" name="server" value="$server['name']" />
-            <input type="hidden" id="ajax" name="ajax" value=1 />
+            <input type="hidden" name="ajax" value=1 />
 
             <div class="section <!--#if int($server['enable']) == 0 then 'server-disabled' else ""#-->">
                 <div class="col2 <!--#if int($server['enable']) == 0 then 'server-disabled' else ""#-->">
-                    <h3 title="$server['displayname']">$server['displayname'] <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                    <h3 title="$server['displayname']">$server['displayname'] <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
                     <!--#if int($server['enable']) != 0 #-->
                         <!--#if $last_prio != $server['priority'] and $cur_prio_color+1 < len($prio_colors) #-->
                             <!--#set $cur_prio_color = $cur_prio_color+1 #-->
@@ -168,6 +178,9 @@
                     </table>
                     <button type="button" class="btn btn-default showserver"><span class="glyphicon glyphicon-pencil"></span> $T('showDetails')</button>
                     <button type="button" class="btn btn-default clrServer"><span class="glyphicon glyphicon-remove"></span> $T('button-clrServer')</button>
+                    <!--#if $server['notes'] #-->
+                    <p>$server['notes'].replace('\n', '<br>')</p>
+                    <!--#end if#-->
                 </div>
                 <div class="col1" style="display:none;">
                     <input type="hidden" name="enable" id="enable$cur" value="$int($server['enable'])" />
@@ -182,7 +195,7 @@
                         </div>
                         <div class="field-pair advanced-settings">
                             <label class="config" for="port$cur">$T('srv-port')</label>
-                            <input type="number" name="port" id="port$cur" value="$server['port']" size="8" min="0" required />
+                            <input type="number" name="port" id="port$cur" value="$server['port']" size="8" min="0" max="65535" required />
                         </div>
                         <div class="field-pair">
                             <label class="config" for="ssl$cur">$T('srv-ssl')</label>
@@ -200,7 +213,7 @@
                         </div>
                         <div class="field-pair">
                             <label class="config" for="connections$cur">$T('srv-connections')</label>
-                            <input type="number" name="connections" id="connections$cur" value="$server['connections']" min="1" max="1000" required />
+                            <input type="number" name="connections" id="connections$cur" value="$server['connections']" min="1" max="500" required />
                         </div>
                         <div class="field-pair">
                             <label class="config" for="priority$cur">$T('srv-priority')</label>
@@ -215,20 +228,21 @@
                             <input type="number" name="timeout" id="timeout$cur" value="$server['timeout']" min="20" max="240" required /> <i>$T('seconds')</i>
                         </div>
 
-                        <div class="field-pair <!--#if int($certificate_validation) == 0 then "disabled" else ""#--> advanced-settings">
+                        <div class="field-pair advanced-settings">
                             <label class="config" for="ssl_verify$cur">$T('opt-ssl_verify')</label>
-                            <select name="ssl_verify" id="ssl_verify$cur" <!--#if int($certificate_validation) == 0 then "disabled=\"disabled\"" else ""#-->>
-                                <option value="2" <!--#if $server['ssl_verify'] == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
-                                <option value="1" <!--#if $server['ssl_verify'] == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-normal')</option>
+                            <select name="ssl_verify" id="ssl_verify$cur">
+                                <option value="3" <!--#if $server['ssl_verify'] == 3 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
+                                <option value="2" <!--#if $server['ssl_verify'] == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-medium')</option>
+                                <option value="1" <!--#if $server['ssl_verify'] == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-minimal')</option>
                                 <option value="0" <!--#if $server['ssl_verify'] == 0 then 'selected="selected"' else ""#--> >$T('ssl_verify-disabled')</option>
                             </select>
-                            <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
+                            <span class="desc">$T('explain-ssl_verify').replace('-', '<br/>-')</span>
                         </div>
                         <div class="field-pair advanced-settings">
-                            <label class="config" for="ssl_ciphers">$T('opt-ssl_ciphers')</label>
-                            <input type="text" name="ssl_ciphers" id="ssl_ciphers" value="$server['ssl_ciphers']" />
+                            <label class="config" for="ssl_ciphers$cur">$T('opt-ssl_ciphers')</label>
+                            <input type="text" name="ssl_ciphers" id="ssl_ciphers$cur" value="$server['ssl_ciphers']" />
                             <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
-                            <a href="${helpuri}advanced/ssl-ciphers" target="_blank">${helpuri}advanced/ssl-ciphers</a></span>
+                            <a href="https://sabnzbd.org/wiki/advanced/ssl-ciphers" target="_blank">https://sabnzbd.org/wiki/advanced/ssl-ciphers</a></span>
                         </div>
                         <div class="field-pair advanced-settings">
                             <label class="config" for="required$cur">$T('srv-required')</label>
@@ -241,9 +255,10 @@
                             <span class="desc">$T('explain-optional')</span>
                         </div>
                         <div class="field-pair advanced-settings">
-                            <label class="config" for="send_group$cur">$T('srv-send_group')</label>
-                            <input type="checkbox" name="send_group" id="send_group$cur" value="1" <!--#if int($server['send_group']) != 0 then 'checked="checked"' else ""#--> />
-                            <span class="desc">$T('srv-explain-send_group')</span>
+                            <label class="config" for="pipelining_requests$cur">$T('srv-pipelining_requests')</label>
+                            <input type="number" name="pipelining_requests" id="pipelining_requests$cur" value="$server['pipelining_requests']" min="1" max="20" required />
+                            <span class="desc">$T('explain-pipelining_requests')<br>$T('readwiki')
+                            <a href="https://sabnzbd.org/wiki/advanced/nntp-pipelining" target="_blank">https://sabnzbd.org/wiki/advanced/nntp-pipelining</a></span>
                         </div>
                         <div class="field-pair advanced-settings">
                             <label class="config" for="expire_date$cur">$T('srv-expire_date')</label>
@@ -290,7 +305,7 @@
                             <p><b>$T('srv-expire_date'):</b> $(server['expire_date'])</p>
                             <!--#end if#-->
                             <!--#if $server['quota']#-->
-                            <p><b>$T('quota-left'):</b> $(server['quota_left'])B</p>
+                            <p><b>$T('quota-left'):</b> $(server['quota_left'])</p>
                             <!--#end if#-->
                         </div>
                         <div class="server-chart" data-serverid="${cur}">
@@ -301,6 +316,9 @@
                             serverBandwithData[${cur}] = <!--#echo json.dumps($server['amounts'][4])#-->
                             serverArticleTries[${cur}] = <!--#echo json.dumps($server['amounts'][5])#-->
                             serverArticleFailed[${cur}] = <!--#echo json.dumps($server['amounts'][6])#-->
+                            <!--#if int($server['enable']) != 0#-->
+                            hostnames += ",$server['host']"
+                            <!--#end if#-->
                         </script>
                     <!--#end if#-->
                 </div>
@@ -338,8 +356,8 @@
 
     function showCharts() {
         // Get the constants
-        const startDate = new Date(\$('#chart-start').val())
-        const endDate = new Date(\$('#chart-end').val())
+        const startDate = new Date(jQuery('#chart-start').val())
+        const endDate = new Date(jQuery('#chart-end').val())
         const oneDay = 24 * 60 * 60 * 1000
         const nrDays = Math.round((endDate-startDate)/oneDay)
 
@@ -350,8 +368,8 @@
         var maxBandwith = 0
 
         // For each chart
-        \$('.server-chart').each(function(j, elemn) {
-            const server_id = \$(elemn).data('serverid')
+        jQuery('.server-chart').each(function(j, elemn) {
+            const server_id = jQuery(elemn).data('serverid')
             var totalBandwithThisRange = 0
             var totalArticlesTriedThisRange = 0
             var totalArticlesFailedThisRange = 0
@@ -394,7 +412,7 @@
             }
 
             // Update the text value
-            \$('#server-bandwith-value-' + server_id).text(filesize(totalBandwithThisRange, {round: 1}))
+            jQuery('#server-bandwith-value-' + server_id).text(filesize(totalBandwithThisRange, {round: 1}))
 
             // Calculate article success ratio, if available
             var articleRatio = Math.round(100 * (1 - totalArticlesFailedThisRange/totalArticlesTriedThisRange))
@@ -402,17 +420,17 @@
             // If values were missing
             if(!isNaN(articleRatio)) {
                 // Use filesize to convert to unit-display
-                \$('#server-article-value-' + server_id).text('$T("srv-articles-tried")'.replace('%f', articleRatio).replace('%d', filesize(totalArticlesTriedThisRange, {unix: true, round: 0, spacer: "", base: 1})))
+                jQuery('#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()
+                if(articleRatio > 60) jQuery('#server-article-not-complete-' + server_id).hide()
             } else {
-                \$('#server-article-value-' + server_id).text('$T("notAvailable")')
-                \$('#server-article-not-complete-' + server_id).hide()
+                jQuery('#server-article-value-' + server_id).text('$T("notAvailable")')
+                jQuery('#server-article-not-complete-' + server_id).hide()
             }
 
             // Save bandwidth data in a very ugly way, but we need to do this
             // so we can calculate the maximum Y-axis for all graphs
-            \$(elemn).data("chart-data", data)
+            jQuery(elemn).data("chart-data", data)
         })
 
         // Set the maximum
@@ -420,11 +438,11 @@
         chartOptions.axisY.low = 0
 
         // Update all the axis with the largest value and draw the graph
-        \$('.server-chart').each(function(j, elemn) {
-            const server_id = \$(elemn).data('serverid')
+        jQuery('.server-chart').each(function(j, elemn) {
+            const server_id = jQuery(elemn).data('serverid')
 
             // Show the chart
-            chart = new Chartist.Line('#server-chart-'+server_id, \$(elemn).data("chart-data"), chartOptions)
+            chart = new Chartist.Line('#server-chart-'+server_id, jQuery(elemn).data("chart-data"), chartOptions)
             chart.on('created', function(context) {
                 // Make sure to add this as the first child so it's at the bottom
                 context.svg.elem('rect', {
@@ -436,15 +454,15 @@
                     stroke: '#b9b9b9',
                     'stroke-width': '1px'
                 }, '', context.svg, true)
-                \$('#server-chart-'+server_id+' .ct-label.ct-vertical').each(function(index, elmn) {
+                jQuery('#server-chart-'+server_id+' .ct-label.ct-vertical').each(function(index, elmn) {
                     elmn.innerHTML = filesize(elmn.innerHTML, {round: 1}).replace(' ','')
                 })
             });
         })
 
         // Limit input to sensible values
-        \$('#chart-start').attr("max", \$('#chart-end').val())
-        \$('#chart-end').attr("min", \$('#chart-start').val())
+        jQuery('#chart-start').attr("max", jQuery('#chart-end').val())
+        jQuery('#chart-end').attr("min", jQuery('#chart-start').val())
     }
 
     // Need to mitigate timezone effects!
@@ -457,21 +475,21 @@
     /**
         When finished loading
     **/
-    \$(document).ready(function(){
-        // Exception when change of priority, reload
-        \$('input[name="priority"], input[name="displayname"]').on('change', function() {
-            \$('.fullform').submit(function() {
-                // No ajax this time
-                \$('input[name="ajax"]').val('')
-                // Skip the fancy stuff, just submit
-                this.submit()
-            })
+    jQuery(document).ready(function(){
+        // Initialize tooltips
+        jQuery('[data-toggle="tooltip"]').tooltip()
+        
+        // Reload form in case we change items that make the servers appear different
+        jQuery('input[name="priority"], input[name="displayname"], textarea[name="notes"]').on('change', function(event) {
+            var parentForm = jQuery(event.target).parents("form")
+            parentForm.unbind("submit")
+            parentForm.find('input[name="ajax"]').val('')
         })
 
         /**
             Update charts when changed
         **/
-        \$('#chart-start, #chart-end').on('change', function(elemn) {
+        jQuery('#chart-start, #chart-end').on('change', function(elemn) {
             showCharts()
 
             // Lets us leave (needs to be called after the change event)
@@ -486,16 +504,16 @@
         /**
             Click events
         **/
-        \$('.showserver').click(function () {
-            if(\$(this).parent().hasClass('server-disabled')) {
-                \$(this).parent().parent().toggleClass('server-disabled')
+        jQuery('.showserver').click(function () {
+            if(jQuery(this).parent().hasClass('server-disabled')) {
+                jQuery(this).parent().parent().toggleClass('server-disabled')
             }
-            \$(this).parent().next().toggle();
-            \$(this).parent().next().next().toggle();
-            if (\$(this).text().indexOf("$T('showDetails')") > 0) {
-                \$(this).html(\$(this).html().replace("$T('showDetails')", "$T('hideDetails')"));
+            jQuery(this).parent().next().toggle();
+            jQuery(this).parent().next().next().toggle();
+            if (jQuery(this).text().indexOf("$T('showDetails')") > 0) {
+                jQuery(this).html(jQuery(this).html().replace("$T('showDetails')", "$T('hideDetails')"));
             } else {
-                \$(this).html(\$(this).html().replace("$T('hideDetails')", "$T('showDetails')"));
+                jQuery(this).html(jQuery(this).html().replace("$T('hideDetails')", "$T('showDetails')"));
                 // Recalculate the charts if changed while details were open
                 showCharts()
             }
@@ -503,24 +521,24 @@
             addRowColor()
         });
 
-        \$('#addServerButton').click(function(){
-            \$('#addServerContent').show();
+        jQuery('#addServerButton').click(function(){
+            jQuery('#addServerContent').show();
             // Add coloring
             addRowColor()
         });
 
-        \$('[name="ssl"]').click(function() {
+        jQuery('[name="ssl"]').click(function() {
             // Use CSS transitions to do some highlighting
-            var portBox = \$(this).parent().parent().find('[name="port"]')
+            var portBox = jQuery(this).parent().parent().find('[name="port"]')
             if(this.checked) {
                 // Enabled SSL change port when not already a custom port
-                if(portBox.val() == '119') {
+                if(portBox.val() === '119') {
                     portBox.val('563')
                     portBox.addClass('port-highlight')
                 }
             } else {
                 // Remove SSL port
-                if(portBox.val() == '563') {
+                if(portBox.val() === '563') {
                     portBox.val('119')
                     portBox.addClass('port-highlight')
                 }
@@ -529,16 +547,16 @@
         })
 
         // Testing servers
-        \$('.testServer').click(function(event){
+        jQuery('.testServer').click(function(event){
             removeObfuscation()
-            var theButton = \$(this)
+            var theButton = jQuery(this)
             var resultBox = theButton.parents('.col1').find('.result-box .alert');
             theButton.attr("disabled", "disabled")
             theButton.find('span').toggleClass('glyphicon-sort glyphicon-refresh spin-glyphicon')
-            \$.ajax({
+            jQuery.ajax({
                 type: "POST",
                 url: "../../api",
-                data: "mode=config&name=test_server&" + \$(this).parents('form:first').serialize()
+                data: "mode=config&name=test_server&" + jQuery(this).parents('form:first').serialize()
             }).then(function(data) {
                 // Let's replace the link
                 msg = data.value.message.replace('https://sabnzbd.org/certificate-errors', '<a href="https://sabnzbd.org/certificate-errors" class="alert-link" target="_blank">https://sabnzbd.org/certificate-errors</a>')
@@ -553,16 +571,33 @@
                 if(data.value.result) {
                     resultBox.addClass('alert-success')
                     resultBox.prepend('<span class="glyphicon glyphicon-ok-sign"></span> ')
+
+                    // Allow adding the new server if we are in the new-server section
+                    if(theButton.parents("form[action='addServer']").length) {
+                        jQuery(".addNewServer").removeAttr("disabled")
+                        jQuery(".addNewServer").removeAttr("data-toggle")
+                        jQuery(".addNewServer").removeAttr("title")
+                        jQuery(".addNewServer").tooltip("destroy")
+                    }
                 } else {
                     resultBox.addClass('alert-danger')
                     resultBox.prepend('<span class="glyphicon glyphicon-exclamation-sign"></span> ')
+
+                    // Disable the adding of new server, just to be sure
+                    if(theButton.parents("form[action='addServer']").length) {
+                        jQuery(".addNewServer").attr("disabled", "disabled")
+                        jQuery(".addNewServer").attr("data-toggle", "tooltip")
+                        jQuery(".addNewServer").attr("data-placement", "top")
+                        jQuery(".addNewServer").attr("title", "$T('wizard-test-server-required')")
+                        jQuery(".addNewServer").tooltip()
+                    }
                 }
             });
         });
 
-        \$('.delServer').click(function(){
+        jQuery('.delServer').click(function(){
             if( confirm("$T('confirm')") ) {
-                \$(this).parents('form:first').attr('action','delServer').submit();
+                jQuery(this).parents('form:first').attr('action','delServer').submit();
                 // Let us leave!
                 formWasSubmitted = true;
                 formHasChanged = false;
@@ -571,9 +606,9 @@
             return false;
         });
 
-        \$('.clrServer').click(function(){
+        jQuery('.clrServer').click(function(){
             if( confirm("$T('confirm')") ) {
-                \$(this).parents('form:first').attr('action','clrServer').submit();
+                jQuery(this).parents('form:first').attr('action','clrServer').submit();
                 // Let us leave!
                 formWasSubmitted = true;
                 formHasChanged = false;
@@ -582,9 +617,9 @@
             return false;
         });
 
-        \$('.toggleServerCheckbox').click(function(){
-            var whichServer = \$(this).attr("name");
-            \$.ajax({
+        jQuery('.toggleServerCheckbox').click(function(){
+            var whichServer = jQuery(this).attr("name");
+            jQuery.ajax({
                 type: "POST",
                 url: "toggleServer",
                 data: {server: whichServer, apikey: "$apikey" }
@@ -595,6 +630,35 @@
                 setTimeout(function() { location.reload(); }, 100)
             });
         });
+
+        // Show text-ad if there is space
+        if((jQuery("body").width() - jQuery("#content").width())/2 > (jQuery('.Servers .server-frame').width() + 40)) {
+            // Do not show if dismissed previously
+            if(localStorage.getItem("server-frame-hide-$version") === null) {
+                // Let the page on the server tell us if we need to show
+                function receiveMessage(event) {
+                    // Check origin of message for security reasons
+                    if(event.origin === 'https://sabnzbd.org') {
+                        if(event.data === 'show_server') {
+                            jQuery('.Servers .server-frame').show()
+                            jQuery('.Servers .server-frame a').click(function () {
+                                localStorage.setItem("server-frame-hide-$version", "hide")
+                                jQuery('.Servers .server-frame').hide()
+                            })
+                        }
+                        if(event.data === 'hide_server') {
+                            // Hide and don't load anymore until the next release
+                            jQuery('.Servers .server-frame').hide()
+                            localStorage.setItem("server-frame-hide-$version", "hide")
+                        }
+                    }
+                }
+                window.addEventListener("message", receiveMessage, false);
+
+                // NOTE: The hash-part cannot be seen by the server, so we don't know which hostnames you use!
+                jQuery('.Servers .server-frame iframe').attr("src", "https://sabnzbd.org/servers#$active_lang" + hostnames)
+            }
+        }
     });
 </script>
 

interfaces/Config/templates/config_special.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Special"#-->
-<!--#set global $help_uri="configuration/3.7/special"#-->
+<!--#set global $help_uri = $confighelpuri + "special"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -10,7 +10,7 @@
         </div>
         <div class="section">
             <div class="col2">
-                <h3>$T('sptag-boolean') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('sptag-boolean') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -33,7 +33,7 @@
         </div><!-- /section -->
         <div class="section">
             <div class="col2">
-                <h3>$T('sptag-entries') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('sptag-entries') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>

interfaces/Config/templates/config_switches.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Switches"#-->
-<!--#set global $help_uri="configuration/3.7/switches"#-->
+<!--#set global $help_uri = $confighelpuri + "switches"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -14,19 +14,10 @@
         <input type="hidden" name="output" value="json" />
         <div class="section advanced-settings">
             <div class="col2">
-                <h3>$T('swtag-server') <a href="$helpuri$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-server') <a href="$help_uri#toc1" 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="load_balancing">$T('opt-load_balancing')</label>
-                        <select name="load_balancing" id="load_balancing">
-                            <option value="0" <!--#if $load_balancing == 0 then 'selected="selected"' else ""#--> >$T('no-load-balancing')</option>
-                            <option value="1" <!--#if $load_balancing == 1 then 'selected="selected"' else ""#--> >$T('load-balancing')</option>
-                            <option value="2" <!--#if $load_balancing == 2 then 'selected="selected"' else ""#--> >$T('load-balancing-happy-eyeballs')</option>
-                        </select>
-                        <span class="desc">$T('explain-load_balancing')</span>
-                    </div>
                     <div class="field-pair">
                         <label class="config" for="max_art_tries">$T('opt-max_art_tries')</label>
                         <input type="number" name="max_art_tries" id="max_art_tries" value="$max_art_tries" min="2" max="2000" />
@@ -46,11 +37,11 @@
         </div><!-- /section -->
         <div class="section">
             <div class="col2">
-                <h3>$T('swtag-queue') <a href="$helpuri$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-queue') <a href="$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="pre_script">$T('opt-pre_script')</label>
                         <select name="pre_script" id="pre_script">
                         <!--#for $sc in $scripts#-->
@@ -63,9 +54,22 @@
                         </select>
                         <span class="desc">$T('explain-pre_script')</span>
                     </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="end_queue_script">$T('opt-end_queue_script')</label>
+                        <select name="end_queue_script" id="end_queue_script">
+                        <!--#for $sc in $scripts#-->
+                            <!--#if $sc.lower() == $end_queue_script.lower()#-->
+                                <option value="$sc" selected="selected">$Tspec($sc)</option>
+                            <!--#else#-->
+                                <option value="$sc">$Tspec($sc)</option>
+                            <!--#end if#-->
+                        <!--#end for#-->
+                        </select>
+                        <span class="desc">$T('explain-end_queue_script')</span>
+                    </div>
                     <div class="field-pair">
                         <label class="config" for="propagation_delay">$T('opt-propagation_delay')</label>
-                        <input type="number" name="propagation_delay" id="propagation_delay" value="$propagation_delay" /> <i>$T('minutes')</i>
+                        <input type="number" name="propagation_delay" id="propagation_delay" value="$propagation_delay" min="0" /> <i>$T('minutes')</i>
                         <span class="desc">$T('explain-propagation_delay')</span>
                     </div>
                     <div class="field-pair advanced-settings">
@@ -89,33 +93,39 @@
                             <option value="0" <!--#if int($no_dupes) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
                             <option value="4" <!--#if int($no_dupes) == 4 then 'selected="selected"' else ""#--> >$T('nodupes-tag')</option>
                             <option value="2" <!--#if int($no_dupes) == 2 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="3" <!--#if int($no_dupes) == 3 then 'selected="selected"' else ""#--> >$T('nodupes-fail')</option>
+                            <option value="3" <!--#if int($no_dupes) == 3 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
                             <option value="1" <!--#if int($no_dupes) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-ignore')</option>
                         </select>
-                        <span class="desc">$T('explain-no_dupes')</span>
+                        <span class="desc">
+                            $T('explain-no_dupes')<br>
+                            <a href="https://sabnzbd.org/wiki/duplicate-detection" target="_blank">https://sabnzbd.org/wiki/duplicate-detection</a>
+                        </span>
                     </div>
                     <div class="field-pair">
-                        <label class="config" for="no_series_dupes">$T('opt-no_series_dupes')</label>
-                        <select name="no_series_dupes" id="no_series_dupes">
-                            <option value="0" <!--#if int($no_series_dupes) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
-                            <option value="4" <!--#if int($no_series_dupes) == 4 then 'selected="selected"' else ""#--> >$T('nodupes-tag')</option>
-                            <option value="2" <!--#if int($no_series_dupes) == 2 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="3" <!--#if int($no_series_dupes) == 3 then 'selected="selected"' else ""#--> >$T('nodupes-fail')</option>
-                            <option value="1" <!--#if int($no_series_dupes) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-ignore')</option>
+                        <label class="config" for="no_smart_dupes">$T('opt-no_smart_dupes')</label>
+                        <select name="no_smart_dupes" id="no_smart_dupes">
+                            <option value="0" <!--#if int($no_smart_dupes) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
+                            <option value="4" <!--#if int($no_smart_dupes) == 4 then 'selected="selected"' else ""#--> >$T('nodupes-tag')</option>
+                            <option value="2" <!--#if int($no_smart_dupes) == 2 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
+                            <option value="3" <!--#if int($no_smart_dupes) == 3 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
+                            <option value="1" <!--#if int($no_smart_dupes) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-ignore')</option>
                         </select>
-                        <span class="desc">$T('explain-no_series_dupes')</span>
+                        <span class="desc">
+                            $T('explain-no_smart_dupes')<br>
+                            <a href="https://sabnzbd.org/wiki/duplicate-detection" target="_blank">https://sabnzbd.org/wiki/duplicate-detection</a>
+                        </span>
                     </div>
                     <div class="field-pair advanced-settings">
-                        <label class="config" for="series_propercheck">$T('opt-series_propercheck')</label>
-                        <input type="checkbox" name="series_propercheck" id="series_propercheck" value="1" <!--#if int($series_propercheck) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-series_propercheck')</span>
+                        <label class="config" for="dupes_propercheck">$T('opt-dupes_propercheck')</label>
+                        <input type="checkbox" name="dupes_propercheck" id="dupes_propercheck" value="1" <!--#if int($dupes_propercheck) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-dupes_propercheck')</span>
                     </div>
                     <div class="field-pair">
                         <label class="config" for="pause_on_pwrar">$T('opt-pause_on_pwrar')</label>
                         <select name="pause_on_pwrar" id="pause_on_pwrar">
                             <option value="0" <!--#if int($pause_on_pwrar) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
                             <option value="1" <!--#if int($pause_on_pwrar) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="2" <!--#if int($pause_on_pwrar) == 2 then 'selected="selected"' else ""#--> >$T('abort')</option>
+                            <option value="2" <!--#if int($pause_on_pwrar) == 2 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
                         </select>
                         <span class="desc">$T('explain-pause_on_pwrar')</span>
                     </div>
@@ -133,7 +143,7 @@
                         <select name="action_on_unwanted_extensions" id="action_on_unwanted_extensions">
                             <option value="0" <!--#if int($action_on_unwanted_extensions) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
                             <option value="1" <!--#if int($action_on_unwanted_extensions) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="2" <!--#if int($action_on_unwanted_extensions) == 2 then 'selected="selected"' else ""#--> >$T('abort')</option>
+                            <option value="2" <!--#if int($action_on_unwanted_extensions) == 2 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
                         </select>
                         <span class="desc">$T('explain-action_on_unwanted_extensions')</span>
                     </div>
@@ -165,7 +175,7 @@
         </div><!-- /section -->
         <div class="section">
             <div class="col2">
-                <h3>$T('swtag-pp') <a href="$helpuri$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-pp') <a href="$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -183,12 +193,12 @@
                     <div class="field-pair advanced-settings <!--#if not $have_nice then "disabled" else "" #-->">
                         <label class="config" for="nice">$T('opt-nice')</label>
                         <input type="text" name="nice" id="nice" value="$nice" <!--#if not $have_nice then 'readonly="readonly" disabled="disabled"' else "" #--> />
-                        <span class="desc">$T('explain-nice')</span>
+                        <span class="desc">$T('readwiki')</span>
                     </div>
                     <div class="field-pair advanced-settings <!--#if not $have_ionice then "disabled" else "" #-->">
                         <label class="config" for="ionice">$T('opt-ionice')</label>
                         <input type="text" name="ionice" id="ionice" value="$ionice" <!--#if not $have_ionice then 'readonly="readonly" disabled="disabled"' else "" #--> />
-                        <span class="desc">$T('explain-ionice')</span>
+                        <span class="desc">$T('readwiki')</span>
                     </div>
                     <!--#else#-->
                     <div class="field-pair advanced-settings">
@@ -200,13 +210,13 @@
                             <option value="2" <!--#if int($win_process_prio) == 2 then 'selected="selected"' else ""#-->>$T('win_process_prio-low')</option>
                             <option value="1" <!--#if int($win_process_prio) == 1 then 'selected="selected"' else ""#-->>$T('win_process_prio-idle')</option>
                         </select>
-                        <span class="desc">$T('explain-win_process_prio')</span>
+                        <span class="desc">$T('readwiki')</span>
                     </div>
                     <!--#end if#-->
                     <div class="field-pair advanced-settings">
                         <label class="config" for="par_option">$T('opt-par_option')</label>
                         <input type="text" name="par_option" id="par_option" value="$par_option" />
-                        <span class="desc">$T('explain-par_option')</span>
+                        <span class="desc">$T('readwiki')</span>
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="sfv_check">$T('opt-sfv_check')</label>
@@ -233,11 +243,6 @@
                         <input type="checkbox" name="script_can_fail" id="script_can_fail" value="1" <!--#if int($script_can_fail) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-script_can_fail')</span>
                     </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="new_nzb_on_failure">$T('opt-new_nzb_on_failure')</label>
-                        <input type="checkbox" name="new_nzb_on_failure" id="new_nzb_on_failure" value="1" <!--#if int($new_nzb_on_failure) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-new_nzb_on_failure')</span>
-                    </div>
                     <div class="field-pair">
                         <label class="config" for="ignore_samples">$T('opt-ignore_samples')</label>
                         <input type="checkbox" name="ignore_samples" id="ignore_samples" value="1" <!--#if int($ignore_samples) > 0 then 'checked="checked"' else ""#--> />
@@ -254,16 +259,17 @@
                         <span class="desc">$T('explain-cleanup_list')</span>
                     </div>
                     <div class="field-pair">
-                        <label class="config" for="history_retention_select">$T('opt-history_retention')</label>
-                        <input type="hidden" name="history_retention" id="history_retention" value="$history_retention">
-                        <select name="history_retention_select" id="history_retention_select">
-                            <option value="0">$T('history_retention-all')</option>
-                            <option value="n">$T('history_retention-number')</option>
-                            <option value="d">$T('history_retention-days')</option>
-                            <option value="-1">$T('history_retention-none')</option>
+                        <label class="config" for="history_retention_option">$T('opt-history_retention')</label>
+                        <select name="history_retention_option" id="history_retention_option">
+                            <option value="all" <!--#if $auto_sort == "all" then 'selected="selected"' else ""#-->>$T('history_retention-all')</option>
+                            <option value="number-archive" <!--#if $history_retention_option == "number-archive" then 'selected="selected"' else ""#-->>$T('history_retention-number-archive')</option>
+                            <option value="number-delete" <!--#if $history_retention_option == "number-delete" then 'selected="selected"' else ""#-->>$T('history_retention-number-delete')</option>
+                            <option value="days-archive" <!--#if $history_retention_option == "days-archive" then 'selected="selected"' else ""#-->>$T('history_retention-days-archive')</option>
+                            <option value="days-delete" <!--#if $history_retention_option == "days-delete" then 'selected="selected"' else ""#-->>$T('history_retention-days-delete')</option>
+                            <option value="all-archive" <!--#if $history_retention_option == "all-archive" then 'selected="selected"' else ""#-->>$T('history_retention-archive')</option>
+                            <option value="all-delete" <!--#if $history_retention_option == "all-delete" then 'selected="selected"' else ""#-->>$T('history_retention-none')</option>
                         </select>
-                        <input type="number" id="history_retention_number" name="history_retention_number" min="1">
-                        <span class="desc">$T('explain-history_retention').replace('. ', '.<br/>')</span>
+                        <input type="number" id="history_retention_number" name="history_retention_number" min="1" value="$history_retention_number">
                     </div>
                     <div class="field-pair">
                         <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
@@ -274,7 +280,7 @@
         </div><!-- /section -->
         <div class="section advanced-settings">
             <div class="col2">
-                <h3>$T('swtag-naming') <a href="$helpuri$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-naming') <a href="$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -314,7 +320,7 @@
         </div><!-- /section -->
         <div class="section">
             <div class="col2">
-                <h3>$T('swtag-quota') <a href="$helpuri$help_uri#toc5" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-quota') <a href="$help_uri#toc5" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -353,57 +359,29 @@
 </div><!-- /colmask -->
 
 <script type="text/javascript">
-\$(document).ready(function() {
-    \$('#history_retention_select, #history_retention_number').on('change', updateHistoryRetention)
+jQuery(document).ready(function() {
+    jQuery('#history_retention_option').on('change', updateHistoryRetention)
     function updateHistoryRetention() {
-        var retention_setting = \$('#history_retention')
-        var retention_select = \$('#history_retention_select').val()
-        var retention_number = \$('#history_retention_number')
-        // Keep all or keep none
-        if(retention_select == "0" || retention_select == "-1") {
+        var retention_option = jQuery('#history_retention_option').val()
+        var retention_number = jQuery('#history_retention_number')
+
+        if(retention_option === "number-archive" || retention_option === "number-delete") {
+            retention_number.show()
+            retention_number.attr('placeholder', '$T('history_retention-limit')')
+        } else if(retention_option === "days-archive" || retention_option === "days-delete") {
+            retention_number.show()
+            retention_number.attr('placeholder', '$T('days').capitalize()')
+        } else {
             retention_number.hide()
             retention_number.val('')
             retention_number.attr('placeholder', '')
-            retention_setting.val(retention_select)
-        } else {
-            retention_number.show()
-            // Days or number?
-            if(retention_select.indexOf("d") !== -1) {
-                retention_number.attr('placeholder', '$T('days').capitalize()')
-                if(retention_number.val()) {
-                    retention_setting.val(retention_number.val() + 'd')
-                } else if(parseInt(retention_setting.val()) > 0) {
-                    retention_number.val(parseInt(retention_setting.val()))
-                }
-            } else {
-                retention_number.attr('placeholder', '$T('history_retention-limit')')
-                if(retention_number.val()) {
-                    retention_setting.val(retention_number.val())
-                } else if(parseInt(retention_setting.val()) > 0) {
-                    retention_number.val(parseInt(retention_setting.val()))
-                }
-            }
         }
     }
-    // Set the history-retention settig
-    var retention_setting_value = \$('#history_retention').val()
-    if(parseInt(retention_setting_value) > 0) {
-        // Days or number?
-        if(retention_setting_value.indexOf("d") !== -1) {
-            \$('#history_retention_select').val("d")
-        } else {
-            \$('#history_retention_select').val("n")
-        }
-        \$('#history_retention_number').val(parseInt(retention_setting_value))
-    } else {
-        // Keep all or keep none
-        \$('#history_retention_select').val(retention_setting_value)
-        \$('#history_retention_number').hide()
-    }
+    updateHistoryRetention()
 
-    \$('.restoreDefaults').click(function(e) {
+    jQuery('.restoreDefaults').click(function(e) {
         // Get section name
-        var sectionName = \$(this).parents('.section').find('.col2 h3').text().trim()
+        var sectionName = jQuery(this).parents('.section').find('.col2 h3').text().trim()
 
         // Confirm?
         if(!confirm("$T('explain-restoreDefaults') \""+sectionName+"\"\n$T('confirm')")) return false
@@ -411,11 +389,11 @@
 
         // Need to get all the input values, so same way as saving normally
         var key_container = {}
-        \$(this).parents('.section').extractFormDataTo(key_container);
+        jQuery(this).parents('.section').extractFormDataTo(key_container);
         key_container = Object.keys(key_container)
 
         // Send request
-        \$.ajax({
+        jQuery.ajax({
             type: "GET",
             url: "../../api",
             data: "mode=set_config_default&apikey=${apikey}&output=json&keyword=" + key_container.join('&keyword=')

interfaces/Config/templates/login/main.tmpl

@@ -1,3 +1,4 @@
+<!DOCTYPE HTML>
 <html lang="$active_lang">
 <head>
     <title>SABnzbd - $T('login')</title>
@@ -15,6 +16,9 @@
 
     <link rel="stylesheet" type="text/css" href="../staticcfg/bootstrap/css/bootstrap.min.css?v=$version" />
     <link rel="stylesheet" type="text/css" href="../staticcfg/css/login.css?v=$version" />
+    <!--#if $color_scheme not in ('Light', '') #-->
+    <link rel="stylesheet" type="text/css" href="../staticcfg/css/${color_scheme}.css?v=$version"/>
+    <!--#end if#-->
 
     <script type="text/javascript" src="../staticcfg/js/jquery-3.5.1.min.js?v=$version"></script>
     <script type="text/javascript" src="../staticcfg/bootstrap/js/bootstrap.min.js?v=$version"></script>
@@ -33,8 +37,8 @@
                 <div class="alert alert-danger" role="alert">$error</div>
                 <!--#end if#-->
 
-                <input type="text" class="form-control" name="username" placeholder="$T('srv-username')" required autofocus>
-                <input type="password" class="form-control" name="password" placeholder="$T('srv-password')" required>
+                <input type="text" class="form-control" name="username" placeholder="$T('srv-username')" autocomplete="username" required autofocus>
+                <input type="password" class="form-control" name="password" placeholder="$T('srv-password')" autocomplete="current-password" required>
 
                 <button class="btn btn-default"><span class="glyphicon glyphicon-circle-arrow-right"></span> $T('login') </button>
 
@@ -47,16 +51,16 @@
         </div>
         <script type="text/javascript">
             // Tooltip
-            \$('[data-toggle="tooltip"]').tooltip()
+            jQuery('[data-toggle="tooltip"]').tooltip()
             // Try-catch in case somebody disabled localstorage
             try {
                 // Set what was done previously
-                \$('input[type="checkbox"]').prop('checked', localStorage.getItem("remember_me") === 'true')
+                jQuery('input[type="checkbox"]').prop('checked', localStorage.getItem("remember_me") === 'true')
                 // Store if we change something
-                \$('input[type="checkbox"]').on('change', function() {
-                    localStorage.setItem("remember_me", \$(this).is(':checked'));
+                jQuery('input[type="checkbox"]').on('change', function() {
+                    localStorage.setItem("remember_me", jQuery(this).is(':checked'));
                 })
             } catch(err) { }
         </script>
     </body>
- </html>
+ </html>

interfaces/Config/templates/staticcfg/css/Auto.css

@@ -0,0 +1 @@
+@import url('Night.css') screen and (prefers-color-scheme: dark);

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

@@ -0,0 +1,298 @@
+body {
+    background-color: black;
+    color: #EBEBEB !important;
+}
+
+a:not(.btn) {
+    color: #63a7e1;
+}
+
+.btn {
+    box-shadow: 1px 1px 1px rgba(255, 255, 255, .1) !important;
+}
+
+.btn:not(.btn-danger),
+.btn-default,
+input,
+select,
+textarea,
+.advanced-button,
+.list-group-item  {
+    border-color: #252525 !important;
+}
+
+#addFeed,
+#addFeedContent,
+.section {
+    border-bottom: 1px solid #555555;
+}
+
+.col2 p,
+.col2-cats {
+    color: #AAA;
+}
+
+.col2 h3 {
+    background: none repeat scroll 0 0 #555555;
+}
+
+.catTable,
+.dropdown-menu,
+.dropdown-menu .divider,
+.even,
+.Key tr:nth-child(odd),
+.language:hover,
+.navbar-default .navbar-nav>.open>a,
+.navbar-default .navbar-nav>.open>a:focus,
+.navbar-default .navbar-nav>.open>a:hover,
+.navbar-default .navbar-nav>li>a.active,
+.navbar-default .navbar-nav>li>a:hover,
+.navbar-default .navbar-nav>li>a:focus,
+.navbar-logo:hover,
+.quoteBlock,
+.server-disabled,
+#serverResponse,
+.table>tbody>tr:nth-child(odd),
+.table-striped>tbody>tr:nth-child(odd),
+ul.tabs li.active a,
+select[disabled],
+select:hover {
+    background-color: #444444 !important;
+    color: #EBEBEB !important;
+}
+
+.failed {
+    color: #ff3333 !important;
+}
+
+#rightGreyText,
+small {
+    color: #c7c7c7 !important;
+}
+
+.Categories form.sorting-row:nth-child(2n-1) tr,
+.advanced-button,
+.advanced-buttonSeperator,
+.alt,
+.infoTableSeperator.alt,
+.btn:not(.btn-danger),
+.btn-default.disabled:active,
+.btn-default.disabled:focus,
+.btn-default.disabled:hover,
+a.btn.btn-default,
+select.form-control,
+.form-control[disabled],
+.input-group-addon,
+#inner,
+.navbar-default,
+.search-box input,
+.select,
+.table-striped>tbody>tr:nth-child(even),
+.table>tbody>tr:nth-child(even),
+.tab-pane tr:nth-child(odd),
+textarea,
+ul.tabs a.active,
+a.list-group-item,
+.dropdown-menu>li>a,
+input[type="text"],
+input[type="email"],
+input[type="url"],
+input[type="date"],
+input[type="number"],
+input[type="password"],
+input[disabled],
+textarea,
+select {
+    background-color: #555555;
+    color: #EBEBEB;
+}
+
+.btn:hover:not(.btn-danger),
+.btn-default:hover,
+.tab-content .catTable tr:hover td,
+input:hover,
+textarea:hover,
+a.list-group-item:hover,
+select:hover,
+textarea:hover,
+input[type="date"]:hover,
+input[type="datetime"]:hover,
+input[type="datetime-local"]:hover,
+input[type="email"]:hover,
+input[type="month"]:hover,
+input[type="number"]:hover,
+input[type="password"]:hover,
+input[type="search"]:hover,
+input[type="tel"]:hover,
+input[type="text"]:hover,
+input[type="time"]:hover,
+input[type="url"]:hover,
+input[type="week"]:hover,
+textarea:focus,
+select:focus,
+input[type="date"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="email"]:focus,
+input[type="month"]:focus,
+input[type="number"]:focus,
+input[type="password"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="text"]:focus,
+input[type="time"]:focus,
+input[type="url"]:focus,
+input[type="week"]:focus {
+    background-color: #666;
+    color: #EBEBEB;
+}
+
+.btn-default:focus,
+.form-control:focus,
+input:focus,
+textarea:focus,
+select:focus {
+    border-color: #707070 !important;
+    outline: initial !important;
+    box-shadow: 0 0 0 0.25rem rgba(255, 255, 255, 0.3) !important;
+}
+
+.modal-backdrop {
+    background-color: #262626 !important;
+}
+
+.Key tr {
+    border: none;
+}
+
+.table>tbody>tr>td,
+.table>tbody>tr>th,
+.infoTableSeperator,
+.modal-footer,
+.data-row {
+    border-top: 1px solid #555555;
+}
+
+hr {
+    border-top: 1px solid #555555;
+}
+
+.btn-danger {
+    border-color: #7b2b28;
+}
+
+.tab-content .catTable tbody,
+ul.tabs a,
+.colmask,
+#subscriptions,
+.RSS form[action="add_rss_feed"] tr:nth-child(even),
+.Config .table {
+    border: 1px solid #555555;
+}
+
+.Categories form:first-of-type tr:last-of-type,
+.default,
+.dropdown-menu>li>a:focus,
+.dropdown-menu>li>a:hover {
+    background-color: #696969;
+}
+
+.activeRSS,
+.activeRSS a,
+.activeRSS a:visited,
+.btn-default,
+.checkbox label,
+.feed-row td,
+.help-block,
+#content,
+.navbar-default .navbar-nav>li>a,
+.navbar-default .navbar-nav>li>a>.glyphicon,
+.path,
+.Servers .ct-label,
+.time,
+.main-restarting.in,
+#search-dropdown .dropdown-header,
+ul.tabs a,
+a.wizard-advanced-settings,
+.quoteBlock a,
+a.main-helplink,
+col2 h3 a,
+.text-center a,
+.text-center a:hover {
+    color: #EBEBEB;
+}
+
+.container,
+#content {
+    background-color: unset !important;
+}
+
+#content>div.colmask>div:nth-child(3) {
+    border-bottom: 1px solid #555555 !important;
+}
+
+.Servers .ct-series-a .ct-line,
+.Servers .ct-series-a .ct-point {
+    stroke: #EBEBEB;
+}
+
+#inner,
+.colmask {
+    background-color: #303030;
+}
+
+.modal-header {
+    background-color: #3C3C3C;
+}
+
+.modal-content,
+.modal-body,
+.modal-footer {
+    background-color: #727272;
+}
+
+#modal_qr .modal-body {
+    background-color: #EBEBEB;
+}
+
+.form-signin .btn.btn-default {
+    color: black;
+}
+
+.rss-icon-svg {
+    fill: white;
+}
+
+.rss-symbol {
+    fill: #555555;
+}
+
+::placeholder {
+    color: #EBEBEB !important;
+    opacity: 0.5;
+}
+
+.tooltip-inner {
+    background-color: #E4E4E4 !important;
+    color: #000 !important;
+}
+/* for login */
+.tooltip.bottom .tooltip-arrow {
+    border-bottom-color: #E4E4E4 !important;
+}
+/* config>general - host-warning */
+.tooltip.top .tooltip-arrow {
+    border-top-color: #E4E4E4 !important;
+}
+
+.tooltip.left .tooltip-arrow {
+    border-left-color: #E4E4E4 !important;
+}
+
+.tooltip.right .tooltip-arrow {
+    border-right-color: #E4E4E4 !important;
+}
+
+.Special .glyphicon-asterisk {
+    color: #E4E4E4 !important;
+}

interfaces/Config/templates/staticcfg/css/login.css

@@ -7,7 +7,10 @@ body {
     border-radius: 0 !important;
 }
 
-.btn, .btn:hover, .btn:active, .btn:focus {
+.btn,
+.btn:hover,
+.btn:active,
+.btn:focus {
     box-shadow: 1px 1px 1px rgba(0,0,0,.1) !important;
     background-color: white !important;
 }
@@ -38,7 +41,7 @@ body {
 }
 
 .text-center a:hover {
-    color: black !important;
+    color: black;
 }
 
 .form-signin .alert {

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

@@ -19,6 +19,7 @@ body {
     float: left;
     overflow: visible;
     border: 1px solid #dfdede;
+    border-bottom: none !important;
     background-color: #FFF;
     width: 100%
 }
@@ -89,15 +90,20 @@ body {
     display: block;
     position: static;
     float: right;
-    color: black !important;
+    color: black;
     padding: 0px;
     font-size: 1.2em;
 }
 .example {
     background-color: #fefeee;
 }
+.presets strong {
+    display: inline-block;
+    width: 75px;
+}
 .presets {
     margin-bottom: -6px;
+    max-width: 60%;
 }
 .presets input {
     margin: 2px 0;
@@ -159,6 +165,9 @@ input[type="checkbox"]+.desc {
     color: #666;
     margin: 1em 0;
 }
+.col2 p {
+    margin-left: 3px;
+}
 .field-pair {
     padding: 6px;
     clear: both;
@@ -172,8 +181,8 @@ input[type="checkbox"]+.desc {
     background-color: #F8F8F8;
 }
 .field-pair:last-child,
-.no-field-pair-bg {
-    background-color: transparent;
+.field-pair.no-field-pair-bg {
+    background-color: transparent !important;
 }
 .alt,
 .infoTableSeperator.alt {
@@ -220,10 +229,38 @@ input[type='checkbox'] {
     padding: 0;
     margin-left: 5px;
 }
-textarea:hover, input[type="date"]:hover, input[type="datetime"]:hover, input[type="datetime-local"]:hover, input[type="email"]:hover, input[type="month"]:hover, input[type="number"]:hover, input[type="password"]:hover, input[type="search"]:hover, input[type="tel"]:hover, input[type="text"]:hover, input[type="time"]:hover, input[type="url"]:hover, input[type="week"]:hover, textarea:focus, input[type="date"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="email"]:focus, input[type="month"]:focus, input[type="number"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="text"]:focus, input[type="time"]:focus, input[type="url"]:focus, input[type="week"]:focus {
+textarea:hover,
+input[type="date"]:hover,
+input[type="datetime"]:hover,
+input[type="datetime-local"]:hover,
+input[type="email"]:hover,
+input[type="month"]:hover,
+input[type="number"]:hover,
+input[type="password"]:hover,
+input[type="search"]:hover,
+input[type="tel"]:hover,
+input[type="text"]:hover,
+input[type="time"]:hover,
+input[type="url"]:hover,
+input[type="week"]:hover,
+textarea:focus,
+input[type="date"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="email"]:focus,
+input[type="month"]:focus,
+input[type="number"]:focus,
+input[type="password"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="text"]:focus,
+input[type="time"]:focus,
+input[type="url"]:focus,
+input[type="week"]:focus {
     background-color: #fffff0;
     border: 1px solid #aaa;
 }
+
 .col1 input[type='checkbox'] {
     position: absolute;
     top: auto!important;
@@ -326,6 +363,49 @@ tr.separator {
     margin: 5px;
 }
 
+.Sorting .explain-pattern {
+    border: none;
+    width: 100%;
+}
+.Sorting .pattern-table {
+    border:1px solid #ccc;
+}
+.Sorting .sorter-switch {
+    margin-right: 0.2em;
+}
+.Sorting .sorter-switch-container {
+    margin: 10px 0px;
+    height: 1.5em;
+    display: block;
+}
+.Sorting .sorter-placeholder {
+    position: relative;
+}
+.Sorting .sorter-placeholder:after {
+    content: "\e034";
+    font-family: "Glyphicons Halflings";
+    background: unset;
+    text-align: center;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 30px;
+    border-radius: 15px;
+    border: 1px dashed #444;
+}
+.Sorting .glyphicon-option-vertical {
+    margin-top: 1.5em;
+    margin-right: 0.2em;
+    cursor: move;
+}
+.Sorting form:not(.sorting-row) .glyphicon-option-vertical {
+    visibility: hidden;
+}
+.Sorting .sorting-quick-setup {
+    padding: 1.5em 2em 3em
+}
+
 .RSS .rss-section input[type="text"] {
     max-width: 180px;
 }
@@ -421,6 +501,9 @@ tr.separator {
 .align-center {
     text-align: center;
 }
+.valign-top {
+    vertical-align: top;
+}
 .nowrap {
     white-space: nowrap;
 }
@@ -784,6 +867,7 @@ select {
     vertical-align:middle;
     max-width: 100%;
     min-height: 34px;
+    min-width: 55px;
     font-size: 13px;
     background-color: white;
 }
@@ -930,7 +1014,7 @@ input[type="checkbox"] {
 }
 */
 .navbar-default .navbar-nav>li>a {
-    color: black !important;
+    color: black;
 }
 
 .navbar-default .navbar-nav>li>a:hover,
@@ -967,6 +1051,32 @@ input[type="checkbox"] {
     margin: 10px 0px;
 }
 
+.Servers .server-frame {
+    position: relative;
+    width: 220px;
+    height: 325px;
+    margin-bottom: -325px;
+    left: -240px;
+    display: none;
+}
+
+.Servers .server-frame a {
+    color: black !important;
+    text-decoration: none !important;
+    opacity: 0.8;
+    font-size: 2em;
+    font-family: arial, sans-serif !important;
+    position: absolute;
+    right: 5px;
+    top: -5px;
+}
+
+.Servers .server-frame iframe {
+    width: 100%;
+    height: 100%;
+    border: 0;
+}
+
 .Servers .col2 .label {
     margin-top: 8px;
     font-size: 0.85em;
@@ -1116,7 +1226,6 @@ input[type="checkbox"] {
 }
 .value-and-select select {
     min-width: 30px;
-    margin-top: 1px;
 }
 
 .dotOne, .dotTwo, .dotThree {
@@ -1248,6 +1357,12 @@ html[dir="rtl"] .Scheduling form[action="addSchedule"] input[type="checkbox"] {
         padding: 0px 15px 10px;
         width: inherit;
     }
+    .Sorting .glyphicon-option-vertical {
+        display: none;
+    }
+    .Sorting .sorter h3 {
+        cursor: move;
+    }
 }
 
 @media screen and (max-width: 768px) {

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

@@ -60,6 +60,7 @@
         // Initialize
         this.element = $(element);
         this.initialDir = null;
+        this.showFiles = false;
         this.currentBrowserPath = null;
         this.currentRequest = null;
         this.fileBrowserDialog = $('#filebrowser_modal .modal-body');
@@ -99,6 +100,11 @@
             this.initialDir = this.element.data('initialdir') + folderSeperator + this.element.val();
         }
 
+        // Are we selecting files or folders
+        if(this.element.data('files')) {
+            this.showFiles = true
+        }
+
         // Browse
         this.browse(this.initialDir , folderBrowseUrl);
 
@@ -109,13 +115,13 @@
                 // Remove start
                 self.currentBrowserPath = self.currentBrowserPath.replace(self.element.data('initialdir')+folderSeperator, '');
                 // If it's identical to the initial dir the replacement won't work
-                if(self.currentBrowserPath == self.element.data('initialdir')) {
+                if(self.currentBrowserPath === self.element.data('initialdir')) {
                     self.currentBrowserPath = '';
                 }
             }
 
             // Changed?
-            if(self.element.val() != self.currentBrowserPath) {
+            if(self.element.val() !== self.currentBrowserPath) {
                 self.element.val(self.currentBrowserPath);
                 formHasChanged = true;
             }
@@ -144,12 +150,20 @@
         // Still loading
         if (this.currentRequest) this.currentRequest.abort();
 
-        // Show hidden folders on Linux?
-        var extraHidden = $('#show_hidden_folders').is(':checked') ? '&show_hidden_folders=1' : '';
+        // Show hidden folders
+        var params = { name: path}
+        if($('#show_hidden_folders').is(':checked')) {
+            params['show_hidden_folders'] = "1"
+        }
+
+        // Show files?
+        if(this.showFiles) {
+            params['show_files'] = "1"
+        }
 
         // Get current folders
         this.currentBrowserPath = path;
-        this.currentRequest = $.getJSON(endpoint + extraHidden, { name: path }, function (data) {
+        this.currentRequest = $.getJSON(endpoint, params, function (data) {
             // Clean
             self.fileBrowserDialog.empty();
 
@@ -157,17 +171,27 @@
             var list = $('<div class="list-group">').appendTo(self.fileBrowserDialog);
             $.each(data.paths, function (i, entry) {
                 // Title for first one
-                if(i == 0) {
+                if(i === 0) {
                     self.fileBrowserDialog.prepend($('<h4>').text(entry.current_path))
                     return
                 }
                 // Regular link
                 link = $('<a class="list-group-item" href="javascript:void(0)" />').click(function () {
-                    self.browse(entry.path, endpoint); }
-                ).text(entry.name);
+                    // Are we looking for files and did we select a file?
+                    if(self.showFiles && !entry.dir) {
+                        // Trigger selection
+                        self.currentBrowserPath = entry.path
+                        $('#filebrowser_modal_accept').click()
+                    } else {
+                        self.browse(entry.path, endpoint);
+                    }
+                }).text(entry.name);
+
                 // Back image
-                if(entry.name == '..') {
+                if(entry.name === '..') {
                     $('<span class="glyphicon glyphicon-arrow-left"></span> ').prependTo(link);
+                } else if(!entry.dir) {
+                    $('<span class="glyphicon glyphicon-file"></span> ').prependTo(link);
                 } else {
                     $('<span class="glyphicon glyphicon-folder-open"></span> ').prependTo(link);
                 }
@@ -203,7 +227,12 @@ $.fn.extractFormDataTo = function(target) {
     var selects = $("select", this);
 
     selects.each(function (i,elem) {
-        target[elem.name] = elem.value;
+        if (elem.selectedOptions.length > 1) {
+            // Handle <select multiple="multiple">
+            target[elem.name] = Array.from(elem.selectedOptions).map(({ value }) => value).toString();
+        } else {
+            target[elem.name] = elem.value;
+        }
     });
 
     return this;
@@ -233,8 +262,9 @@ function do_restart() {
     // Show overlay
     $('.main-restarting').show()
 
-    // What template
-    var switchedHTTPS = ($('#enable_https').is(':checked') == ($('#enable_https').data('original') === undefined))
+    // Check if we need redirect
+    // Uses == on purpose, because val() returns string and data() returns int!
+    var switchedHTTPS = ($('#enable_https').is(':checked') === ($('#enable_https').data('original') === undefined))
     var portsUnchanged  = ($('#port').val() == $('#port').data('original')) && ($('#https_port').val() == $('#https_port').data('original'))
 
     // Are we on settings page or did nothing change?
@@ -243,7 +273,7 @@ function do_restart() {
         var urlTotal = window.location.origin + urlBase
     } else {
         // Protocol and port depend on http(s) setting
-        if($('#enable_https').is(':checked') && (window.location.protocol == 'https:' || !$('#https_port').val())) {
+        if($('#enable_https').is(':checked') && (window.location.protocol === 'https:' || !$('#https_port').val())) {
             // Https on and we visited this page from HTTPS
             var urlProtocol = 'https:';
             var urlPort = $('#https_port').val() ? $('#https_port').val() : $('#port').val();
@@ -292,7 +322,7 @@ function do_restart() {
 
             // Exception if we go from HTTPS to HTTP
             // (this is not allowed by browsers and all of the above will be ignored)
-            if(window.location.protocol != urlProtocol) {
+            if(window.location.protocol !== urlProtocol) {
                 // Saftey redirect after 20 sec
                 setTimeout(function() {
                     location.href = urlTotal;
@@ -302,7 +332,7 @@ function do_restart() {
     });
 }
 
-// Remove obfusication
+// Remove obfuscation
 function removeObfuscation() {
     $('input[data-hide]').each(function(index, objInput) {
         $(objInput).attr('name', $(objInput).data('hide'))
@@ -318,6 +348,36 @@ function addRowColor() {
     })
 }
 
+// Set default functions for the autocomplete everywhere
+jQuery.extend(jQuery.fn.typeahead.defaults, {
+    source: function (query, process) {
+        // 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;
+        }
+        var params = { compact: "1", name: query }
+        if($('#show_hidden_folders').is(':checked')) {
+            params['show_hidden_folders'] = "1"
+        }
+        if(this.$element.data('files')) {
+            params['show_files'] = "1"
+        }
+        // Get info from the API
+        return jQuery.get(folderBrowseUrl, params, function (data) {
+            return process(data["paths"]);
+        });
+    },
+    updater: function(item) {
+        // Is it a relative path?
+        if(item.indexOf(this.$element.data('initialdir')) === 0) {
+            // Remove start
+            return item.replace(this.$element.data('initialdir') + folderSeperator, '');
+        }
+        // Full path
+        return item
+    }
+})
+
 $(document).ready(function () {
     /**
         Restart function
@@ -424,12 +484,15 @@ $(document).ready(function () {
         $('.advanced-settings').toggle()
         addRowColor()
     })
-    if(localStorage.getItem('advanced-settings') == 'true') {
+    if(localStorage.getItem('advanced-settings') === 'true') {
         $('.advanced-settings').show()
         $('#advanced-settings-button').prop('checked', true)
         addRowColor()
     }
     addRowColor()
+
+    // Add tooltips
+    jQuery('[title]').tooltip()
 });
 
 /*

interfaces/Glitter/templates/include_history.tmpl

@@ -1,5 +1,10 @@
-<div class="history" id="history-tab" data-bind="visible: hasHistory() || displayTabbed()" style="display: none">
-    <h2>$T('menu-history')</h2>
+<div class="history" id="history-tab">
+    <div class="history-header">
+        <h2>$T('menu-history') <small data-bind="visible: history.showArchive()">($T('archive'))</small></h2>
+        <a href="#" data-bind="click: history.showMultiEdit, visible: hasHistory()">
+            <span class="glyphicon glyphicon-tasks" data-tooltip="true" data-placement="left" title="$T('Glitter-multiOperations')"></span>
+        </a>
+    </div>
     <table class="table table-hover history-table paginated">
         <thead>
             <tr>
@@ -13,7 +18,16 @@
                 <th style="width: 60px;"></th>
             </tr>
         </thead>
-        <tbody data-bind="foreach: history.historyItems">
+        <!-- ko if: !hasHistory() -->
+        <tbody class="no-downloads">
+            <tr>
+                <td colspan="6" data-bind="attr: { 'colspan': 5 + extraHistoryColumns().length }">
+                    <span>$T('empty')</span>
+                </td>
+            </tr>
+        </tbody>
+        <!-- /ko -->
+        <tbody data-bind="foreach: history.historyItems, visible: hasHistory()" style="display: none;">
             <tr class="history-item" data-bind="css: {'history-failed-download':failed()}">
                 <td>
                     <div data-bind="visible: processingWaiting()">
@@ -55,7 +69,10 @@
                 <!-- /ko -->
                 <td class="history-completedon row-wrap-text" data-bind="text: completedOn(), attr: { 'data-timestamp': completed }" onclick="showDetails(this)"></td>
                 <td class="delete">
-                    <div class="dropdown">
+                    <label data-bind="visible: parent.isMultiEditing()">
+                        <input type="checkbox" name="multiedit" title="$T('Glitter-multiSelect')" data-bind="click: parent.addMultiEdit, attr: { 'id': 'multiedit_' + id } " />
+                    </label>
+                    <div class="dropdown" data-bind="visible: !parent.isMultiEditing()">
                         <a href="#" data-toggle="dropdown" data-bind="click: updateAllHistoryInfo">
                             <span class="caret"></span>
                         </a>
@@ -66,13 +83,20 @@
                                     <div class="col-sm-2">$T('name')</div>
                                     <div class="col-sm-10" data-bind="text: historyStatus.name"></div>
                                 </div>
+                                <div class="row" data-bind="visible: historyStatus.time_added">
+                                    <div class="col-sm-2">$T('rss-added')</div>
+                                    <div class="col-sm-10" data-bind="text: timeAdded(), attr: { 'data-timestamp': historyStatus.time_added }"></div>
+                                </div>
                                 <div class="row">
                                     <div class="col-sm-2">$T('post-Completed')</div>
                                     <div class="col-sm-10" data-bind="text: completedOn, attr: { 'data-timestamp': completed }"></div>
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-2">$T('status')</div>
-                                    <div class="col-sm-10" data-bind="text: glitterTranslate.status[historyStatus.status()] ? glitterTranslate.status[historyStatus.status()] : statusText()"></div>
+                                    <div class="col-sm-10">
+                                        <span data-bind="text: glitterTranslate.status[historyStatus.status()] ? glitterTranslate.status[historyStatus.status()] : statusText()"></span>
+                                        <a href="#" class="mark-completed-link" data-bind="visible: failed(), click: markAsCompleted" title="$T('button-mark-completed')"><span class="glyphicon glyphicon-ok"></span> $T('post-Completed')</a>
+                                    </div>
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-2">$T('size')</div>
@@ -100,7 +124,7 @@
                         </div>
                         <!-- /ko -->
                     </div>
-                    <a href="#" data-bind="click: deleteSlot">
+                    <a href="#" data-bind="click: parent.triggerRemoveDownload">
                         <span class="hover-button glyphicon glyphicon-trash" data-bind="css: { 'glyphicon-stop' : processingDownload() == 2, disabled : processingDownload() == 1 }, attr: { title: processingDownload() == 2 ? '$T('abort')' : '$T('nzo-delete')' }"></span>
                     </a>
                 </td>
@@ -122,9 +146,24 @@
     </ul>
 
     <div class="multioperations-selector" id="history-options">
-        <a href="#" class="hover-button" title="$T('link-retryAll')" data-tooltip="true" data-placement="left" data-bind="click: history.retryAllFailed"><span class="glyphicon glyphicon-repeat"></span></a>
-        <a href="#" class="hover-button" title="$T('showAllHis') / $T('showFailedHis')" data-tooltip="true" data-placement="left" data-bind="click: history.toggleShowFailed, css: { 'history-options-show-failed': history.showFailed }"><span class="glyphicon glyphicon-exclamation-sign"></span></a>
-        <a href="#modal-purge-history" class="hover-button" title="$T('purgeHist')" data-toggle="modal" data-tooltip="true" data-placement="left"><span class="glyphicon glyphicon-trash"></span></a>
+        <a href="#" class="hover-button history-archive" title="$T('showArchive') / $T('showAllHis')" data-tooltip="true" data-placement="top" data-bind="click: history.toggleShowArchive, css: { 'history-options-show-failed': history.showArchive }"><svg viewBox="6 6 36 36" height="14" width="14" class="archive-icon"><path d="M41.09 10.45l-2.77-3.36c-.56-.66-1.39-1.09-2.32-1.09h-24c-.93 0-1.76.43-2.31 1.09l-2.77 3.36c-.58.7-.92 1.58-.92 2.55v25c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-25c0-.97-.34-1.85-.91-2.55zm-17.09 24.55l-11-11h7v-4h8v4h7l-11 11zm-13.75-25l1.63-2h24l1.87 2h-27.5z"/></svg></a>
+        <a href="#" class="hover-button" title="$T('showFailedHis') / $T('showAllHis')" data-tooltip="true" data-placement="top" data-bind="click: history.toggleShowFailed, css: { 'history-options-show-failed': history.showFailed }"><span class="glyphicon glyphicon-exclamation-sign"></span></a>
+        <a href="#" class="hover-button" title="$T('link-retryAll')" data-tooltip="true" data-placement="top" data-bind="click: history.retryAllFailed"><span class="glyphicon glyphicon-repeat"></span></a>
+        <a href="#" class="hover-button" title="$T('button-mark-completed')" data-bind="visible: (history.isMultiEditing() && hasHistory()), click: history.doMultiMarkCompleted" data-tooltip="true" data-placement="top"><span class="glyphicon glyphicon-ok"></span></a>
+
+        <div data-bind="visible: (history.isMultiEditing() && hasHistory())">
+            <span class="label label-default" data-bind="text: history.multiEditItems().length">0</span>
+            <label for="multiedit-checkall-history">
+                <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall-history" title="$T('Glitter-checkAll')" data-bind="click: history.checkAllJobs" data-tooltip="true" data-placement="top" />
+            </label>
+        </div>
+
+        <a href="#" class="hover-button" title="$T('nzo-delete')" data-bind="visible: (history.isMultiEditing() && hasHistory()), click: history.doMultiDelete"  data-tooltip="true" data-placement="top">
+            <span class="glyphicon glyphicon-trash"></span>
+        </a>
+        <a href="#modal-purge-history" class="hover-button" title="$T('purgeHist')" data-bind="visible: !(history.isMultiEditing() && hasHistory())" data-toggle="modal" data-tooltip="true" data-placement="top">
+            <span class="glyphicon glyphicon-trash"></span>
+        </a>
     </div>
 
     <div class="info-container history-info">
@@ -134,9 +173,3 @@
         <span data-bind="text: history.downloadedTotal"></span>B $T('Glitter-total')
     </div>
 </div>
-<div class="info-container history-info" data-bind="visible: !hasHistory() && !displayTabbed()" style="display: none">
-    <span class="glyphicon glyphicon-save"></span>
-    <span data-bind="text: history.downloadedToday"></span>B $T('Glitter-today')
-    <span data-bind="text: history.downloadedMonth"></span>B $T('Glitter-thisMonth')
-    <span data-bind="text: history.downloadedTotal"></span>B $T('Glitter-total')
-</div>

interfaces/Glitter/templates/include_menu.tmpl

@@ -102,26 +102,15 @@
                     <li class="divider"></li>
                     <li class="dropdown-header"><span class="glyphicon glyphicon-off"></span> $T('Glitter-onFinish'):</li>
                     <li>
-                        <!-- 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>
-                                <!--#if $power_options#-->
-                                <option value="shutdown_pc">$T('shutdownPc')</option>
-                                <option value="standby_pc">$T('standbyPc')</option>
-                                <option value="hibernate_pc">$T('hibernatePc')</option>
-                                <!--#end if#-->
-                            </optgroup>
-                            <optgroup label="$T('eoq-scripts')" data-bind="visible: queue.scriptsList().length > 1">
-                                <!-- ko foreach: queue.scriptsList -->
-                                    <!-- ko if: \$data.scriptValue != 'None' -->
-                                        <option data-bind="text: \$data.scriptText, attr: { value: 'script_'+\$data.scriptValue } " ></option>
-                                    <!-- /ko -->
-                                <!-- /ko -->
-                            </optgroup>
+                            <option value="shutdown_program">$T('shutdownSab')</option>
+                            <!--#if $power_options#-->
+                            <option value="shutdown_pc">$T('shutdownPc')</option>
+                            <option value="standby_pc">$T('standbyPc')</option>
+                            <option value="hibernate_pc">$T('hibernatePc')</option>
+                            <!--#end if#-->
                         </select>
-                        <!-- /ko -->
                     </li>
                 </ul>
             </li>

interfaces/Glitter/templates/include_overlays.tmpl

@@ -6,8 +6,12 @@
         <span class="glyphicon glyphicon-open"></span> $T('Glitter-notification-uploading') <span class="main-notification-box-file-count"></span>
     </div>
 
+    <div class="main-notification-box-uploading-failed">
+        <span class="glyphicon glyphicon-exclamation-sign"></span> $T('Glitter-notification-upload-failed').replace('%s', '') <span class="main-notification-box-file-count"></span>
+    </div>
+
     <div class="main-notification-box-queue-repair">
-        <span class="glyphicon glyphicon glyphicon-wrench"></span> $T('Glitter-repairQueue')
+        <span class="glyphicon glyphicon-wrench"></span> $T('Glitter-repairQueue')
     </div>
 
     <div class="main-notification-box-disconnect">
@@ -123,11 +127,9 @@
                                 <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="row" data-bind="visible: statusInfo.delayed_assembler() > 5">
                             <div class="col-sm-6">$T('dashboard-delayed') &nbsp; </div>
                             <div class="col-sm-6">
-                                <span data-bind="visible: statusInfo.delayed_decoder() > 5">$T('dashboard-delayed-cpu')</span>
-                                <small data-bind="visible: statusInfo.delayed_decoder() > 5">(<span data-bind="text: statusInfo.delayed_decoder"></span>x)</small>
                                 <span data-bind="visible: statusInfo.delayed_assembler() > 5">$T('dashboard-delayed-disk')</span>
                                 <small data-bind="visible: statusInfo.delayed_assembler() > 5">(<span data-bind="text: statusInfo.delayed_assembler"></span>x)</small>
                             </div>
@@ -136,7 +138,7 @@
                             <div class="col-sm-6">$T('dashboard-systemPerformance') &nbsp; </div>
                             <div class="col-sm-6 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.pystone"></span>
-                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
+                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest') (~10 $T('seconds'))"><span class="glyphicon glyphicon-repeat"></span></a>
                                 <small title="$cpumodel $cpusimd" data-tooltip="true">$cpumodel $cpusimd</small>
                             </div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
@@ -145,7 +147,7 @@
                             <div class="col-sm-6">$T('dashboard-downloadDirSpeed') &nbsp; </div>
                             <div class="col-sm-6 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.downloaddirspeed()"></span> MB/s
-                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
+                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest') (~10 $T('seconds'))"><span class="glyphicon glyphicon-repeat"></span></a>
                                 <small data-bind="text: statusInfo.downloaddir, attr: { 'data-original-title': statusInfo.downloaddir }" data-tooltip="true"></small>
                             </div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
@@ -154,7 +156,7 @@
                             <div class="col-sm-6">$T('dashboard-completeDirSpeed') &nbsp; </div>
                             <div class="col-sm-6 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.completedirspeed()"></span> MB/s
-                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
+                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest') (~10 $T('seconds'))"><span class="glyphicon glyphicon-repeat"></span></a>
                                 <small data-bind="text: statusInfo.completedir, attr: { 'data-original-title': statusInfo.completedir }" data-tooltip="true"></small>
                             </div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
@@ -163,11 +165,17 @@
                             <div class="col-sm-6">$T('dashboard-internetBandwidth') &nbsp; </div>
                             <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.internetbandwidth()"></span> MB/s
-                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
+                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest') (~10 $T('seconds'))"><span class="glyphicon glyphicon-repeat"></span></a>
                                 <small><span data-bind="text: statusInfo.internetbandwidth()*8"></span> Mbps</small>
                             </div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
+                        <div class="row">
+                            <div class="col-sm-6">$T('platform') &nbsp; </div>
+                            <div class="col-sm-6">
+                                $platform
+                            </div>
+                        </div>
                         <div class="row test-download">
                             <div class="col-sm-6">$T('dashboard-testDownload') &nbsp; </div>
                             <div class="col-sm-6">
@@ -227,15 +235,20 @@
                                 </div>
                                 <div class="row" data-bind="visible: serverssl">
                                     <div class="col-sm-6">$T('srv-ssl')</div>
-                                    <div class="col-sm-6">
-                                        <span class="glyphicon glyphicon-ok"></span> <span data-bind="text: serversslinfo"></span>
+                                    <div class="col-sm-6 col-dot-overflow">
+                                        <span class="glyphicon glyphicon-ok"></span>
+                                        <span data-bind="text: serversslinfo"></span>
                                     </div>
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-6"># $T('connections')</div>
                                     <div class="col-sm-6">
                                         <span data-bind="text: serverconnections().length"></span> /
-                                        <span data-bind="text: servertotalconn"></span>
+                                        <span data-bind="text: servertotalconn"></span><br>
+                                        <!-- ko if: serveripaddress() -->
+                                        <span data-bind="text: servercanonname"></span><br>
+                                        <span data-bind="text: serveripaddress"></span>
+                                        <!-- /ko -->
                                     </div>
                                 </div>
                                 <div class="row">
@@ -251,11 +264,11 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="row" data-bind="visible: !isFinite(serveractiveconn())">
+                                <div class="row" data-bind="visible: serverwarning()">
                                     <div class="col-sm-12">
                                         <div class="alert alert-warning">
                                             <span class="glyphicon glyphicon-info-sign"></span>
-                                            <span data-bind="text: serveractiveconn()"></span>
+                                            <span data-bind="text: serverwarning()"></span>
                                         </div>
                                     </div>
                                 </div>
@@ -456,6 +469,8 @@
                             <div class="form-group form-checkbox">
                                 <label class="col-sm-6 control-label">
                                     $T("Glitter-keyboardShortcuts")
+                                    <span class="glyphicon glyphicon-question-sign" data-tooltip="true" data-placement="top" data-html="true"
+                                        data-original-title="P: $T('link-pause')<br>A: $T('Glitter-addNZB')<br>S: $T('Glitter-statusInterfaceOptions')<br>C: $T('menu-config')<br>$T('Glitter-keyboardShortcuts-arrows')"></span>
                                 </label>
                                 <div class="col-sm-4">
                                     <input type="checkbox" name="keyboardShortcuts" value="true" data-bind="checked: keyboardShortcuts" />
@@ -523,7 +538,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label">$T('category')</label>
                     <div class="col-sm-6">
-                        <select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText'"></select>
+                        <select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText', optionsCaption: ''"></select>
                         <span class="glyphicon glyphicon-tag"></span>
                     </div>
                 </div>
@@ -532,7 +547,7 @@
                     <div class="col-sm-6">
                         <!-- This list is different from the one during download! -->
                         <select name="Priority" class="form-control">
-                            <option value="-100">$T('default')</option>
+                            <option value=""></option>
                             <option value="2">$T('pr-force')</option>
                             <option value="1">$T('pr-high')</option>
                             <option value="0">$T('pr-normal')</option>
@@ -545,14 +560,14 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label">$T('swtag-pp')</label>
                     <div class="col-sm-6">
-                        <select name="Processing" class="form-control" data-bind="options: queue.processingOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '$T('default')'"></select>
+                        <select name="Processing" class="form-control" data-bind="options: queue.processingOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: ''"></select>
                         <span class="glyphicon glyphicon-check"></span>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-4 control-label">$T('eoq-scripts')</label>
                     <div class="col-sm-6">
-                        <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '$T('default')', optionsValue: 'scriptValue', optionsText: 'scriptText', enable: (queue.scriptsList().length > 1)"></select>
+                        <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '', optionsValue: 'scriptValue', optionsText: 'scriptText', enable: (queue.scriptsList().length > 1)"></select>
                         <span class="glyphicon glyphicon-flash"></span>
                     </div>
                 </div>
@@ -630,6 +645,59 @@
     </div>
 </div>
 
+<div id="modal-delete-queue-job" class="modal modal-delete-job fade" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <h4 class="modal-title row-wrap-text">$T('removeNZB-Files')</h4>
+            </div>
+            <form data-bind="submit: queue.removeDownloads">
+                <div class="modal-body">
+                    $T('confirm-delete')
+
+                    <ul data-bind="foreach: queue.deleteItems">
+                        <li data-bind="text: name"></li>
+                    </ul>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">$T('cancel')</button>
+                    <button type="submit" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> $T('nzo-delete')</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<div id="modal-delete-history-job" class="modal modal-delete-job fade" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <h4 class="modal-title row-wrap-text">$T('nzo-delete')</h4>
+            </div>
+            <form data-bind="submit: history.removeDownloads">
+                <div class="modal-body">
+                    $T('confirm-delete')
+
+                    <ul data-bind="foreach: history.deleteItems">
+                        <li data-bind="text: historyStatus.name"></li>
+                    </ul>
+                </div>
+                <div class="modal-footer">
+                     <div class="checkbox" data-bind="visible: !history.showArchive()">
+                        <label>
+                            <input type="checkbox" data-bind="checked: history.permanentlyDelete"> <span>$T('permanently-delete')</span>
+                        </label>
+                    </div>
+                    <button type="button" class="btn btn-default" data-dismiss="modal">$T('cancel')</button>
+                    <button type="submit" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> $T('nzo-delete')</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
 <div id="modal-retry-job" class="modal modal-small fade" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content">
@@ -660,6 +728,9 @@
                             </div>
                         </div>
                     </fieldset>
+                    <fieldset>
+                        $T('Glitter-retryNoChecks')
+                    </fieldset>
                 </div>
                 <div class="modal-footer">
                     <button class="btn btn-default"><span class="glyphicon glyphicon-repeat"></span> $T('button-retry')</button>
@@ -707,13 +778,13 @@
                             <td><a href="https://github.com/sabnzbd/sabnzbd" target="_blank">https://github.com/sabnzbd/sabnzbd/</a></td>
                         </tr>
                         <tr>
-                            <td><strong>$T('menu-irc'):</strong></td>
+                            <td><strong>$T('menu-live-chat'):</strong></td>
                             <td><a href="https://sabnzbd.org/live-chat" target="_blank">https://sabnzbd.org/live-chat</a></td>
                         </tr>
                     </tbody>
                 </table>
                 <hr/>
-                <p><small>Copyright (C) 2007-2021 The SABnzbd Team &lt;team@sabnzbd.org&gt;<br/>$T('yourRights') </small></p>
+                <p><small>Copyright &copy; 2007-2025 by The SABnzbd-Team (<a href="https://sabnzbd.org/" target="_blank">sabnzbd.org</a>)<br/>$T('yourRights') </small></p>
             </div>
         </div>
     </div>
@@ -732,11 +803,18 @@
                 <button type="button" class="btn btn-danger" data-bind="click: history.emptyHistory" data-action="history-purge-completed"><span class="glyphicon glyphicon-floppy-saved"></span> $T('purgeCompl')</button><hr />
                 <button type="button" class="btn btn-danger" data-bind="click: history.emptyHistory" data-action="history-purge-page"><span class="glyphicon glyphicon-check"></span> $T('purgePage') <span class="label label-default" data-bind="text: history.historyItems().length"></span></button>
             </div>
+            <div class="modal-footer">
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" data-bind="checked: history.permanentlyDelete"> <span>$T('permanently-delete')</span>
+                    </label>
+                </div>
+            </div>
         </div>
     </div>
 </div>
 
-<div id="modal_custom_pause" class="modal modal-small fade" tabindex="-1">
+<div id="modal-custom-pause" class="modal modal-small fade" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">

interfaces/Glitter/templates/include_queue.tmpl

@@ -15,10 +15,10 @@
             <span data-bind="text: queueDataLeft"></span> $T('Glitter-left')
         </div>
         <!-- /ko -->
-        <!-- ko if: (quotaLimit() != 0)  -->
+        <!-- ko if: (parseInt(quotaLimit()) != 0)  -->
         <div class="info-container-box">
             <span data-bind="css: { 'queue-error-info' : (parseInt(quotaLimitLeft())<=0) }">
-                <span class="glyphicon glyphicon-log-in"></span> <span data-bind="text: quotaLimitLeft"></span>B / <span data-bind="text: quotaLimit"></span>B $T('quota-left')
+                <span class="glyphicon glyphicon-log-in"></span> <span data-bind="text: quotaLimitLeft"></span> / <span data-bind="text: quotaLimit"></span> $T('quota-left')
             </span>
         </div>
         <!-- /ko -->
@@ -163,7 +163,7 @@
                         <!-- /ko -->
                     </div>
                     <!-- /ko -->
-                    <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: removeDownload"><span class="glyphicon glyphicon-trash"></span></a>
+                    <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: parent.triggerRemoveDownload"><span class="glyphicon glyphicon-trash"></span></a>
                 </td>
             </tr>
         </tbody>
@@ -171,22 +171,28 @@
 
     <form class="multioperations-selector" data-bind="visible: (hasQueue() && queue.isMultiEditing())" style="display: none;">
         <div class="add-nzb-inputbox add-nzb-inputbox-small add-nzb-inputbox-options">
-            <label for="multiedit-checkall">
-                <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall" title="$T('Glitter-checkAll')" data-bind="click: queue.checkAllJobs" data-tooltip="true" data-placement="top" />
+            <label for="multiedit-checkall-queue">
+                <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall-queue" title="$T('Glitter-checkAll')" data-bind="click: queue.checkAllJobs" data-tooltip="true" data-placement="top" />
             </label>
-            <a href="#" class="hover-button" data-bind="click: queue.doMultiDelete">
+            <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: queue.doMultiDelete" data-tooltip="true" data-placement="top">
                 <span class="glyphicon glyphicon-trash"></span>
             </a>
         </div>
         <div class="add-nzb-inputbox add-nzb-inputbox-small">
-            <label for="multiedit-play">
+            <label for="multiedit-play" data-bind="event: { mousedown: queue.handleMultiEditStatusMouseDown }">
                 <input type="radio" name="multiedit-status" value="resume" id="multiedit-play" data-bind="event: { change: queue.doMultiEditUpdate }" />
                 <span class="glyphicon glyphicon-play" title="$T('link-resume')" data-tooltip="true" data-placement="top"></span>
             </label>
-            <label for="multiedit-pause">
+            <label for="multiedit-pause" data-bind="event: { mousedown: queue.handleMultiEditStatusMouseDown }">
                 <input type="radio" name="multiedit-status" value="pause" id="multiedit-pause" data-bind="event: { change: queue.doMultiEditUpdate }" />
                 <span class="glyphicon glyphicon-pause" title="$T('link-pause')" data-tooltip="true" data-placement="top"></span>
             </label>
+            <a href="#" class="hover-button" title="$T('Glitter-top')" data-bind="click: queue.doMultiMoveToTop" data-tooltip="true" data-placement="top">
+                <span class="glyphicon glyphicon-chevron-up"></span>
+            </a>
+            <a href="#" class="hover-button" title="$T('Glitter-bottom')" data-bind="click: queue.doMultiMoveToBottom" data-tooltip="true" data-placement="top">
+                <span class="glyphicon glyphicon-chevron-down"></span>
+            </a>
             <span class="label label-default" data-bind="text: queue.multiEditItems().length">0</span>
         </div>
         <div class="add-nzb-inputbox-clear"></div>
@@ -221,4 +227,4 @@
             <span data-bind="text: page"></span>
         </li>
     </ul>
-</div>
+</div>

interfaces/Glitter/templates/main.tmpl

@@ -52,21 +52,21 @@
             var glitterTranslate = new Object();
             glitterTranslate.paused = "$T('post-Paused')";
             glitterTranslate.left = "$T('Glitter-left')";
-            glitterTranslate.clearWarn = "$T('confirm')";
+            glitterTranslate.clearOrphanWarning = "$T('Glitter-clearOrphanWarning')";
             glitterTranslate.pausePromptFail = "$T('Glitter-pausePromptFail')"
             glitterTranslate.pauseFor = "$T('pauseFor')"
             glitterTranslate.minutes = "$T('mins')"
             glitterTranslate.shutdown = "$T('shutdownOK?')";
             glitterTranslate.restart = "$T('explain-Restart') $T('explain-needNewLogin')".replace(/\<br(\s*\/|)\>/g, '\n');
             glitterTranslate.repair = "$T('explain-Repair')".replace(/<br \/>/g, "\n").replace(/&quot;/g,'"');
-            glitterTranslate.deleteMsg = "$T('nzo-delete')";
-            glitterTranslate.removeDown = "$T('confirm')";
-            glitterTranslate.removeDow1 = "$T('confirm')";
+            glitterTranslate.confirm = "$T('confirm')";
+            glitterTranslate.markComplete = "$T('button-mark-completed')";
             glitterTranslate.renameAbort = "$T('Glitter-confirmAbortDirectUnpack')\n$T('confirm')";
             glitterTranslate.retryAll = "$T('link-retryAll')?";
             glitterTranslate.fetch = "$T('Glitter-fetch')";
             glitterTranslate.checking = "$T('post-Checking')";
             glitterTranslate.misingArt = "$T('missingArt')";
+            glitterTranslate.fetchingURL = "$T('Glitter-addFromURL')"
             glitterTranslate.chooseFile = "$T('Glitter-chooseFile')";
             glitterTranslate.orphanedJobsMsg = "$T('explain-orphans')";
             glitterTranslate.useCache = "$T('explain-cache_limitstr').replace("64M", "256M").replace("128M", "512M")";
@@ -96,6 +96,7 @@
             glitterTranslate.status['Unpack'] = "$T('stage-unpack')";
             glitterTranslate.status['Deobfuscate'] = "$T('stage-deobfuscate')";
             glitterTranslate.status['Script'] = "$T('stage-script')";
+            glitterTranslate.status['RSS'] = "$T('stage-rss')";
             glitterTranslate.status['Source'] = "$T('stage-source')";
             glitterTranslate.status['Servers'] = "$T('stage-servers')";
             glitterTranslate.status['INFO'] = "$T('log-info')".replace('+', '').toUpperCase();
@@ -145,10 +146,10 @@
                         <a href="#queue-tab" data-toggle="tab">$T('menu-queue') <span class="badge" data-bind="text: queue.totalItems"></span></a>
                     </li>
                     <li>
-                        <a href="#history-tab" data-toggle="tab">$T('menu-history')<span class="badge" data-bind="text: history.totalItems"></span></a>
+                        <a href="#history-tab" data-toggle="tab">$T('menu-history') <span class="badge badge-info" data-bind="text: history.ppItems, visible: history.ppItems"></span><span class="badge" data-bind="text: history.totalItems"></span></a>
                     </li>
                     <li>
-                        <a href="#queue-messages" data-toggle="tab">$T('warnings')<span class="badge" data-bind="text: hasMessages, css: { 'badge-warning':  hasMessages() }"></span></a>
+                        <a href="#queue-messages" data-toggle="tab">$T('warnings') <span class="badge" data-bind="text: hasMessages, css: { 'badge-warning':  hasMessages() }"></span></a>
                     </li>
                 </ul>
             </div>

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

@@ -58,11 +58,11 @@ function convertHTMLtoText(htmltxt) {
 // Function to re-write 0:09:21=>9:21, 0:10:10=>10:10, 0:00:30=>0:30
 function rewriteTime(timeString) {
     // Remove "0:0" from start
-    if(timeString.substring(0,3) == '0:0') {
+    if(timeString.substring(0,3) === '0:0') {
         timeString = timeString.substring(3)
     }
     // Remove "0:" from start
-    else if(timeString.substring(0,2) == '0:') {
+    else if(timeString.substring(0,2) === '0:') {
         timeString = timeString.substring(2)
     }
     return timeString
@@ -71,13 +71,13 @@ function rewriteTime(timeString) {
 // How to display the date-time?
 function displayDateTime(inDate, outFormat, inFormat) {
     // What input?
-    if(inDate == '') {
+    if(inDate === '') {
         var theMoment = moment()
     } else {
         var theMoment = moment.utc(inDate, inFormat)
     }
     // Special format or regular format?
-    if(outFormat == 'fromNow') {
+    if(outFormat === 'fromNow') {
         return theMoment.fromNow()
     } else {
         return theMoment.local().format(outFormat)
@@ -155,7 +155,7 @@ function setCheckAllState(checkSelector, rangeSelector) {
     var nrChecks = allChecks.filter(":checked");
     if(nrChecks.length === 0) {
         $(checkSelector).prop({'checked': false, 'indeterminate': false})
-    } else if(nrChecks.length == allChecks.length) {
+    } else if(nrChecks.length === allChecks.length) {
         $(checkSelector).prop({'checked': true, 'indeterminate': false})
     } else {
         $(checkSelector).prop({'checked': false, 'indeterminate': true})

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

@@ -57,7 +57,7 @@ function Fileslisting(parent) {
             $.each(response.files, function(index, slot) {
                 // Existing or updating?
                 var existingItem = ko.utils.arrayFirst(self.fileItems(), function(i) {
-                    return i.nzf_id() == slot.nzf_id;
+                    return i.nzf_id() === slot.nzf_id;
                 });
 
                 if(existingItem) {
@@ -76,7 +76,7 @@ function Fileslisting(parent) {
             }
 
             // Check if we show/hide completed
-            if(localStorageGetItem('showCompletedFiles') == 'No') {
+            if(localStorageGetItem('showCompletedFiles') === 'No') {
                 $('.item-files-table tr.files-done').hide();
                 $('#filelist-showcompleted').removeClass('hover-button')
             }
@@ -217,8 +217,8 @@ function FileslistingModel(parent, data) {
     self.nzf_id = ko.observable(data.nzf_id);
     self.file_age = ko.observable(data.age);
     self.mb = ko.observable(data.mb);
-    self.canselect = ko.observable(data.status != "finished" && data.status != "queued");
-    self.isdone =  ko.observable(data.status == "finished");
+    self.canselect = ko.observable(data.status !== "finished" && data.status !== "queued");
+    self.isdone =  ko.observable(data.status === "finished");
     self.percentage = ko.observable(self.isdone() ? fixPercentages(100) : fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)));
 
     // Update internally
@@ -227,8 +227,8 @@ function FileslistingModel(parent, data) {
         self.nzf_id(data.nzf_id)
         self.file_age(data.age)
         self.mb(data.mb)
-        self.canselect(data.status != "finished" && data.status != "queued")
-        self.isdone(data.status == "finished")
+        self.canselect(data.status !== "finished" && data.status !== "queued")
+        self.isdone(data.status === "finished")
         // Data is given in MB, would always show 0% for small files even if completed
         self.percentage(self.isdone() ? fixPercentages(100) : fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)))
     }
@@ -266,7 +266,7 @@ function paginationModel(parent) {
         // Return object for adding
         return {
             page: pageNr,
-            isCurrent: pageNr == self.currentPage(),
+            isCurrent: pageNr === self.currentPage(),
             isDots: false,
             onclick: function(data) {
                 self.moveToPage(data.page);
@@ -356,7 +356,7 @@ function paginationModel(parent) {
             }
 
             // Change of number of pages?
-            if(newNrPages != self.nrPages()) {
+            if(newNrPages !== self.nrPages()) {
                 // Update
                 self.nrPages(newNrPages);
             }

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

@@ -9,11 +9,17 @@ function HistoryListModel(parent) {
     self.lastUpdate = 0;
     self.historyItems = ko.observableArray([])
     self.showFailed = ko.observable(false).extend({ persist: 'historyShowFailed' });
+    self.showArchive = ko.observable(false).extend({ persist: 'historyShowArchive' });
+    self.permanentlyDelete = ko.observable(false).extend({ persist: 'permanentlyDelete' });
     self.isLoading = ko.observable(false).extend({ rateLimit: 100 });
     self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 400, method: "notifyWhenChangesStop" } });
     self.paginationLimit = ko.observable(10).extend({ persist: 'historyPaginationLimit' });
     self.totalItems = ko.observable(0);
+    self.deleteItems = ko.observableArray([]);
+    self.ppItems = ko.observable(0);
     self.pagination = new paginationModel(self);
+    self.isMultiEditing = ko.observable(false).extend({ persist: 'historyIsMultiEditing' });
+    self.multiEditItems = ko.observableArray([]);
 
     // Download history info
     self.downloadedToday = ko.observable();
@@ -40,7 +46,7 @@ function HistoryListModel(parent) {
         var newItems = [];
         $.each(data.slots, function(index, slot) {
             var existingItem = ko.utils.arrayFirst(self.historyItems(), function(i) {
-                return i.historyStatus.nzo_id() == slot.nzo_id;
+                return i.historyStatus.nzo_id() === slot.nzo_id;
             });
             // Set index in the results
             slot.index = index
@@ -56,7 +62,7 @@ function HistoryListModel(parent) {
         });
 
         // Remove all items
-        if(itemIds.length == self.paginationLimit()) {
+        if(itemIds.length === self.paginationLimit()) {
             // Replace it, so only 1 Knockout DOM-update!
             self.historyItems(newItems);
             newItems = [];
@@ -65,7 +71,7 @@ function HistoryListModel(parent) {
             $.each(itemIds, function() {
                 var id = this.toString();
                 self.historyItems.remove(ko.utils.arrayFirst(self.historyItems(), function(i) {
-                    return i.historyStatus.nzo_id() == id;
+                    return i.historyStatus.nzo_id() === id;
                 }));
             });
         }
@@ -79,7 +85,7 @@ function HistoryListModel(parent) {
             if(self.parent.queue.multiEditItems().length > 0) {
                 $.each(newItems, function() {
                     var currentItem = this;
-                    self.parent.queue.multiEditItems.remove(function(inList) { return inList.id == currentItem.nzo_id; })
+                    self.parent.queue.multiEditItems.remove(function(inList) { return inList.id === currentItem.id; })
                 })
             }
         }
@@ -93,6 +99,7 @@ function HistoryListModel(parent) {
             History information
         ***/
         self.totalItems(data.noofslots);
+        self.ppItems(data.ppslots)
         self.downloadedToday(data.day_size);
         self.downloadedWeek(data.week_size);
         self.downloadedMonth(data.month_size);
@@ -110,8 +117,31 @@ function HistoryListModel(parent) {
                 value: newValue
             })
         }
+        // Update pagination and counters
+        self.parent.refresh(true)
     });
 
+    self.triggerRemoveDownload = function(items) {
+        // Show and fill modal
+        self.deleteItems.removeAll()
+
+        // Single or multiple items?
+        if(items.length) {
+            ko.utils.arrayPushAll(self.deleteItems, items)
+        } else {
+            self.deleteItems.push(items)
+        }
+
+        // Show modal or delete right away
+        if(self.parent.confirmDeleteHistory()) {
+            // Open modal if desired
+            $('#modal-delete-history-job').modal("show")
+        } else {
+            // Otherwise just submit right away
+            $('#modal-delete-history-job form').submit()
+        }
+    }
+
     // Retry a job
     self.retryJob = function(form) {
         // Adding a extra retry file happens through this special function
@@ -142,7 +172,7 @@ function HistoryListModel(parent) {
     // Searching in history (rate-limited in declaration)
     self.searchTerm.subscribe(function() {
         // Go back to page 1
-        if(self.pagination.currentPage() != 1) {
+        if(self.pagination.currentPage() !== 1) {
             // This forces a refresh
             self.pagination.moveToPage(1);
         } else {
@@ -154,13 +184,13 @@ function HistoryListModel(parent) {
     // Clear searchterm
     self.clearSearchTerm = function(data, event) {
         // Was it escape key or click?
-        if(event.type == 'mousedown' || (event.keyCode && event.keyCode == 27)) {
+        if(event.type === 'mousedown' || (event.keyCode && event.keyCode === 27)) {
             // Set the loader so it doesn't flicker and then switch
             self.isLoading(true)
             self.searchTerm('');
         }
         // Was it click and the field is empty? Then we focus on the field
-        if(event.type == 'mousedown' && self.searchTerm() == '') {
+        if(event.type === 'mousedown' && self.searchTerm() === '') {
             $(event.target).parents('.search-box').find('input[type="text"]').focus()
             return;
         }
@@ -170,10 +200,17 @@ function HistoryListModel(parent) {
 
     // Toggle showing failed
     self.toggleShowFailed = function(data, event) {
-        // Set the loader so it doesn't flicker and then switch
-        self.isLoading(true)
         self.showFailed(!self.showFailed())
-        // Forde hide tooltip so it doesn't linger
+        // Force hide tooltip so it doesn't linger
+        $('#history-options a').tooltip('hide')
+        // Force refresh
+        self.parent.refresh(true)
+    }
+
+    // Toggle showing archive
+    self.toggleShowArchive = function(data, event) {
+        self.showArchive(!self.showArchive())
+        // Force hide tooltip so it doesn't linger
         $('#history-options a').tooltip('hide')
         // Force refresh
         self.parent.refresh(true)
@@ -195,36 +232,34 @@ function HistoryListModel(parent) {
 
     // Empty history options
     self.emptyHistory = function(data, event) {
-        // Make sure no flickering
-        self.isLoading(true)
-
         // What event?
         var whatToRemove = $(event.target).data('action');
+        var skipArchive = $('#modal-purge-history input[type="checkbox"]').prop("checked")
         var del_files, value;
 
         // Purge failed
-        if(whatToRemove == 'history-purge-failed') {
+        if(whatToRemove === 'history-purge-failed') {
             del_files = 0;
             value = 'failed';
         }
         // Also remove files
-        if(whatToRemove == 'history-purgeremove-failed') {
+        if(whatToRemove === 'history-purgeremove-failed') {
             del_files = 1;
             value = 'failed';
         }
         // Remove completed
-        if(whatToRemove == 'history-purge-completed') {
+        if(whatToRemove === 'history-purge-completed') {
             del_files = 0;
             value = 'completed';
         }
         // Remove the ones on this page
-        if(whatToRemove == 'history-purge-page') {
+        if(whatToRemove === 'history-purge-page') {
             // List all the ID's
             var strIDs = '';
             $.each(self.historyItems(), function(index) {
                 // Only append when it's a download that can be deleted
                 if(!this.processingDownload() && !this.processingWaiting()) {
-                    strIDs = strIDs + this.nzo_id + ',';
+                    strIDs = strIDs + this.id + ',';
                 }
             })
             // Send the command
@@ -232,6 +267,7 @@ function HistoryListModel(parent) {
                 mode: 'history',
                 name: 'delete',
                 del_files: 1,
+                archive: (!skipArchive) * 1,
                 value: strIDs
             }).then(function() {
                 // Clear search, refresh and hide
@@ -246,13 +282,197 @@ function HistoryListModel(parent) {
         callAPI({
             mode: 'history',
             name: 'delete',
-            value: value,
-            del_files: del_files
+            del_files: del_files,
+            archive: (!skipArchive) * 1,
+            value: value
         }).then(function() {
             self.parent.refresh();
             $("#modal-purge-history").modal('hide');
         });
     };
+
+    // Show the input checkbox
+    self.showMultiEdit = function() {
+        self.isMultiEditing(!self.isMultiEditing())
+        self.multiEditItems.removeAll();
+        $('.history-table input[name="multiedit"], #multiedit-checkall-history').prop({'checked': false, 'indeterminate': false})
+    }
+
+    // Add to the list
+    self.addMultiEdit = function(item, event) {
+        // Is it a shift-click?
+        if(event.shiftKey) {
+            checkShiftRange('.history-table input[name="multiedit"]');
+        }
+
+        // Add or remove from the list?
+        if(event.currentTarget.checked) {
+            // Add item
+            self.multiEditItems.push(item);
+        } else {
+            // Go over them all to know which one to remove
+            self.multiEditItems.remove(function(inList) { return inList.id == item.id; })
+        }
+
+        // Update check-all buton state
+        setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
+        return true;
+    }
+
+    // Check all
+    self.checkAllJobs = function(item, event) {
+        // Get which ones we care about
+        var allChecks = $('.history-table input[name="multiedit"]').filter(':not(:disabled):visible');
+
+        // We need to re-evaltuate the state of this check-all
+        // Otherwise the 'inderterminate' will be overwritten by the click event!
+        setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
+
+        // Now we can check what happend
+        // For when some are checked, or all are checked (but not partly)
+        if(event.target.indeterminate || (event.target.checked && !event.target.indeterminate)) {
+            var allActive = allChecks.filter(":checked")
+            // First remove the from the list
+            if(allActive.length == self.multiEditItems().length) {
+                // Just remove all
+                self.multiEditItems.removeAll();
+                // Remove the check
+                allActive.prop('checked', false)
+            } else {
+                // Remove them seperate
+                allActive.each(function() {
+                    // Go over them all to know which one to remove
+                    var item = ko.dataFor(this)
+                    self.multiEditItems.remove(function(inList) { return inList.id == item.id; })
+                    // Remove the check of this one
+                    this.checked = false;
+                })
+            }
+        } else {
+            // None are checked, so check and add them all
+            allChecks.prop('checked', true)
+            allChecks.each(function() { self.multiEditItems.push(ko.dataFor(this)) })
+            event.target.checked = true
+        }
+        // Set state of all the check-all's
+        setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
+        return true;
+    }
+
+    // Remove downloads from history
+    self.removeDownloads = function(form) {
+        // Hide modal and show notification
+        $('#modal-delete-history-job').modal("hide")
+        showNotification('.main-notification-box-removing')
+
+        var strIDsPP = '';
+        var strIDsHistory = '';
+        $.each(self.deleteItems(), function(index) {
+            // Split in jobs that need post-processing aborted, and jobs that need to be deleted
+            if(this.processingDownload() === 2) {
+                strIDsPP = strIDsPP + this.id + ',';
+                // These items should not be listed in the deletedItems later on
+                // as active post-processing aren't removed from the history output
+                self.deleteItems.remove(this)
+            } else {
+                strIDsHistory = strIDsHistory + this.id + ',';
+            }
+        })
+
+        // Trigger post-processing aborting
+        if(strIDsPP !== "") {
+            callAPI({
+                mode: 'cancel_pp',
+                value: strIDsPP
+            }).then(function(response) {
+                // Only hide and refresh
+                self.parent.refresh();
+                hideNotification()
+            });
+        }
+        if(strIDsHistory !== "") {
+            var skipArchive = $('#modal-delete-history-job input[type="checkbox"]').prop("checked")
+
+            // Permanently delete if we are on the Archive page
+            if(self.showArchive()) skipArchive = true
+
+            callAPI({
+                mode: 'history',
+                name: 'delete',
+                del_files: 1,
+                archive: (!skipArchive) * 1,
+                value: strIDsHistory
+            }).then(function(response) {
+                self.historyItems.removeAll(self.deleteItems());
+                self.multiEditItems.removeAll(self.deleteItems())
+                self.parent.refresh();
+                hideNotification()
+            });
+        }
+    };
+
+    // Delete all selected
+    self.doMultiDelete = function() {
+        // Anything selected?
+        if(self.multiEditItems().length < 1) return;
+
+        // Trigger modal
+        self.triggerRemoveDownload(self.multiEditItems())
+    }
+
+    // Mark jobs as completed
+    self.markAsCompleted = function(items) {
+        // Confirm
+        if(!confirm(glitterTranslate.markComplete)) {
+            return
+        }
+        // Single or multiple items?
+        var strIDs = '';
+        if(items.length) {
+            $.each(items, function(index) {
+                strIDs = strIDs + this.id + ',';
+            })
+        } else {
+            strIDs = items.id
+        }
+
+        // Send the API call
+        callAPI({
+            mode: 'history',
+            name: 'mark_as_completed',
+            value: strIDs
+        }).then(function(response) {
+            // Force refresh to update the UI
+            self.parent.refresh(true);
+        });
+    }
+
+    // Mark all selected as completed
+    self.doMultiMarkCompleted = function() {
+        // Anything selected?
+        if(self.multiEditItems().length < 1) return;
+
+        // Mark them
+        self.markAsCompleted(self.multiEditItems());
+    }
+
+    // Focus on the confirm button
+    $('#modal-delete-history-job').on("shown.bs.modal", function() {
+        $('#modal-delete-history-job .btn[type="submit"]').focus()
+    })
+
+    // On change of page we need to check all those that were in the list!
+    self.historyItems.subscribe(function() {
+        // We need to wait until the unit is actually finished rendering
+        setTimeout(function() {
+            $.each(self.multiEditItems(), function(index) {
+                $('#multiedit_' + this.id).prop('checked', true);
+            })
+
+            // Update check-all buton state
+            setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
+        }, 100)
+    }, null, "arrayChange")
 }
 
 /**
@@ -266,7 +486,7 @@ function HistoryModel(parent, data) {
     // If we update the full set every time it uses lot of CPU
     // The Status/Actionline/scriptline/completed we do update every time
     // When clicked on the more-info button we load the rest again
-    self.nzo_id = data.nzo_id;
+    self.id = data.nzo_id;
     self.index = data.index;
     self.updateAllHistory = false;
     self.hasDropdown = ko.observable(false);
@@ -303,14 +523,14 @@ function HistoryModel(parent, data) {
 
     // Waiting?
     self.processingWaiting = ko.pureComputed(function() {
-        return(self.status() == 'Queued')
+        return(self.status() === 'Queued')
     })
 
     // Processing or done?
     self.processingDownload = ko.pureComputed(function() {
         var status = self.status();
         // When we can cancel
-        if (status === 'Extracting' || status === 'Verifying' || status == 'Repairing' || status === 'Running') {
+        if (status === 'Extracting' || status === 'Verifying' || status === 'Repairing' || status === 'Running') {
             return 2
         }
         // These cannot be cancelled
@@ -344,7 +564,7 @@ function HistoryModel(parent, data) {
                     try {
                         // Extract the Download section
                         var downloadLog = ko.utils.arrayFirst(self.historyStatus.stage_log(), function(item) {
-                            return item.name() == 'Download'
+                            return item.name() === 'Download'
                         });
                         // Extract the speed
                         return downloadLog.actions()[0].match(/(\S*\s\S+)(?=<br\/>)/)[0]
@@ -353,7 +573,7 @@ function HistoryModel(parent, data) {
                 return;
             case 'category':
                 // Exception for *
-                if(self.historyStatus.category() == "*")
+                if(self.historyStatus.category() === "*")
                     return glitterTranslate.defaultText
                 return self.historyStatus.category();
             case 'size':
@@ -367,6 +587,11 @@ function HistoryModel(parent, data) {
         return displayDateTime(self.completed(), parent.parent.dateFormat(), 'X')
     });
 
+    // Format time added
+    self.timeAdded = ko.pureComputed(function() {
+        return displayDateTime(self.historyStatus.time_added(), parent.parent.dateFormat(), 'X')
+    });
+
     // Subscribe to retryEvent so we can load the password
     self.canRetry.subscribe(function() {
         self.updateAllHistory = true;
@@ -375,13 +600,18 @@ function HistoryModel(parent, data) {
     // Re-try button
     self.retry = function() {
         // Set JOB-id
-        $('#modal-retry-job input[name="retry_job_id"]').val(self.nzo_id)
+        $('#modal-retry-job input[name="retry_job_id"]').val(self.id)
         // Set password
         $('#retry_job_password').val(self.historyStatus.password())
         // Open modal
         $('#modal-retry-job').modal("show")
     };
 
+    // Mark as completed button
+    self.markAsCompleted = function() {
+        parent.markAsCompleted(self);
+    };
+
     // Update information only on click
     self.updateAllHistoryInfo = function(data, event) {
         // Show
@@ -418,35 +648,4 @@ function HistoryModel(parent, data) {
             return false;
         })
     }
-
-    // Delete button
-    self.deleteSlot = function(item, event) {
-        // Confirm?
-        if(!self.parent.parent.confirmDeleteHistory() || confirm(glitterTranslate.deleteMsg + ":\n" + item.historyStatus.name() + "\n\n" + glitterTranslate.removeDow1)) {
-            // Are we still processing and it can be stopped?
-            if(item.processingDownload() == 2) {
-                callAPI({
-                    mode: 'cancel_pp',
-                    value: self.nzo_id
-                })
-                // All we can do is wait
-            } else {
-                // Delete the item
-                callAPI({
-                    mode: 'history',
-                    name: 'delete',
-                    del_files: 1,
-                    value: self.nzo_id
-                }).then(function(response) {
-                    if(response.status) {
-                        // Make sure no flickering (if there are more items left) and then remove
-                        self.parent.isLoading(self.parent.totalItems() > 1)
-                        self.parent.historyItems.remove(self);
-                        self.parent.parent.refresh();
-                    }
-                });
-            }
-
-        }
-    };
 }

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

@@ -13,7 +13,7 @@ function ViewModel() {
     self.useGlobalOptions = ko.observable(true).extend({ persist: 'useGlobalOptions' });
     self.refreshRate = ko.observable(1).extend({ persist: 'pageRefreshRate' });
     self.dateFormat = ko.observable('fromNow').extend({ persist: 'pageDateFormat' });
-    self.displayTabbed = ko.observable().extend({ persist: 'displayTabbed' });
+    self.displayTabbed = ko.observable(false).extend({ persist: 'displayTabbed' });
     self.displayCompact = ko.observable(false).extend({ persist: 'displayCompact' });
     self.displayFullWidth = ko.observable(false).extend({ persist: 'displayFullWidth' });
     self.confirmDeleteQueue = ko.observable(true).extend({ persist: 'confirmDeleteQueue' });
@@ -62,7 +62,6 @@ function ViewModel() {
     self.statusInfo.publicipv4 = ko.observable();
     self.statusInfo.ipv6 = ko.observable();
     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();
@@ -91,7 +90,7 @@ function ViewModel() {
         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);
         }
@@ -121,8 +120,7 @@ function ViewModel() {
 
     // Dynamic history length check
     self.hasHistory = ko.pureComputed(function() {
-        // We also 'have history' if we can't find any results of the search or there are no failed ones
-        return (self.history.historyItems().length > 0 || self.history.searchTerm() || self.history.showFailed() || self.history.isLoading())
+        return (self.history.historyItems().length > 0 || self.history.searchTerm() || self.history.isLoading())
     })
 
     self.hasWarnings = ko.pureComputed(function() {
@@ -151,7 +149,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;
         }
@@ -172,7 +170,7 @@ function ViewModel() {
         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('')
@@ -197,7 +195,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';
         }
@@ -216,9 +214,9 @@ 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()) {
@@ -253,7 +251,7 @@ function ViewModel() {
             Speedlimit
         ***/
         // Nothing or 0 means 100%
-        if(response.queue.speedlimit == '' || response.queue.speedlimit == '0') {
+        if(response.queue.speedlimit === '' || response.queue.speedlimit === '0') {
             self.speedLimitInt(100)
         } else {
             self.speedLimitInt(parseInt(response.queue.speedlimit));
@@ -276,7 +274,7 @@ function ViewModel() {
 
         // Paused main queue
         if (self.downloadsPaused()) {
-            if (response.queue.pause_int == '0') {
+            if (response.queue.pause_int === '0') {
                 timeString = glitterTranslate.paused;
             } else {
                 var pauseSplit = response.queue.pause_int.split(/:/);
@@ -339,13 +337,13 @@ function ViewModel() {
             limit: parseInt(self.queue.paginationLimit())
         }
         if (self.queue.searchTerm()) {
-            parseSearchQuery(api_call, self.queue.searchTerm(), ["cat", "category", "priority"])
+            parseSearchQuery(api_call, self.queue.searchTerm(), ["cat", "category", "priority", "status"])
         }
         var queueApi = callAPI(api_call)
             .done(self.updateQueue)
             .fail(function(response) {
                 // Catch the failure of authorization error
-                if (response.status == 401) {
+                if (response.status === 401) {
                     // Stop refresh and reload
                     clearInterval(self.interval)
                     location.reload();
@@ -365,10 +363,11 @@ function ViewModel() {
             failed_only: self.history.showFailed() * 1,
             start: self.history.pagination.currentStart(),
             limit: parseInt(self.history.paginationLimit()),
+            archive: self.history.showArchive() * 1,
             last_history_update: self.history.lastUpdate
         }
         if (self.history.searchTerm()) {
-            parseSearchQuery(history_call, self.history.searchTerm(), ["cat", "category"])
+            parseSearchQuery(history_call, self.history.searchTerm(), ["cat", "category", "status"])
         }
 
         // History
@@ -395,10 +394,9 @@ function ViewModel() {
                 api_request[keyword] = parsed_query[keyword]
             }
             // Special case for priority, dirty replace of string by numeric value
-            if (keyword == "priority" && api_request["priority"]) {
+            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])
-
                 }
             }
         }
@@ -433,19 +431,17 @@ function ViewModel() {
             return;
         }
         // Show modal
-        $('#modal_custom_pause').modal('show')
-
-        // Focus on the input field
-        $('#modal_custom_pause').on('shown.bs.modal', function() {
-            $('#customPauseInput').focus()
-        })
-
-        // Reset on modal close
-        $('#modal_custom_pause').on('hide.bs.modal', function() {
-            self.pauseCustom('');
-        })
+        $('#modal-custom-pause').modal('show')
     }
 
+    $('#modal-custom-pause').on('shown.bs.modal', function() {
+        // Focus on the input field when opening the modal
+        $('#customPauseInput').focus()
+    }).on('hide.bs.modal', function() {
+        // Reset on modal close
+        self.pauseCustom('');
+    })
+
     // Update on changes
     self.pauseCustom.subscribe(function(newValue) {
         // Is it plain numbers?
@@ -457,7 +453,7 @@ function ViewModel() {
         // At least 3 charaters
         if (newValue.length < 3) {
             $('#customPauseOutput').text('').data('time', 0)
-            $('#modal_custom_pause .btn-default').addClass('disabled')
+            $('#modal-custom-pause .btn-default').addClass('disabled')
             return;
         }
 
@@ -482,11 +478,11 @@ function ViewModel() {
             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')
+            $('#modal-custom-pause .btn-default').removeClass('disabled')
         } else if (newValue) {
             // No..
             $('#customPauseOutput').text(glitterTranslate.pausePromptFail)
-            $('#modal_custom_pause .btn-default').addClass('disabled')
+            $('#modal-custom-pause .btn-default').addClass('disabled')
         }
     })
 
@@ -505,7 +501,7 @@ function ViewModel() {
                 // Refresh and close the modal
                 self.refresh()
                 self.downloadsPaused(true);
-                $('#modal_custom_pause').modal('hide')
+                $('#modal-custom-pause').modal('hide')
             });
         }
     }
@@ -513,7 +509,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({
@@ -535,7 +531,7 @@ function ViewModel() {
                         type: glitterTranslate.status[warning.type].slice(0, -1),
                         text: convertHTMLtoText(warning.text).replace(/ /g, '\u00A0').replace(/(?:\r\n|\r|\n)/g, '<br />'),
                         timestamp: warning.time,
-                        css: (warning.type == "ERROR" ? "danger" : warning.type == "WARNING" ? "warning" : "info"),
+                        css: (warning.type === "ERROR" ? "danger" : warning.type === "WARNING" ? "warning" : "info"),
                         clear: self.clearWarnings
                     };
                     self.allWarnings.push(warningData)
@@ -555,7 +551,7 @@ function ViewModel() {
     // Clear messages
     self.clearMessages = function(whatToRemove) {
         // Remove specifc type of messages
-        self.allMessages.remove(function(item) { return item.index == whatToRemove });
+        self.allMessages.remove(function(item) { return item.index === whatToRemove });
         // Now so we don't show again today
         localStorageSetItem(whatToRemove, Date.now())
     }
@@ -566,7 +562,7 @@ function ViewModel() {
         if (!self.speedLimitInt()) return;
 
         // Update
-        if (self.speedLimitInt() != newValue) {
+        if (self.speedLimitInt() !== newValue) {
             callAPI({
                 mode: "config",
                 name: "speedlimit",
@@ -639,11 +635,17 @@ function ViewModel() {
             return false;
         }
 
+        // Disable the buttons to prevent multiple uploads
+        let submit_buttons = $(form).find("input[type='submit']")
+        submit_buttons.attr("disabled", true)
+
         // Upload file using the method we also use for drag-and-drop
         if ($(form.nzbFile)[0].files[0]) {
             self.addNZBFromFile($(form.nzbFile)[0].files);
             // Hide modal, upload will reset the form
             $("#modal-add-nzb").modal("hide");
+            // Re-enable the buttons
+            submit_buttons.attr("disabled", false)
         } else if ($(form.nzbURL).val()) {
             // Or add URL
             var theCall = {
@@ -651,15 +653,12 @@ function ViewModel() {
                 name: $(form.nzbURL).val(),
                 nzbname: $('#nzbname').val(),
                 password: $('#password').val(),
-                script: $('#modal-add-nzb select[name="Post-processing"]').val(),
+                cat: $('#modal-add-nzb select[name="Category"]').val(),
                 priority: $('#modal-add-nzb select[name="Priority"]').val(),
-                pp: $('#modal-add-nzb select[name="Processing"]').val()
+                pp: $('#modal-add-nzb select[name="Processing"]').val(),
+                script: $('#modal-add-nzb select[name="Post-processing"]').val(),
             }
 
-            // 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()
-
             // Add
             callAPI(theCall).then(function(r) {
                 // Hide and reset/refresh
@@ -667,6 +666,7 @@ function ViewModel() {
                 $("#modal-add-nzb").modal("hide");
                 form.reset()
                 $('#nzbname').val('')
+                submit_buttons.attr("disabled", false)
             });
         }
     }
@@ -686,7 +686,7 @@ function ViewModel() {
         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)
@@ -697,14 +697,12 @@ function ViewModel() {
         data.append("mode", "addfile");
         data.append("nzbname", $('#nzbname').val());
         data.append("password", $('#password').val());
-        data.append("script", $('#modal-add-nzb select[name="Post-processing"]').val())
+        data.append("cat", $('#modal-add-nzb select[name="Category"]').val())
         data.append("priority", $('#modal-add-nzb select[name="Priority"]').val())
+        data.append("pp", $('#modal-add-nzb select[name="Processing"]').val())
+        data.append("script", $('#modal-add-nzb select[name="Post-processing"]').val())
         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());
-
         // Add this one
         $.ajax({
             url: "./api",
@@ -728,16 +726,19 @@ function ViewModel() {
                 $('#nzbname').val('')
                 $('.btn-file em').html(glitterTranslate.chooseFile + '&hellip;')
             }
+        }).fail(function(xhr, status, error) {
+            // Update the uploading notification text to show error
+            showNotification('.main-notification-box-uploading-failed', 0, error)
         });
     }
 
     // Load status info
     self.loadStatusInfo = function(item, event) {
         // Full refresh? Only on click and for the status-screen
-        var statusFullRefresh = (event != undefined) && $('#options-status').hasClass('active');
+        var statusFullRefresh = (event !== undefined) && $('#options-status').hasClass('active');
 
         // Measure performance? Takes a while
-        var statusPerformance = (event != undefined) && $(event.currentTarget).hasClass('diskspeed-button');
+        var statusPerformance = (event !== undefined) && $(event.currentTarget).hasClass('diskspeed-button');
 
         // Make it spin if the user requested it otherwise we don't,
         // because browsers use a lot of CPU for the animation
@@ -759,7 +760,6 @@ function ViewModel() {
             // 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
@@ -778,43 +778,7 @@ function ViewModel() {
             }
 
             // Update the servers
-            if (self.statusInfo.servers().length != data.status.servers.length) {
-                // Empty them, in case of update
-                self.statusInfo.servers([])
-
-                // Initial add
-                $.each(data.status.servers, function() {
-                    self.statusInfo.servers.push({
-                        'servername': ko.observable(this.servername),
-                        'serveroptional': ko.observable(this.serveroptional),
-                        'serverpriority': ko.observable(this.serverpriority),
-                        'servertotalconn': ko.observable(this.servertotalconn),
-                        'serverssl': ko.observable(this.serverssl),
-                        'serversslinfo': ko.observable(this.serversslinfo),
-                        'serveractiveconn': ko.observable(this.serveractiveconn),
-                        'servererror': ko.observable(this.servererror),
-                        'serveractive': ko.observable(this.serveractive),
-                        'serverconnections': ko.observableArray(this.serverconnections),
-                        'serverbps': ko.observable(this.serverbps)
-                    })
-                })
-            } else {
-                // Update
-                $.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)
-                })
-            }
+            ko.mapping.fromJS(data.status.servers, {}, self.statusInfo.servers)
 
             // Add tooltips to possible new items
             if (!isMobile) $('#modal-options [data-tooltip="true"]').tooltip({ trigger: 'hover', container: 'body' })
@@ -830,7 +794,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')
         }
 
@@ -912,7 +876,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
@@ -934,7 +898,7 @@ function ViewModel() {
 
     // Orphaned folder deletion of all
     self.removeAllOrphaned = function() {
-        if (!self.confirmDeleteHistory() || confirm(glitterTranslate.clearWarn)) {
+        if (confirm(glitterTranslate.clearOrphanWarning)) {
             // Show notification
             showNotification('.main-notification-box-removing-multiple', 0, self.statusInfo.folders().length)
             // Delete them all
@@ -951,7 +915,7 @@ function ViewModel() {
 
     // Orphaned folder adding of all
     self.addAllOrphaned = function() {
-        if (!self.confirmDeleteHistory() || confirm(glitterTranslate.clearWarn)) {
+        if (confirm(glitterTranslate.confirm)) {
             // Show notification
             showNotification('.main-notification-box-sendback')
             // Delete them all
@@ -1126,7 +1090,7 @@ function ViewModel() {
         // Reformat and set categories
         self.queue.categoriesList($.map(response.config.categories, function(cat) {
             // Default?
-            if(cat.name == '*') return { catValue: '*', catText: glitterTranslate.defaultText };
+            if(cat.name === '*') return { catValue: '*', catText: glitterTranslate.defaultText };
             return { catValue: cat.name, catText: cat.name };
         }))
 
@@ -1138,14 +1102,10 @@ function ViewModel() {
                 // Reformat script-list
                 self.queue.scriptsList($.map(script_response.scripts, function(script) {
                     // None?
-                    if(script == 'None') return { scriptValue: 'None', scriptText: glitterTranslate.noneText };
+                    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)
         }
 
 
@@ -1222,7 +1182,7 @@ function ViewModel() {
         // Orphaned folders? If user clicked away we check again in 5 days
         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'],
@@ -1234,7 +1194,7 @@ function ViewModel() {
         } else {
             // Remove any message, if it was there
             self.allMessages.remove(function(item) {
-                return item.index == 'OrphanedMsg';
+                return item.index === 'OrphanedMsg';
             })
         }
     })

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

@@ -32,12 +32,12 @@ function QueueListModel(parent) {
     // External var's
     self.queueItems = ko.observableArray([]);
     self.totalItems = ko.observable(0);
+    self.deleteItems = ko.observableArray([]);
     self.isMultiEditing = ko.observable(false).extend({ persist: 'queueIsMultiEditing' });
     self.isLoading = ko.observable(false).extend({ rateLimit: 100 });
     self.multiEditItems = ko.observableArray([]);
     self.categoriesList = ko.observableArray([]);
     self.scriptsList = ko.observableArray([]);
-    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);
@@ -75,7 +75,7 @@ function QueueListModel(parent) {
         $.each(data.slots, function() {
             var item = this;
             var existingItem = ko.utils.arrayFirst(self.queueItems(), function(i) {
-                return i.id == item.nzo_id;
+                return i.id === item.nzo_id;
             });
 
             if(existingItem) {
@@ -88,7 +88,7 @@ function QueueListModel(parent) {
         });
 
         // Remove all items if there's any
-        if(itemIds.length == self.paginationLimit()) {
+        if(itemIds.length === self.paginationLimit()) {
             // Replace it, so only 1 Knockout DOM-update!
             self.queueItems(newItems);
             newItems = [];
@@ -97,7 +97,7 @@ function QueueListModel(parent) {
             $.each(itemIds, function() {
                 var id = this.toString();
                 self.queueItems.remove(ko.utils.arrayFirst(self.queueItems(), function(i) {
-                    return i.id == id;
+                    return i.id === id;
                 }));
             });
         }
@@ -148,6 +148,27 @@ function QueueListModel(parent) {
 
     }
 
+    self.triggerRemoveDownload = function(items) {
+        // Show and fill modal
+        self.deleteItems.removeAll()
+
+        // Single or multiple items?
+        if(items.length) {
+            ko.utils.arrayPushAll(self.deleteItems, items)
+        } else {
+            self.deleteItems.push(items)
+        }
+
+        // Show modal or delete right away
+        if(self.parent.confirmDeleteQueue()) {
+            // Open modal if desired
+            $('#modal-delete-queue-job').modal("show")
+        } else {
+            // Otherwise just submit right away
+            $('#modal-delete-queue-job form').submit()
+        }
+    }
+
     // Save pagination state
     self.paginationLimit.subscribe(function(newValue) {
         // Save in config if global
@@ -159,6 +180,8 @@ function QueueListModel(parent) {
                 value: newValue
             })
         }
+        // Update pagination and counters
+        self.parent.refresh(true)
     });
 
     // Do we show search box. So it doesn't dissapear when nothing is found
@@ -169,7 +192,7 @@ function QueueListModel(parent) {
     // Searching in queue (rate-limited in decleration)
     self.searchTerm.subscribe(function() {
         // Go back to page 1
-        if(self.pagination.currentPage() != 1) {
+        if(self.pagination.currentPage() !== 1) {
             // This forces a refresh
             self.pagination.moveToPage(1);
         } else {
@@ -181,12 +204,12 @@ function QueueListModel(parent) {
     // Clear searchterm
     self.clearSearchTerm = function(data, event) {
         // Was it escape key or click?
-        if(event.type == 'mousedown' || (event.keyCode && event.keyCode == 27)) {
+        if(event.type === 'mousedown' || (event.keyCode && event.keyCode === 27)) {
             self.isLoading(true)
             self.searchTerm('');
         }
         // Was it click and the field is empty? Then we focus on the field
-        if(event.type == 'mousedown' && self.searchTerm() == '') {
+        if(event.type === 'mousedown' && self.searchTerm() === '') {
             $(event.target).parents('.search-box').find('input[type="text"]').focus()
             return;
         }
@@ -253,7 +276,7 @@ function QueueListModel(parent) {
         // Reset form and remove all checked ones
         $form[0].reset();
         self.multiEditItems.removeAll();
-        $('.delete input[name="multiedit"], #multiedit-checkall').prop({'checked': false, 'indeterminate': false})
+        $('.queue-table input[name="multiedit"], #multiedit-checkall-queue').prop({'checked': false, 'indeterminate': false})
 
         // Is the multi-edit in view?
         if(($form.offset().top + $form.outerHeight(true)) > ($(window).scrollTop()+$(window).height())) {
@@ -283,7 +306,7 @@ function QueueListModel(parent) {
         }
 
         // Update check-all buton state
-        setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
+        setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
         return true;
     }
 
@@ -294,7 +317,7 @@ function QueueListModel(parent) {
 
         // We need to re-evaltuate the state of this check-all
         // Otherwise the 'inderterminate' will be overwritten by the click event!
-        setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
+        setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
 
         // Now we can check what happend
         // For when some are checked, or all are checked (but not partly)
@@ -326,7 +349,7 @@ function QueueListModel(parent) {
             self.doMultiEditUpdate()
         }
         // Set state of all the check-all's
-        setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
+        setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
         return true;
     }
 
@@ -350,14 +373,14 @@ function QueueListModel(parent) {
 
         // All non-category updates need to only happen after a category update
         function nonCatUpdates() {
-            if(newScript != '') {
+            if(newScript !== '') {
                 callAPI({
                     mode: 'change_script',
                     value: strIDs,
                     value2: newScript
                 })
             }
-            if(newPrior != '') {
+            if(newPrior !== '') {
                 callAPI({
                     mode: 'queue',
                     name: 'priority',
@@ -365,7 +388,7 @@ function QueueListModel(parent) {
                     value2: newPrior
                 })
             }
-            if(newProc != '') {
+            if(newProc !== '') {
                 callAPI({
                     mode: 'change_opts',
                     value: strIDs,
@@ -382,13 +405,13 @@ function QueueListModel(parent) {
 
             // Wat a little and do the refresh
             // Only if anything changed!
-            if(newStatus || newProc != '' || newPrior != '' || newScript != '' || newCat != '') {
+            if(newStatus || newProc !== '' || newPrior !== '' || newScript !== '' || newCat !== '') {
                 setTimeout(parent.refresh, 100)
             }
         }
 
         // What is changed?
-        if(newCat != '') {
+        if(newCat !== '') {
             callAPI({
                 mode: 'change_cat',
                 value: strIDs,
@@ -400,42 +423,103 @@ function QueueListModel(parent) {
 
     }
 
-    // Selete all selected
+    // Handle mousedown to capture state before change
+    self.handleMultiEditStatusMouseDown = function(item, event) {
+        var clickedValue = $(event.currentTarget).find("input").val();
+
+        // If this radio was already selected (same value as previous), clear it
+        if ($('.multioperations-selector input[name="multiedit-status"]:checked').val() === clickedValue) {
+            // Clear all radio buttons in this group after the click finished
+            // Hacky, but it works
+            setTimeout(function () {
+                $('.multioperations-selector input[name="multiedit-status"]').prop('checked', false);
+            }, 200)
+        }
+        return true;
+    }
+
+    // Remove downloads from queue
+    self.removeDownloads = function(form) {
+        // Hide modal and show notification
+        $('#modal-delete-queue-job').modal("hide")
+        showNotification('.main-notification-box-removing')
+
+        var strIDs = '';
+        $.each(self.deleteItems(), function(index) {
+            strIDs = strIDs + this.id + ',';
+        })
+
+        callAPI({
+            mode: 'queue',
+            name: 'delete',
+            del_files: 1,
+            value: strIDs
+        }).then(function(response) {
+            self.queueItems.removeAll(self.deleteItems());
+            self.multiEditItems.removeAll(self.deleteItems())
+            self.parent.refresh();
+            hideNotification()
+        });
+    };
+
+    // Delete all selected
     self.doMultiDelete = function() {
         // Anything selected?
         if(self.multiEditItems().length < 1) return;
 
-        // Need confirm
-        if(!self.parent.confirmDeleteQueue() || confirm(glitterTranslate.removeDown)) {
-            // List all the ID's
-            var strIDs = '';
-            $.each(self.multiEditItems(), function(index) {
-                strIDs = strIDs + this.id + ',';
-            })
-
-            // Show notification
-            showNotification('.main-notification-box-removing-multiple', 0, self.multiEditItems().length)
-
-            // Remove
-            callAPI({
-                mode: 'queue',
-                name: 'delete',
-                del_files: 1,
-                value: strIDs
-            }).then(function(response) {
-                if(response.status) {
-                    // Make sure the queue doesnt flicker and then fade-out
-                    self.isLoading(true)
-                    self.parent.refresh()
-                    // Empty it
-                    self.multiEditItems.removeAll();
-                    // Hide notification
-                    hideNotification()
-                }
-            })
-        }
+        // Trigger modal
+        self.triggerRemoveDownload(self.multiEditItems())
     }
 
+    // Move all selected to top
+    self.doMultiMoveToTop = function() {
+        // Anything selected?
+        if(self.multiEditItems().length < 1) return;
+
+        // Move each item to the top, starting from the last one in the sorted list
+        var arrayList = self.multiEditItems()
+        var movePromises = [];
+        for(var i = arrayList.length - 1; i >= 0; i--) {
+            movePromises.push(callAPI({
+                mode: "switch",
+                value: arrayList[i].id,
+                value2: 0
+            }));
+        }
+
+        // Wait for all moves to complete then refresh
+        Promise.all(movePromises).then(function() {
+            self.parent.refresh();
+        });
+    }
+
+    // Move all selected to bottom
+    self.doMultiMoveToBottom = function() {
+        // Anything selected?
+        if(self.multiEditItems().length < 1) return;
+
+        // Move each item to the bottom, starting from the first one in the sorted list
+        var arrayList = self.multiEditItems()
+        var movePromises = [];
+        for(var i = 0; i < arrayList.length; i++) {
+            movePromises.push(callAPI({
+                mode: "switch",
+                value: arrayList[i].id,
+                value2: self.totalItems() - 1
+            }));
+        }
+
+        // Wait for all moves to complete then refresh
+        Promise.all(movePromises).then(function() {
+            self.parent.refresh();
+        });
+    }
+
+    // Focus on the confirm button
+    $('#modal-delete-queue-job').on("shown.bs.modal", function() {
+        $('#modal-delete-queue-job .btn[type="submit"]').focus()
+    })
+
     // On change of page we need to check all those that were in the list!
     self.queueItems.subscribe(function() {
         // We need to wait until the unit is actually finished rendering
@@ -445,7 +529,7 @@ function QueueListModel(parent) {
             })
 
             // Update check-all buton state
-            setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
+            setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
         }, 100)
     }, null, "arrayChange")
 }
@@ -465,8 +549,8 @@ function QueueModel(parent, data) {
     self.index = ko.observable(data.index);
     self.status = ko.observable(data.status);
     self.labels = ko.observableArray(data.labels);
-    self.isGrabbing = ko.observable(data.status == 'Grabbing' || data.avg_age == '-')
-    self.isFetchingBlocks = data.status == 'Fetching' || data.priority == 'Repair' // No need to update
+    self.isGrabbing = ko.observable(data.status === 'Grabbing' || data.avg_age === '-')
+    self.isFetchingBlocks = data.status === 'Fetching' || data.priority === 'Repair' // No need to update
     self.totalMB = ko.observable(parseFloat(data.mb));
     self.remainingMB = ko.observable(parseFloat(data.mbleft))
     self.missingMB = ko.observable(parseFloat(data.mbmissing))
@@ -477,7 +561,7 @@ function QueueModel(parent, data) {
     self.priority = ko.observable(parent.priorityName[data.priority]);
     self.script = ko.observable(data.script);
     self.unpackopts = ko.observable(parseInt(data.unpackopts)) // UnpackOpts fails if not parseInt'd!
-    self.pausedStatus = ko.observable(data.status == 'Paused');
+    self.pausedStatus = ko.observable(data.status === 'Paused');
     self.timeLeft = ko.observable(data.timeleft);
 
     // Initially empty
@@ -488,7 +572,7 @@ function QueueModel(parent, data) {
     // Color of the progress bar
     self.progressColor = ko.computed(function() {
         // Checking
-        if(self.status() == 'Checking') {
+        if(self.status() === 'Checking') {
             return '#58A9FA'
         }
         // Check for missing data, the value is arbitrary! (2%)
@@ -496,7 +580,7 @@ function QueueModel(parent, data) {
             return '#F8A34E'
         }
         // Set to grey, only when not Force download
-        if((self.parent.parent.downloadsPaused() && self.priority() != 2) || self.pausedStatus()) {
+        if((self.parent.parent.downloadsPaused() && self.priority() !== 2) || self.pausedStatus()) {
             return '#B7B7B7'
         }
         // Nothing
@@ -505,6 +589,9 @@ function QueueModel(parent, data) {
 
     // MB's
     self.progressText = ko.pureComputed(function() {
+        if(self.isGrabbing()) {
+            return glitterTranslate.fetchingURL
+        }
         return (self.totalMB() - self.remainingMB()).toFixed(0) + " MB / " + (self.totalMB() * 1).toFixed(0) + " MB";
     })
 
@@ -524,15 +611,15 @@ function QueueModel(parent, data) {
     })
     self.statusText = ko.computed(function() {
         // Checking
-        if(self.status() == 'Checking') {
+        if(self.status() === 'Checking') {
             return glitterTranslate.checking
         }
         // Grabbing
-        if(self.status() == 'Grabbing') {
+        if(self.status() === 'Grabbing') {
             return glitterTranslate.fetch
         }
         // Pausing status
-        if((self.parent.parent.downloadsPaused() && self.priority() != 2) || self.pausedStatus()) {
+        if((self.parent.parent.downloadsPaused() && self.priority() !== 2) || self.pausedStatus()) {
             return glitterTranslate.paused;
         }
         // Just the time
@@ -542,7 +629,7 @@ function QueueModel(parent, data) {
     // Icon to better show force-priority
     self.queueIcon = ko.computed(function() {
         // Force comes first
-        if(self.priority() == 2) {
+        if(self.priority() === 2) {
             return 'glyphicon-forward'
         }
         if(self.pausedStatus()) {
@@ -556,17 +643,17 @@ function QueueModel(parent, data) {
         switch(param) {
             case 'category':
                 // Exception for *
-                if(self.category() == "*")
+                if(self.category() === "*")
                     return glitterTranslate.defaultText
                 return self.category();
             case 'priority':
                 // Onload-exception
-                if(self.priority() == undefined) return;
-                return ko.utils.arrayFirst(self.parent.priorityOptions(), function(item) { return item.value == self.priority()}).name;
+                if(self.priority() === undefined) return;
+                return ko.utils.arrayFirst(self.parent.priorityOptions(), function(item) { return item.value === self.priority()}).name;
             case 'processing':
                 // Onload-exception
-                if(self.unpackopts() == undefined) return;
-                return ko.utils.arrayFirst(self.parent.processingOptions(), function(item) { return item.value == self.unpackopts()}).name;
+                if(self.unpackopts() === undefined) return;
+                return ko.utils.arrayFirst(self.parent.processingOptions(), function(item) { return item.value === self.unpackopts()}).name;
             case 'scripts':
                 return self.script();
             case 'age':
@@ -582,7 +669,7 @@ function QueueModel(parent, data) {
         self.password(data.password);
         self.index(data.index);
         self.status(data.status)
-        self.isGrabbing(data.status == 'Grabbing' || data.avg_age == '-')
+        self.isGrabbing(data.status === 'Grabbing' || data.avg_age === '-')
         self.totalMB(parseFloat(data.mb));
         self.remainingMB(parseFloat(data.mbleft));
         self.missingMB(parseFloat(data.mbmissing))
@@ -593,12 +680,12 @@ function QueueModel(parent, data) {
         self.priority(parent.priorityName[data.priority]);
         self.script(data.script);
         self.unpackopts(parseInt(data.unpackopts)) // UnpackOpts fails if not parseInt'd!
-        self.pausedStatus(data.status == 'Paused');
+        self.pausedStatus(data.status === 'Paused');
         self.timeLeft(data.timeleft);
 
         // Did the label-list change?
         // Otherwise KO will send updates to all texts during refresh()
-        if(self.rawLabels != data.labels.toString()) {
+        if(self.rawLabels !== data.labels.toString()) {
             // Update
             self.labels(data.labels);
             self.rawLabels = data.labels.toString();
@@ -623,9 +710,37 @@ function QueueModel(parent, data) {
         self.editingName(true)
         self.nameForEdit(self.name())
 
-        // Select
-        $(event.target).parents('.name').find('input').select()
-    }
+        // Select the input
+        const $input = $(event.target).parents('.name').find('input');
+        $input.select();
+
+        // Add Tab/Shift+Tab navigation
+        $input.off('keydown.tabnav').on('keydown.tabnav', function (e) {
+            if (e.key === 'Tab') {
+                e.preventDefault();
+
+                // Find all rename inputs that are currently visible
+                const inputs = $('.queue-table input[type="text"]');
+                const currentIndex = inputs.index(this);
+                let nextIndex = e.shiftKey ? currentIndex - 1 : currentIndex + 1;
+
+                // Wrap around
+                if (nextIndex >= inputs.length) nextIndex = 0;
+                if (nextIndex < 0) nextIndex = inputs.length - 1;
+
+                // Simulate clicking Rename on the next row
+                const $nextRow = inputs.eq(nextIndex).closest('tr');
+                $nextRow.find('.hover-button[title="Rename"]').click();
+
+                // Delay focusing to wait for new input to appear
+                setTimeout(() => {
+                    const $nextInput = $('.queue-table input[type="text"]').eq(nextIndex);
+                    $nextInput.focus().select();
+                }, 50);
+            }
+        });
+    };
+
 
     // Catch the submit action
     self.editingNameSubmit = function() {
@@ -635,7 +750,7 @@ function QueueModel(parent, data) {
     // Do on change
     self.nameForEdit.subscribe(function(newName) {
         // Anything change or empty?
-        if(!newName || self.name() == newName) return;
+        if(!newName || self.name() === newName) return;
 
         // Rename would abort Direct Unpack, so ask if user is sure
         if(self.direct_unpack() && !confirm(glitterTranslate.renameAbort)) return;
@@ -707,29 +822,5 @@ function QueueModel(parent, data) {
         })
     }
 
-    // Remove 1 download from queue
-    self.removeDownload = function(item, event) {
-        // Confirm and remove
-        if(!self.parent.parent.confirmDeleteQueue() || confirm(glitterTranslate.deleteMsg + ":\n" + item.name() + "\n\n" + glitterTranslate.removeDow1)) {
-            var itemToDelete = this;
 
-            // Show notification
-            showNotification('.main-notification-box-removing')
-
-            callAPI({
-                mode: 'queue',
-                name: 'delete',
-                del_files: 1,
-                value: item.id
-            }).then(function(response) {
-                // Make sure no flickering (if there are more items left) and then remove
-                self.parent.isLoading(self.parent.totalItems() > 1)
-                parent.queueItems.remove(itemToDelete);
-                parent.multiEditItems.remove(function(inList) { return inList.id == itemToDelete.id; })
-                self.parent.parent.refresh();
-                // Hide notifcation
-                hideNotification()
-            });
-        }
-    };
 }

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

@@ -69,6 +69,10 @@ legend,
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
 }
 
+.main-notification-box-uploading-failed {
+    color: #F95151;
+}
+
 .container,
 .modal-body,
 .modal-footer {
@@ -140,6 +144,12 @@ select.form-control,
     color: #EBEBEB;
 }
 
+.btn-default:not(.navbar-btn):hover,
+select:hover,
+input:hover {
+    background-color: #666666;
+}
+
 /* Needed to force the text-color */
 .table-striped>tbody>tr:nth-child(odd)>td,
 .table>tbody>tr:nth-child(odd)>td,
@@ -200,7 +210,8 @@ tbody .caret {
 .info-container,
 #modal-options .options-status-box small,
 #modal-options #options-status small,
-#modal-options .tab-content h4 {
+#modal-options .tab-content h4,
+h2 small {
     color: #D6D6D6;
 }
 
@@ -266,16 +277,11 @@ button:focus {
     outline: initial;
 }
 
-/* Placeholders - Will not work if grouped! */
-::-webkit-input-placeholder {
-   color: #EBEBEB !important;
+.archive-icon {
+    fill: #EBEBEB;
 }
 
-::-moz-placeholder {
-   color: #EBEBEB !important;
-   opacity: 1 !important;
-}
-
-:-ms-input-placeholder {
-   color: #EBEBEB !important;
+::placeholder {
+    color: #EBEBEB !important;
+    opacity: 0.5 !important;
 }

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

@@ -442,7 +442,7 @@ tbody>tr>td:last-child {
 .container-tabbed #queue-tab,
 .container-tabbed #queue-tab,
 .container-tabbed #queue-messages,
-.container-tabbed .history h2,
+.container-tabbed .history-header h2,
 .container-tabbed .queue h2,
 .history-queue-swicher {
     display: none;
@@ -494,6 +494,10 @@ tbody>tr>td:last-child {
     background-color: #d9534f !important;
 }
 
+.history-queue-swicher .badge-info {
+    background-color: #58A9FA !important;
+}
+
 .history-queue-swicher .badge {
     margin-left: 4px;
 }
@@ -686,6 +690,10 @@ tbody.no-downloads tr td {
     border-bottom: 1px solid #F0F0F0 !important;
 }
 
+tbody.no-downloads tr td>span {
+    opacity: 0.7;
+}
+
 tbody.no-downloads tr td a {
     line-height: 2em;
     font-size: 1.5em;
@@ -852,7 +860,7 @@ tr.queue-item>td:first-child>a {
 }
 
 .multioperations-selector .add-nzb-inputbox {
-    width: 20%;
+    width: 19%;
     float: left;
 }
 
@@ -863,7 +871,7 @@ tr.queue-item>td:first-child>a {
 }
 
 .multioperations-selector .add-nzb-inputbox-small {
-    width: 80px;
+    width: 115px;
     float: right;
     padding-left: 0;
     padding-top: 12px;
@@ -986,8 +994,27 @@ tr.queue-item>td:first-child>a {
     position: relative;
 }
 
-.history h2 {
+.history-header {
     clear: left;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+}
+
+.history-header a {
+    align-self: center;
+    margin-right: 2px;
+    font-size: 12px;
+}
+
+.container-tabbed .history-header {
+    display: inline;
+}
+
+.container-tabbed .history-header a {
+    position: absolute;
+    right: 0;
+    top: 10px;
 }
 
 .history-table {
@@ -1070,6 +1097,13 @@ tr.queue-item>td:first-child>a {
     font-weight: bold;
 }
 
+.mark-completed-link {
+    font-weight: bold !important;
+    color: #28a745 !important;
+    text-decoration: underline;
+    margin-left: 10px;
+}
+
 .history-status-hidden {
     display: none;
 }
@@ -1080,11 +1114,29 @@ tr.queue-item>td:first-child>a {
 }
 
 #history-options .hover-button {
-    padding: 7px 8px 7px 8px;
+    padding: 7px;
     line-height: 1.428571429;
     display: inline-block;
 }
 
+#history-options .hover-button.history-archive {
+    line-height: 1em;
+    vertical-align: middle;
+}
+
+#history-options div {
+    display: inline-block;
+    vertical-align: middle;
+    margin-left: 5px;
+}
+
+#history-options input[name="multieditCheckAll"] {
+    vertical-align: middle;
+    position: relative;
+    top: -2px;
+    margin-left: 8px;
+} 
+
 #history-options .hover-button span {
     top: 2px;
 }
@@ -1151,6 +1203,10 @@ tr.queue-item>td:first-child>a {
     color:  red !important;
 }
 
+.history-options-show-failed .archive-icon {
+    fill: #2bbd43;
+}
+
 .processing-download {
     width: 16px;
     height: 18px;
@@ -1486,6 +1542,34 @@ input[name="nzbURL"] {
     transition : border 500ms ease-out;
 }
 
+/* DELETE MODAL */
+.modal-delete-job ul {
+    margin-top: 10px;
+}
+
+.modal-delete-job li {
+    word-break: break-all;
+}
+
+.modal-delete-job .checkbox {
+    float: left;
+    margin: 8px 5px 0px;
+}
+
+#modal-purge-history .checkbox {
+    margin: 0;
+}
+
+.modal-delete-job .checkbox input,
+#modal-purge-history .checkbox input {
+    margin-top: 3px;
+}
+
+.modal-delete-job .checkbox input+span,
+#modal-purge-history .checkbox input+span {
+    font-weight: bold;
+}
+
 /* HELP MODAL */
 
 #modal-help .modal-body {

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

@@ -7,6 +7,10 @@
     padding-right: 8px;
 }
 
+.container-full-width .container {
+    width: 100%;
+}
+
 .main-navbar {
     margin-top: 0;
     padding: 0;
@@ -163,7 +167,7 @@ tr.queue-item>td:first-child>a {
 }
 
 .multioperations-selector .add-nzb-inputbox-small {
-    width: 72px;
+    width: 115px;
 }
 
 .multioperations-selector .add-nzb-inputbox-clear {

interfaces/wizard/README.TXT

@@ -1,5 +1,5 @@
 #
-# Copyright 2009 The SABnzbd-Team <team@sabnzbd.org>
+# Copyright 2009 The SABnzbd-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

interfaces/wizard/inc_top.tmpl

@@ -5,6 +5,9 @@
         <title>$T('wizard-quickstart')</title>
         <link rel="stylesheet" type="text/css" href="../staticcfg/bootstrap/css/bootstrap.min.css?v=$version"/>
         <link rel="stylesheet" type="text/css" href="static/style.css?v=$version"/>
+        <!--#if $color_scheme not in ('Light', '') #-->
+        <link rel="stylesheet" type="text/css" href="../staticcfg/css/${color_scheme}.css?v=$version"/>
+        <!--#end if#-->
         <link rel="shortcut icon" href="../staticcfg/ico/favicon.ico?v=$version" />
         <script type="text/javascript" src="../staticcfg/js/jquery-3.5.1.min.js?v=$version"></script>
         <script type="text/javascript" src="../staticcfg/bootstrap/js/bootstrap.min.js?v=$version"></script>

interfaces/wizard/one.html

@@ -7,7 +7,9 @@
                 <h1>$T('wizard-quickstart')</h1>
                 <hr />
                 <script type="text/javascript">
+                    var txtTestServer = "$T('wizard-server-text')";
                     var txtChecking = "$T('srv-testing')";
+                    var txtTestRequired = "$T('wizard-test-server-required')";
                     <!--#include raw $webdir + "/static/javascript/checkserver.js"#-->
                 </script>
                 <h3>$T('wizard-server')</h3>
@@ -22,7 +24,7 @@
                         <div class="form-group">
                             <label for="host" class="col-sm-4 control-label">$T('srv-host')</label>
                             <div class="col-sm-8">
-                                <input type="text" class="form-control" name="host" id="host" value="$host" placeholder="$T('wizard-example') news.newshosting.com" />
+                                <input type="text" class="form-control" name="host" id="host" value="$host" placeholder="$T('wizard-example') news.newshosting.com" required />
                             </div>
                         </div>
                         <div class="form-group">
@@ -48,7 +50,7 @@
                         <div class="form-group">
                             <div class="col-sm-4"></div>
                             <div class="col-sm-8">
-                                <a href="#" onclick="\$('#server-hidden-settings').removeClass('hidden');\$(this).parent().parent().hide()">
+                                <a href="#" class="wizard-advanced-settings" onclick="\$('#server-hidden-settings').removeClass('hidden');\$(this).parent().parent().hide()">
                                     <span class="glyphicon glyphicon-cog"></span> $T('button-advanced')
                                 </a>
                             </div>
@@ -57,29 +59,31 @@
                             <div class="form-group">
                                 <label for="port" class="col-sm-4 control-label">$T('srv-port')</label>
                                 <div class="col-sm-8">
-                                    <input type="number" class="form-control" name="port" id="port" value="<!--#if $port then $port else '119' #-->" />
+                                    <input type="number" class="form-control" name="port" id="port" value="<!--#if $port then $port else '563' #-->" min="0" max="65535" required />
                                 </div>
                             </div>
                             <div class="form-group">
                                 <label for="connections" class="col-sm-4 control-label">$T('srv-connections')</label>
                                 <div class="col-sm-8">
-                                    <input type="number" class="form-control" name="connections" id="connections" value="<!--#if $connections then $connections else '8'#-->" data-toggle="tooltip" data-placement="right" title="$T('wizard-server-con-explain') $T('wizard-server-con-eg')" />
+                                    <input type="number" class="form-control" name="connections" id="connections" value="<!--#if $connections then $connections else '8'#-->" min="1" max="500" data-toggle="tooltip" data-placement="right" title="$T('wizard-server-con-explain') $T('wizard-server-con-eg')" required />
                                 </div>
                             </div>
                             <div class="form-group">
                                 <label for="ssl_verify" class="col-sm-4 control-label">$T('opt-ssl_verify')</label>
                                 <div class="col-sm-8">
-                                    <select name="ssl_verify" id="ssl_verify" class="form-control" <!--#if int($certificate_validation) == 0 then "disabled=\"disabled\"" else ""#-->>
-                                        <option value="2" <!--#if $ssl_verify == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
-                                        <option value="1" <!--#if $ssl_verify == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-normal')</option>
+                                    <select name="ssl_verify" id="ssl_verify" class="form-control">
+                                        <option value="3" <!--#if $ssl_verify == 3 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
+                                        <option value="2" <!--#if $ssl_verify == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-medium')</option>
+                                        <option value="1" <!--#if $ssl_verify == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-minimal')</option>
                                         <option value="0" <!--#if $ssl_verify == 0 then 'selected="selected"' else ""#--> >$T('ssl_verify-disabled')</option>
                                     </select>
+                                    <span class="desc">$T('explain-ssl_verify').replace('-', '<br/>-')</span>
                                 </div>
                             </div>
                         </div>
                         <div class="row">
                             <div class="col-sm-4">
-                                <button id="serverTest" class="btn btn-default"><span class="glyphicon glyphicon-sort"></span> $T('wizard-button-testServer')</button>
+                                <button id="serverTest" class="btn btn-default" data-toggle="tooltip" data-placement="left"><span class="glyphicon glyphicon-sort"></span> $T('wizard-button-testServer')</button>
                             </div>
                             <div class="col-sm-8">
                                 <div id="serverResponse" class="well well-sm">$T('wizard-server-text')</div>

interfaces/wizard/static/javascript/checkserver.js

@@ -1,9 +1,31 @@
+// Variable to track server test results
+var serverTestSuccessful = false;
+
+function resetTestResult() {
+    serverTestSuccessful = false;
+    $('#serverResponse').html(txtTestServer);
+    checkRequired();
+}
+
+function setTestResult(success) {
+    serverTestSuccessful = success;
+    checkRequired();
+}
+
 function checkRequired() {
-    if ($("#host").val() && $("#connections").val()) {
+    // Check if form is valid using HTML5 validation and if server test passed
+    if ($("form").get(0).checkValidity() && serverTestSuccessful) {
         $("#next-button").removeClass('disabled')
+        $("#next-button").removeAttr('data-toggle')
+        $("#next-button").removeAttr('title')
+        $("#next-button").tooltip('destroy')
         return true;
     } else {
         $("#next-button").addClass('disabled')
+        $("#next-button").attr('data-toggle', 'tooltip')
+        $("#next-button").attr('data-placement', 'left')
+        $("#next-button").attr('title', txtTestRequired)
+        $("#next-button").tooltip()
         return false;
     }
 }
@@ -12,8 +34,13 @@ $(document).ready(function() {
     // Add tooltips
     $('[data-toggle="tooltip"]').tooltip()
 
-    // On form-submit
+    // On server test button click
     $("#serverTest").click(function() {
+        // Check HTML5 form validation before testing server
+        if (!$("form").get(0).reportValidity()) {
+            return false;
+        }
+        
         $('#serverResponse').html(txtChecking);
         $.getJSON(
             "../api?mode=config&name=test_server&output=json",
@@ -21,8 +48,10 @@ $(document).ready(function() {
             function(result) {
                 if (result.value.result) {
                     r = '<span class="success"><span class="glyphicon glyphicon-ok"></span> ' + result.value.message + '</span>';
+                    setTestResult(true);
                 } else {
                     r = '<span class="failed"><span class="glyphicon glyphicon-minus-sign"></span> ' + result.value.message + '</span>';
+                    setTestResult(false);
                 }
                 r = r.replace('https://sabnzbd.org/certificate-errors', '<a href="https://sabnzbd.org/certificate-errors" class="failed" target="_blank">https://sabnzbd.org/certificate-errors</a>')
                 $('#serverResponse').html(r);
@@ -31,47 +60,31 @@ $(document).ready(function() {
         return false;
     });
 
-    $("#port, #connections").bind('keyup blur', function() {
-        if (this.value > 0) {
-            $(this).removeClass("incorrect");
-            $(this).addClass("correct");
-        } else {
-            $(this).removeClass("correct");
-            $(this).addClass("incorrect");
-        }
-        checkRequired()
-    });
-
-    $("#host, #username, #password").bind('keyup blur', function() {
-        if (this.value) {
-            $(this).removeClass("incorrect");
-            $(this).addClass("correct");
-        } else {
-            $(this).removeClass("correct");
-            $(this).addClass("incorrect");
-        }
-        checkRequired();
+    // Reset test result when any form field changes
+    $("#host, #username, #password, #port, #connections, #ssl_verify").bind('input change', function() {
+        resetTestResult();
     });
 
     $('#ssl').click(function() {
         if(this.checked) {
             // Enabled SSL change port when not already a custom port
-            if($('#port').val() == '119') {
+            if($('#port').val() === '119') {
                 $('#port').val('563')
             }
         } else {
             // Remove SSL port
-            if($('#port').val() == '563') {
+            if($('#port').val() === '563') {
                 $('#port').val('119')
             }
         }
+        resetTestResult();
     })
 
     checkRequired()
 
     $('form').submit(function(event) {
-        // Double check
-        if(!checkRequired()) {
+        // Check if server test passed (HTML5 validation is automatic)
+        if(!serverTestSuccessful) {
             event.preventDefault();
         }
     })

interfaces/wizard/static/style.css

@@ -88,49 +88,25 @@ label {
     float: right;
     margin: 0;
 }
+.desc {
+    font-size: 12px;
+    font-style: italic;
+}
 .align-right {
     text-align: right;
 }
 .align-center {
     text-align: center;
 }
-.unselected,
-.selected {
-    display: inline-block;
-}
-.unselected {
-    padding: 6px 10px 6px 10px;
-    border: 1px solid #636363;
-    margin-left: 8px;
-    margin-right: 8px;
-    color: #636363;
-}
-.selected {
-    padding: 6px 10px 6px 10px;
-    color: white;
-    background-color: #636363;
-    border: 1px solid #636363;
-    margin-left: 8px;
-    margin-right: 8px;
-}
 .bigger {
     font-size: 14px;
 }
 .bigger input {
     font-size: 16px;
 }
-.required-star {
-    color: red;
-}
 .full-width {
     width: 100%;
 }
-.correct {
-    border: 2px solid #00cc22;
-}
-.incorrect {
-    border: 2px solid red;
-}
 .hidden {
     display: none !important;
 }
@@ -146,20 +122,12 @@ label {
 .input-group-bw {
     width: 150px;
 }
-.disabled-text {
-    text-decoration: line-through;
-    color: #ccc;
-}
 #serverResponse {
     padding: 6px 10px;
 }
 #host-tip {
     margin-bottom: 5px;
 }
-.error-text {
-    display: inline;
-    color: red;
-}
 #bandwidth {
     display: inline-block;
 }
@@ -171,10 +139,10 @@ label {
 * {
     border-radius: 0 !important;
 }
-#content a,
-#content a:hover,
-#content a:active,
-#content a:visited,
+a,
+a:hover,
+a:active,
+a:visited,
 #serverResponse {
     color: #555;
 }

interfaces/wizard/two.html

@@ -32,7 +32,7 @@
             </div>
 
             <hr/>
-            <p>$T('wizard-tip-wiki') <a target="_blank" href="$helpuri">$T('menu-wiki')</a> <span class="glyphicon glyphicon-info-sign"></span></p>
+            <p>$T('wizard-tip-wiki') <a target="_blank" href="https://sabnzbd.org/wiki/">$T('menu-wiki')</a> <span class="glyphicon glyphicon-info-sign"></span></p>
 
         </div>
         <hr />

linux/org.sabnzbd.sabnzbd.appdata.xml

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2022 The SABnzbd-Team <team@sabnzbd.org> -->
+<!-- Copyright 2022-2025 by The SABnzbd-Team (sabnzbd.org) -->
 <component type="desktop-application">
   <id>org.sabnzbd.sabnzbd</id>
   <metadata_license>MIT</metadata_license>
   <name>SABnzbd</name>
   <summary>Free and easy binary newsreader</summary>
+  <branding>
+    <color type="primary" scheme_preference="light">#e7e7e7</color>
+    <color type="primary" scheme_preference="dark">#444444</color>
+  </branding>
   <description>
     <p>
       SABnzbd is a free and Open Source web-based binary newsreader,
@@ -17,6 +21,13 @@
       and services that help automate the download process.
     </p>
   </description>
+  <keywords>
+    <keyword>usenet</keyword>
+    <keyword>nzb</keyword>
+    <keyword>download</keyword>
+    <keyword>newsreader</keyword>
+    <keyword>binary</keyword>
+  </keywords>
   <categories>
     <category>Network</category>
     <category>FileTransfer</category>
@@ -24,11 +35,50 @@
   <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="contribute">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://sabnzbd.org/live-chat.html</url>
+  <releases>
+    <release version="4.6.0" date="2025-12-24" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.6.0</url>
+    </release>
+    <release version="4.5.5" date="2025-10-24" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.5.5</url>
+    </release>
+    <release version="4.5.4" date="2025-10-22" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.5.4</url>
+    </release>
+    <release version="4.5.3" date="2025-08-25" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.5.3</url>
+    </release>
+    <release version="4.5.2" date="2025-07-09" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.5.2</url>
+    </release>
+    <release version="4.5.1" date="2025-04-11" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.5.1</url>
+    </release>
+    <release version="4.5.0" date="2025-04-01" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.5.0</url>
+    </release>
+    <release version="4.4.1" date="2024-12-23" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.4.1</url>
+    </release>
+    <release version="4.4.0" date="2024-12-09" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.4.0</url>
+    </release>
+    <release version="4.3.3" date="2024-08-01" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.3.3</url>
+    </release>
+    <release version="4.3.2" date="2024-05-30" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.3.2</url>
+    </release>
+    <release version="4.3.1" date="2024-05-03" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.3.1</url>
+    </release>
+  </releases>
   <launchable type="desktop-id">sabnzbd.desktop</launchable>
   <provides>
     <mediatype>application/x-nzb</mediatype>
@@ -40,19 +90,69 @@
     <control>touch</control>
   </supports>
   <recommends>
-    <display_length compare="ge">small</display_length>
+    <display_length compare="ge">640</display_length>
     <internet>always</internet>
   </recommends>
   <project_license>GPL-2.0-or-later</project_license>
-  <developer_name>The SABnzbd-team</developer_name>
+  <developer id="org.sabnzbd">
+    <name>The SABnzbd-Team</name>
+  </developer>
   <screenshots>
     <screenshot type="default">
       <image>https://sabnzbd.org/images/landing/screenshots/interface.png</image>
-      <caption>Web interface</caption>
+      <caption>Intuitive interface</caption>
     </screenshot>
     <screenshot>
       <image>https://sabnzbd.org/images/landing/screenshots/night-mode.png</image>
-      <caption>Night mode</caption>
+      <caption>Also comes in Night-mode</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/add-nzb.png</image>
+      <caption>Add NZB's or use drag-and-drop!</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/phone-interface.png</image>
+      <caption>Scales to any screen size</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/history-details.png</image>
+      <caption>Easy overview of all history details</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/phone-extra.png</image>
+      <caption>Every option, on every screen size</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/file-lists.png</image>
+      <caption>Manage a job's individual files</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/set-speedlimit.png</image>
+      <caption>Easy speed limiting</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/set-options.png</image>
+      <caption>Quickly change settings</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/dashboard.png</image>
+      <caption>Easy system check</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/connections-overview.png</image>
+      <caption>See active connections</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/skin-settings.png</image>
+      <caption>Customize the interface</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/tabbed.png</image>
+      <caption>Tabbed-mode</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/set-custom-pause.png</image>
+      <caption>Specify any pause duration</caption>
     </screenshot>
     <screenshot>
       <image>https://sabnzbd.org/images/landing/screenshots/config.png</image>

linux/sabnzbd.desktop

@@ -1,11 +1,17 @@
 [Desktop Entry]
 Name=SABnzbd
 GenericName=Binary newsreader
+GenericName[fr]=Lecteur de newsgroups binaires
+GenericName[tr]=İkili haber grupları okuyucusu
 Comment=Download from Usenet
+Comment[fr]=Télécharger depuis Usenet
+Comment[tr]=Usenet ağından dosya indir
 Exec=/opt/sabnzbd/SABnzbd.py --browser 1 %F
 Icon=sabnzbd
 Terminal=false
 Type=Application
 Categories=Network;FileTransfer;
 Keywords=usenet;binaries;download;nzb;nntp;newsreader;
+Keywords[fr]=usenet;binaires;télécharger;nzb;nntp;newsreader;
+Keywords[tr]=usenet;ikililer;indir;nzb;nntp;okuyucu;
 MimeType=application/x-nzb;application/x-compressed-nzb;

linux/sabnzbd@.service

@@ -22,6 +22,11 @@ ExecStart=/opt/sabnzbd/SABnzbd.py --disable-file-log --logging 1 --browser 0
 User=%I
 Type=simple
 Restart=on-failure
+ProtectSystem=full
+DeviceAllow=/dev/null rw
+DeviceAllow=/dev/urandom r
+DevicePolicy=strict
+NoNewPrivileges=yes
 
 [Install]
 WantedBy=multi-user.target

macos/7zip/License.txt

@@ -0,0 +1,144 @@
+  7-Zip for Linux and macOS
+  ~~~~~~~~~~~~~~~~~~~~~~~~~
+  License for use and distribution
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  7-Zip Copyright (C) 1999-2024 Igor Pavlov.
+
+  The licenses for 7zz and 7zzs files are:
+
+         - The "GNU LGPL" as main license for most of the code
+         - The "GNU LGPL" with "unRAR license restriction" for some code
+         - The "BSD 3-clause License" for some code
+         - The "BSD 2-clause License" for some code
+
+  Redistributions in binary form must reproduce related license information from this file.
+
+  Note:
+    You can use 7-Zip on any computer, including a computer in a commercial
+    organization. You don't need to register or pay for 7-Zip.
+
+
+GNU LGPL information
+--------------------
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You can receive a copy of the GNU Lesser General Public License from
+    http://www.gnu.org/
+
+
+
+
+BSD 3-clause License in 7-Zip code
+----------------------------------
+
+  The "BSD 3-clause License" is used for the following code in 7z.dll
+    1) LZFSE data decompression.
+       That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
+       that also uses the "BSD 3-clause License".
+    2) ZSTD data decompression.
+       that code was developed using original zstd decoder code as reference code.
+       The original zstd decoder code was developed by Facebook Inc,
+       that also uses the "BSD 3-clause License".
+
+  Copyright (c) 2015-2016, Apple Inc. All rights reserved.
+  Copyright (c) Facebook, Inc. All rights reserved.
+  Copyright (c) 2023-2024 Igor Pavlov.
+
+Text of the "BSD 3-clause License"
+----------------------------------
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may
+   be used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---
+
+
+
+
+BSD 2-clause License in 7-Zip code
+----------------------------------
+
+  The "BSD 2-clause License" is used for the XXH64 code in 7-Zip.
+
+  XXH64 code in 7-Zip was derived from the original XXH64 code developed by Yann Collet.
+
+  Copyright (c) 2012-2021 Yann Collet.
+  Copyright (c) 2023-2024 Igor Pavlov.
+
+Text of the "BSD 2-clause License"
+----------------------------------
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---
+
+
+
+
+unRAR license restriction
+-------------------------
+
+The decompression engine for RAR archives was developed using source
+code of unRAR program.
+All copyrights to original unRAR code are owned by Alexander Roshal.
+
+The license for original unRAR code has the following restriction:
+
+  The unRAR sources cannot be used to re-create the RAR compression algorithm,
+  which is proprietary. Distribution of modified unRAR sources in separate form
+  or as a part of other software is permitted, provided that it is clearly
+  stated in the documentation and source comments that the code may
+  not be used to develop a RAR (WinRAR) compatible archiver.
+
+--

osx/7zip/License.txt

@@ -1,88 +0,0 @@
-  7-Zip
-  ~~~~~
-  License for use and distribution
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  7-Zip Copyright (C) 1999-2021 Igor Pavlov.
-
-  The licenses for 7zz file are:
-
-         - The "GNU LGPL" as main license for most of the code
-         - The "GNU LGPL" with "unRAR license restriction" for some code
-         - The "BSD 3-clause License" for some code
-
-  Redistributions in binary form must reproduce related license information from this file.
-
-  Note:
-    You can use 7-Zip on any computer, including a computer in a commercial
-    organization. You don't need to register or pay for 7-Zip.
-
-
-  GNU LGPL information
-  --------------------
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You can receive a copy of the GNU Lesser General Public License from
-    http://www.gnu.org/
-
-
-
-
-  BSD 3-clause License
-  --------------------
-
-    The "BSD 3-clause License" is used for the code in 7z.dll that implements LZFSE data decompression.
-    That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
-    that also uses the "BSD 3-clause License":
-
-    ----
-    Copyright (c) 2015-2016, Apple Inc. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    1.  Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-    2.  Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
-        in the documentation and/or other materials provided with the distribution.
-
-    3.  Neither the name of the copyright holder(s) nor the names of any contributors may be used to endorse or promote products derived
-        from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-    ----
-
-
-
-
-  unRAR license restriction
-  -------------------------
-
-    The decompression engine for RAR archives was developed using source
-    code of unRAR program.
-    All copyrights to original unRAR code are owned by Alexander Roshal.
-
-    The license for original unRAR code has the following restriction:
-
-      The unRAR sources cannot be used to re-create the RAR compression algorithm,
-      which is proprietary. Distribution of modified unRAR sources in separate form
-      or as a part of other software is permitted, provided that it is clearly
-      stated in the documentation and source comments that the code may
-      not be used to develop a RAR (WinRAR) compatible archiver.
-
-
-  --
-  Igor Pavlov

osx/par2/LICENSE

@@ -1,10 +0,0 @@
-par2SL version 1.0, Copyright (C) 2003 Peter Brian Clements.
-Adapted for use with MacPar deLuxe by Gerard Putter.
-
-This program is compatible with Mac OS X Snow Leopard or later.
-It uses Grand Central Dispatch to optimize the speed and processor load.
-
-This is free software, and you are welcome to redistribute it and/or modify
-it under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your
-option) any later version. See COPYING for details.

osx/par2/arm64/LICENSE.txt

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

osx/par2/arm64/README.md

@@ -1,28 +0,0 @@
-# Creating `par2` for M1 systems
-
-Compiled on an M1 system using these steps.
-
-If you do not use llvm and `clang++` it will not include multithreading support.
-
-However, I was unable to statically link the `libomp` library inside the `par2` executable.
-I extracted it from the llvm libs folder and modified `par2` to look for the `libomp.dylib` in the same folder using `install_name_tool`.
-
-Ref: https://stackoverflow.com/questions/4677044/how-to-use-dylib-in-mac-os-x-c
-
-```shell
-brew install automake
-brew install llvm
-echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"' >> ~/.zshrc
-
-# Restart terminal and clone/download par2cmdline sources
-
-./automake.sh
-CPPFLAGS="-I/opt/homebrew/opt/llvm/include" LDFLAGS="-L/opt/homebrew/opt/llvm/lib" CXX="clang++" ./configure
-make clean
-make
-make check
-
-# Do magic to copy and modify the OpenMP library
-cp /opt/homebrew/opt/llvm/lib/libomp.dylib .
-install_name_tool -change /opt/homebrew/opt/llvm/lib/libomp.dylib @executable_path/libomp.dylib ./par2
-```

po/email/SABemail.pot

@@ -1,11 +1,10 @@
 #
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2025 by The SABnzbd-Team (sabnzbd.org)
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.8.0-develop\n"
+"Project-Id-Version: SABnzbd-4.6.0\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"
@@ -17,7 +16,7 @@ msgid ""
 "##\n"
 "## Default Email template for SABnzbd\n"
 "## This a Cheetah template\n"
-"## Documentation: http://sabnzbd.wikidot.com/email-templates\n"
+"## Documentation: https://sabnzbd.org/wiki/extra/email-templates\n"
 "##\n"
 "## Newlines and whitespace are significant!\n"
 "##\n"
@@ -62,7 +61,7 @@ msgid ""
 "##\n"
 "## RSS Email template for SABnzbd\n"
 "## This a Cheetah template\n"
-"## Documentation: http://sabnzbd.wikidot.com/email-templates\n"
+"## Documentation: https://sabnzbd.org/wiki/extra/email-templates\n"
 "##\n"
 "## Newlines and whitespace are significant!\n"
 "##\n"
@@ -91,7 +90,7 @@ msgid ""
 "##\n"
 "## Bad URL Fetch Email template for SABnzbd\n"
 "## This a Cheetah template\n"
-"## Documentation: http://sabnzbd.wikidot.com/email-templates\n"
+"## Documentation: https://sabnzbd.org/wiki/extra/email-templates\n"
 "##\n"
 "## Newlines and whitespace are significant!\n"
 "##\n"

po/email/cs.po

@@ -1,12 +1,11 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2025 by The SABnzbd-Team (sabnzbd.org)
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.8.0-develop\n"
+"Project-Id-Version: SABnzbd-4.6.0\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
-"Language-Team: Czech (https://www.transifex.com/sabnzbd/teams/111101/cs/)\n"
+"Language-Team: Czech (https://app.transifex.com/sabnzbd/teams/111101/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +17,7 @@ msgid ""
 "##\n"
 "## Default Email template for SABnzbd\n"
 "## This a Cheetah template\n"
-"## Documentation: http://sabnzbd.wikidot.com/email-templates\n"
+"## Documentation: https://sabnzbd.org/wiki/extra/email-templates\n"
 "##\n"
 "## Newlines and whitespace are significant!\n"
 "##\n"
@@ -63,7 +62,7 @@ msgid ""
 "##\n"
 "## RSS Email template for SABnzbd\n"
 "## This a Cheetah template\n"
-"## Documentation: http://sabnzbd.wikidot.com/email-templates\n"
+"## Documentation: https://sabnzbd.org/wiki/extra/email-templates\n"
 "##\n"
 "## Newlines and whitespace are significant!\n"
 "##\n"
@@ -92,7 +91,7 @@ msgid ""
 "##\n"
 "## Bad URL Fetch Email template for SABnzbd\n"
 "## This a Cheetah template\n"
-"## Documentation: http://sabnzbd.wikidot.com/email-templates\n"
+"## Documentation: https://sabnzbd.org/wiki/extra/email-templates\n"
 "##\n"
 "## Newlines and whitespace are significant!\n"
 "##\n"