Fixed: Improve RarBG Error Handling

(cherry picked from commit 7cd38bba841659a595fe4a0e14c478fc4e4047b1)

.devcontainer/Readarr.code-workspace

@@ -1,13 +0,0 @@
-// This file is used to open the backend and frontend in the same workspace, which is necessary as
-// the frontend has vscode settings that are distinct from the backend
-{
-  "folders": [
-    {
-      "path": ".."
-    },
-    {
-      "path": "../frontend"
-    }
-  ],
-  "settings": {}
-}

.devcontainer/devcontainer.json

@@ -1,19 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet
-{
-  "name": "Readarr",
-  "image": "mcr.microsoft.com/devcontainers/dotnet:1-6.0",
-  "features": {
-    "ghcr.io/devcontainers/features/node:1": {
-      "nodeGypDependencies": true,
-      "version": "16",
-      "nvmVersion": "latest"
-    }
-  },
-  "forwardPorts": [8787],
-  "customizations": {
-    "vscode": {
-      "extensions": ["esbenp.prettier-vscode"]
-    }
-  }
-}

.editorconfig

@@ -36,18 +36,9 @@ dotnet_naming_style.instance_field_style.capitalization = camel_case
 dotnet_naming_style.instance_field_style.required_prefix = _
 
 # Prefer "var" everywhere
-csharp_style_var_for_built_in_types = true
+csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true
+csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true
+csharp_style_var_elsewhere = true:suggestion
-# Prefer "out" variables to be declared inline
-csharp_style_inlined_variable_declaration = true
-
-# Using directive is unnecessary.
-dotnet_diagnostic.IDE0005.severity = error
-# Use var instead of explicit type
-dotnet_diagnostic.IDE0007.severity = error
-# Inline variable declaration
-dotnet_diagnostic.IDE0018.severity = error
 
 # Stylecop Rules
 dotnet_diagnostic.SA0001.severity = none
@@ -275,7 +266,7 @@ dotnet_diagnostic.CA5397.severity = suggestion
 
 
 
-[*.{js,html,hbs,less,css,ts,tsx}]
+[*.{js,html,js,hbs,less,css}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true

.esprintrc

@@ -0,0 +1,9 @@
+{
+  "paths": [
+    "frontend/src/**/*.js"
+  ],
+  "ignored": [
+    "**/node_modules/**/*"
+  ],
+  "port": 5004
+}

.gitattributes

@@ -3,7 +3,8 @@
 
 # Explicitly set bash scripts to have unix endings
 *.sh text eol=lf
-distribution/osx/Readarr text eol=lf
+distribution/debian/* text eol=lf
+macOS/Readarr text eol=lf
 
 # Custom for Visual Studio
 *.cs     diff=csharp

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,5 @@
 name: Bug Report
-description: 'Report a new bug, if you are not 100% certain this is a bug please go to our Discord first'
+description: 'Report a new bug, if you are not 100% certain this is a bug please go to our Reddit or Discord first'
 labels: ['Type: Bug', 'Status: Needs Triage']
 body:
 - type: checkboxes
@@ -73,10 +73,3 @@ body:
       Additionally, any additional info? Screenshots? References? Anything that will give us more context about the issue you are encountering!
   validations:
     required: true
-- type: checkboxes
-  attributes:
-    label: Trace Logs have been provided as applicable. Reports may be closed if the required logs are not provided.
-    description: Trace logs are generally required for all bug reports and contain `trace`. Info logs are invalid for bug reports and do not contain `debug` nor `trace`
-    options:
-    - label: I have read and followed the steps in the wiki link above and provided the required trace logs - the logs contain `trace` - that are relevant and show this issue.
-      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -3,3 +3,6 @@ contact_links:
   - name: Support via Discord
     url: https://readarr.com/discord
     about: Chat with users and devs on support and setup related topics.
+  - name: Support via Reddit
+    url: https://reddit.com/r/Readarr
+    about: Discuss and search thru support topics.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -5,9 +5,9 @@ body:
 - type: checkboxes
   attributes:
     label: Is there an existing issue for this?
-    description: Please search to see if an open or closed issue already exists for the feature you are requesting. If a request exists and is closed note that it may only be fixed in an unstable branch.
+    description: Please search to see if an issue already exists for the feature you are requesting.
     options:
-    - label: I have searched the existing open and closed issues
+    - label: I have searched the existing issues
       required: true
 - type: textarea
   attributes:

.github/dependabot.yml

@@ -1,12 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for more information:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-# https://containers.dev/guide/dependabot
-
-version: 2
-updates:
- - package-ecosystem: "devcontainers"
-   directory: "/"
-   schedule:
-     interval: weekly

.github/label-actions.yml

@@ -1,16 +0,0 @@
-# Configuration for Label Actions - https://github.com/dessant/label-actions
-
-'Type: Support':
-  comment: >
-    :wave: @{issue-author}, we use the issue tracker exclusively
-    for bug reports and feature requests. However, this issue appears
-    to be a support request. Please hop over onto our [Discord](https://readarr.com/discord).
-  close: true
-  close-reason: 'not planned'
-
-'Status: Logs Needed':
-  comment: >
-    :wave: @{issue-author}, In order to help you further we'll need to see logs. 
-    You'll need to enable trace logging and replicate the problem that you encountered. 
-    Guidance on how to enable trace logging can be found in 
-    our [troubleshooting guide](https://wiki.servarr.com/readarr/troubleshooting#logging-and-log-files).

.github/labeler.yml

@@ -1,28 +0,0 @@
-'Area: API':
-  - src/Readarr.Api.V1/**/*
-
-'Area: Db-migration':
-  - src/NzbDrone.Core/Datastore/Migration/*
-
-'Area: Download Clients':
-  - src/NzbDrone.Core/Download/Clients/**/*
-
-'Area: Import Lists':
-  - src/NzbDrone.Core/ImportLists/**/*
-
-'Area: Indexer':
-  - src/NzbDrone.Core/Indexers/**/*
-
-'Area: Notifications':
-  - src/NzbDrone.Core/Notifications/**/*
-
-'Area: Organizer':
-  - src/NzbDrone.Core/Organizer/**/*
-
-'Area: Parser':
-  - src/NzbDrone.Core/Parser/**/*
-
-'Area: UI':
-  - frontend/**/*
-  - package.json
-  - yarn.lock

.github/workflows/azuresync.yml

@@ -0,0 +1,41 @@
+name: Sync issue to Azure DevOps work item
+
+on:
+  issues:
+    types:
+      [opened, edited, deleted, closed, reopened, labeled, unlabeled, assigned]
+
+concurrency: azuresync-${{ github.event.issue.number }}
+
+jobs:
+  alert:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: danhellem/github-actions-issue-to-work-item@master
+        if: "${{ contains(github.event.issue.labels.*.name, 'Type: Bug') == true }}"
+        env:
+          ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
+          github_token: "${{ github.token }}"
+          ado_organization: "Servarr"
+          ado_project: "Servarr"
+          ado_area_path: "Servarr\\Readarr"
+          ado_wit: "Bug"
+          ado_new_state: "New"
+          ado_active_state: "Active"
+          ado_close_state: "Closed"
+          ado_bypassrules: true
+          log_level: 100
+      - uses: danhellem/github-actions-issue-to-work-item@master
+        if: "${{ contains(github.event.issue.labels.*.name, 'Type: Bug') == false }}"
+        env:
+          ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
+          github_token: "${{ github.token }}"
+          ado_organization: "Servarr"
+          ado_project: "Servarr"
+          ado_area_path: "Servarr\\Readarr"
+          ado_wit: "User Story"
+          ado_new_state: "New"
+          ado_active_state: "Active"
+          ado_close_state: "Closed"
+          ado_bypassrules: true
+          log_level: 100

.github/workflows/label-actions.yml

@@ -1,17 +0,0 @@
-name: 'Label Actions'
-
-on:
-  issues:
-    types: [labeled, unlabeled]
-
-permissions:
-  contents: read
-  issues: write
-
-jobs:
-  action:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/label-actions@v3
-        with:
-          process-only: 'issues'

.github/workflows/labeler.yml

@@ -1,12 +0,0 @@
-name: "Pull Request Labeler"
-on:
-  - pull_request_target
-
-jobs:
-  triage:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/labeler@v4

.github/workflows/lock.yml

@@ -9,13 +9,13 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@v2
         with:
           github-token: ${{ github.token }}
-          issue-inactive-days: '90'
+          issue-lock-inactive-days: '90'
-          exclude-issue-created-before: ''
+          issue-exclude-created-before: ''
-          exclude-any-issue-labels: ''
+          issue-exclude-labels: ''
-          add-issue-labels: ''
+          issue-lock-labels: ''
-          issue-comment: ''
+          issue-lock-comment: ''
           issue-lock-reason: 'resolved'
           process-only: ''

.github/workflows/support.yml

@@ -0,0 +1,21 @@
+name: 'Support requests'
+
+on:
+  issues:
+    types: [labeled, unlabeled, reopened]
+
+jobs:
+  support:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/support-requests@v2
+        with:
+          github-token: ${{ github.token }}
+          support-label: 'Type: Support'
+          issue-comment: >
+            :wave: @{issue-author}, we use the issue tracker exclusively
+            for bug reports and feature requests. However, this issue appears
+            to be a support request. Please hop over onto our [Discord](https://readarr.com/discord) 
+            or [Subreddit](https://reddit.com/r/readarr)
+          close-issue: true
+          lock-issue: false

.gitignore

@@ -120,13 +120,11 @@ _artifacts
 _rawPackage/
 _dotTrace*
 _tests/
-_temp*
 *.Result.xml
 coverage*.xml
 coverage*.json
 setup/Output/
 *.~is
-.mono
 
 # .NET Core
 project.lock.json
@@ -150,6 +148,3 @@ _temp_*/**/*
 ## Merge any idea folder
 */**/.idea
 *.iml
-
-# API doc generation
-.config/

.vscode/extensions.json

@@ -1,7 +0,0 @@
-{
-  "recommendations": [
-    "esbenp.prettier-vscode",
-    "ms-dotnettools.csdevkit",
-    "ms-vscode-remote.remote-containers"
-  ]
-}

.vscode/launch.json

@@ -1,26 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      // Use IntelliSense to find out which attributes exist for C# debugging
-      // Use hover for the description of the existing attributes
-      // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md
-      "name": "Run Readarr",
-      "type": "coreclr",
-      "request": "launch",
-      "preLaunchTask": "build dotnet",
-      // If you have changed target frameworks, make sure to update the program path.
-      "program": "${workspaceFolder}/_output/net6.0/Readarr",
-      "args": [],
-      "cwd": "${workspaceFolder}",
-      // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
-      "console": "integratedTerminal",
-      "stopAtEntry": false
-    },
-    {
-      "name": ".NET Core Attach",
-      "type": "coreclr",
-      "request": "attach"
-    }
-  ]
-}

.vscode/tasks.json

@@ -1,44 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "build dotnet",
-      "command": "dotnet",
-      "type": "process",
-      "args": [
-        "msbuild",
-        "-restore",
-        "${workspaceFolder}/src/Readarr.sln",
-        "-p:GenerateFullPaths=true",
-        "-p:Configuration=Debug",
-        "-p:Platform=Posix",
-        "-consoleloggerparameters:NoSummary;ForceNoAlign"
-      ],
-      "problemMatcher": "$msCompile"
-    },
-    {
-      "label": "publish",
-      "command": "dotnet",
-      "type": "process",
-      "args": [
-        "publish",
-        "${workspaceFolder}/src/Readarr.sln",
-        "-property:GenerateFullPaths=true",
-        "-consoleloggerparameters:NoSummary;ForceNoAlign"
-      ],
-      "problemMatcher": "$msCompile"
-    },
-    {
-      "label": "watch",
-      "command": "dotnet",
-      "type": "process",
-      "args": [
-        "watch",
-        "run",
-        "--project",
-        "${workspaceFolder}/src/Readarr.sln"
-      ],
-      "problemMatcher": "$msCompile"
-    }
-  ]
-}

CODE_OF_CONDUCT.md

@@ -1,132 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-  community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-<development@readarr.com>.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations

README.md

@@ -30,6 +30,7 @@ Note that only one type of a given book is supported. If you want both an audiob
 
 [![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/readarr)
 [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://readarr.com/discord)
+[![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60)](https://www.reddit.com/r/readarr)
 
 Note: GitHub Issues are for Bugs and Feature Requests Only
 
@@ -61,15 +62,6 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 
 [![Mega Sponsors List](https://opencollective.com/Readarr/tiers/mega-sponsor.svg?width=890)](https://opencollective.com/readarr#mega-sponsor)
 
-## DigitalOcean
-
-This project is also supported by DigitalOcean
-<p>
-  <a href="https://www.digitalocean.com/">
-    <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" width="201px">
-  </a>
-</p>
-
 ### License
 
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)

SECURITY.md

@@ -1,8 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Please report (suspected) security vulnerabilities on Discord (preferred) to
-any of the Servarr Dev role holders (red names) or via email: development@servarr.com. You will receive a response from
-us within 72 hours. If the issue is confirmed, we will release a patch as soon
-as possible depending on complexity/severity.

azure-pipelines.yml

@@ -9,28 +9,23 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '0.4.6'
+  majorVersion: '0.1.1'
   minorVersion: $[counter('minorVersion', 1)]
   readarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(readarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.427'
+  dotnetVersion: '6.0.302'
-  nodeVersion: '20.X'
   innoVersion: '6.2.0'
   windowsImage: 'windows-2022'
   linuxImage: 'ubuntu-20.04'
-  macImage: 'macOS-13'
+  macImage: 'macOS-11'
 
 trigger:
   branches:
     include:
     - develop
     - master
-  paths:
-    exclude:
-      - .github
-      - src/Readarr.Api.*/openapi.json
 
 pr:
   branches:
@@ -38,37 +33,82 @@ pr:
     - develop
   paths:
     exclude:
-    - .github
     - src/NzbDrone.Core/Localization/Core
-    - src/Readarr.Api.*/openapi.json
 
 stages:
-  - stage: Setup
+
-    displayName: Setup
+  - stage: Build_Backend_Windows
+    displayName: Build Backend
+    dependsOn: []
     jobs:
-    - job:
+    - job: Backend
-      displayName: Build Variables
+      strategy:
+        matrix:
+          Windows:
+            osName: 'Windows'
+            imageName: ${{ variables.windowsImage }}
+            enableAnalysis: 'false'
+
       pool:
-        vmImage: ${{ variables.linuxImage }}
+        vmImage: $(imageName)
+      variables:
+        # Disable stylecop here - linting errors get caught by the analyze task
+        EnableAnalyzers: $(enableAnalysis)
       steps:
       # Set the build name properly.  The 'name' property won't recursively expand so hack here:
       - bash: echo "##vso[build.updatebuildnumber]$READARRVERSION"
         displayName: Set Build Name
+      - checkout: self
+        submodules: true
+        fetchDepth: 1
+      - task: UseDotNet@2
+        displayName: 'Install .net core'
+        inputs:
+          version: $(dotnetVersion)
       - bash: |
-          if [[ $BUILD_REASON == "PullRequest" ]]; then
+          SDK_PATH="${AGENT_TOOLSDIRECTORY}/dotnet/sdk/${DOTNETVERSION}"
-          git diff origin/develop...HEAD  --name-only | grep -E "^(src/|azure-pipelines.yml)"
+          BUNDLEDVERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
-          echo $? > not_backend_update
+          
-          else
+          if ! grep -q freebsd-x64 $BUNDLEDVERSIONS; then
-          echo 0 > not_backend_update
+            sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
           fi
-          cat not_backend_update
+        displayName: Extra Platform Support
-        displayName: Check for Backend File Changes
+      - task: Cache@2
-      - publish: not_backend_update
+        inputs:
-        artifact: not_backend_update
+          key: 'nuget | "$(Agent.OS)" | $(Build.SourcesDirectory)/src/Directory.Packages.props'
-        displayName: Publish update type
+          path: $(nugetCacheFolder)
-  - stage: Build_Backend
+        displayName: Cache NuGet packages
-    displayName: Build Backend
+      - bash: ./build.sh --backend --enable-bsd
-    dependsOn: Setup
+        displayName: Build Readarr Backend
+        env:
+          NUGET_PACKAGES: $(nugetCacheFolder)
+      - powershell: Get-ChildItem _output\net6.0*,_output\*.Update\* -Recurse | Where { $_.Fullname -notlike "*\publish\*" -and $_.attributes -notlike "*directory*" } | Remove-Item
+        displayName: Clean up intermediate output
+      - publish: $(outputFolder)
+        artifact: '$(osName)Backend'
+        displayName: Publish Backend
+      - publish: '$(testsFolder)/net6.0/win-x64/publish'
+        artifact: win-x64-tests
+        displayName: Publish win-x64 Test Package
+      - publish: '$(testsFolder)/net6.0/linux-x64/publish'
+        artifact: linux-x64-tests
+        displayName: Publish linux-x64 Test Package
+      - publish: '$(testsFolder)/net6.0/linux-x86/publish'
+        artifact: linux-x86-tests
+        displayName: Publish linux-x86 Test Package
+      - publish: '$(testsFolder)/net6.0/linux-musl-x64/publish'
+        artifact: linux-musl-x64-tests
+        displayName: Publish linux-musl-x64 Test Package
+      - publish: '$(testsFolder)/net6.0/freebsd-x64/publish'
+        artifact: freebsd-x64-tests
+        displayName: Publish freebsd-x64 Test Package
+      - publish: '$(testsFolder)/net6.0/osx-x64/publish'
+        artifact: osx-x64-tests
+        displayName: Publish osx-x64 Test Package
+
+  - stage: Build_Backend_Other
+    displayName: Build Backend (Other OS)
+    dependsOn: []
     jobs:
     - job: Backend
       strategy:
@@ -81,10 +121,6 @@ stages:
             osName: 'Mac'
             imageName: ${{ variables.macImage }}
             enableAnalysis: 'false'
-          Windows:
-            osName: 'Windows'
-            imageName: ${{ variables.windowsImage }}
-            enableAnalysis: 'false'
 
       pool:
         vmImage: $(imageName)
@@ -100,17 +136,22 @@ stages:
         inputs:
           version: $(dotnetVersion)
       - bash: |
-          BUNDLEDVERSIONS=${AGENT_TOOLSDIRECTORY}/dotnet/sdk/${DOTNETVERSION}/Microsoft.NETCoreSdk.BundledVersions.props
+          SDK_PATH="${AGENT_TOOLSDIRECTORY}/dotnet/sdk/${DOTNETVERSION}"
-          echo $BUNDLEDVERSIONS
+          BUNDLEDVERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
-          if grep -q freebsd-x64 $BUNDLEDVERSIONS; then
+          
-            echo "Extra platforms already enabled"
+          if ! grep -q freebsd-x64 $BUNDLEDVERSIONS; then
-          else
-            echo "Enabling extra platform support"
             sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
           fi
-        displayName: Enable Extra Platform Support
+        displayName: Extra Platform Support
+      - task: Cache@2
+        inputs:
+          key: 'nuget | "$(Agent.OS)" | $(Build.SourcesDirectory)/src/Directory.Packages.props'
+          path: $(nugetCacheFolder)
+        displayName: Cache NuGet packages
       - bash: ./build.sh --backend --enable-extra-platforms
         displayName: Build Readarr Backend
+        env:
+          NUGET_PACKAGES: $(nugetCacheFolder)
       - bash: |
           find ${OUTPUTFOLDER} -type f ! -path "*/publish/*" -exec rm -rf {} \;
           find ${OUTPUTFOLDER} -depth -empty -type d -exec rm -r "{}" \;
@@ -118,38 +159,10 @@ stages:
           find ${TESTSFOLDER} -depth -empty -type d -exec rm -r "{}" \;
         displayName: Clean up intermediate output
         condition: and(succeeded(), ne(variables['osName'], 'Windows'))
-      - publish: $(outputFolder)
-        artifact: '$(osName)Backend'
-        displayName: Publish Backend
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/win-x64/publish'
-        artifact: win-x64-tests
-        displayName: Publish win-x64 Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/linux-x64/publish'
-        artifact: linux-x64-tests
-        displayName: Publish linux-x64 Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/linux-x86/publish'
-        artifact: linux-x86-tests
-        displayName: Publish linux-x86 Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/linux-musl-x64/publish'
-        artifact: linux-musl-x64-tests
-        displayName: Publish linux-musl-x64 Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/freebsd-x64/publish'
-        artifact: freebsd-x64-tests
-        displayName: Publish freebsd-x64 Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/osx-x64/publish'
-        artifact: osx-x64-tests
-        displayName: Publish osx-x64 Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
 
   - stage: Build_Frontend
     displayName: Frontend
-    dependsOn: Setup
+    dependsOn: []
     jobs:
     - job: Build
       strategy:
@@ -166,10 +179,10 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - task: UseNode@1
+      - task: NodeTool@0
         displayName: Set Node.js version
         inputs:
-          version: $(nodeVersion)
+          versionSpec: '12.x'
       - checkout: self
         submodules: true
         fetchDepth: 1
@@ -178,6 +191,7 @@ stages:
           key: 'yarn | "$(osName)" | yarn.lock'
           restoreKeys: |
              yarn | "$(osName)"
+             yarn
           path: $(yarnCacheFolder)
         displayName: Cache Yarn packages
       - bash: ./build.sh --frontend
@@ -189,10 +203,10 @@ stages:
         artifact: '$(osName)Frontend'
         displayName: Publish Frontend
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-
+        
   - stage: Installer
     dependsOn:
-    - Build_Backend
+    - Build_Backend_Windows
     - Build_Frontend
     jobs:
     - job: Windows_Installer
@@ -216,8 +230,8 @@ stages:
         displayName: Fetch Frontend
       - bash: |
           ./build.sh --packages --installer
-          cp distribution/windows/setup/output/Readarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x64-installer.exe
+          cp setup/output/Readarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x64-installer.exe
-          cp distribution/windows/setup/output/Readarr.*win-x86.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x86-installer.exe
+          cp setup/output/Readarr.*win-x86.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x86-installer.exe
         displayName: Create Installers
       - publish: $(Build.ArtifactStagingDirectory)
         artifact: 'WindowsInstaller'
@@ -225,7 +239,7 @@ stages:
 
   - stage: Packages
     dependsOn:
-    - Build_Backend
+    - Build_Backend_Windows
     - Build_Frontend
     jobs:
     - job: Other_Packages
@@ -367,7 +381,7 @@ stages:
       - bash: |
           echo "Uploading source maps to sentry"
           curl -sL https://sentry.io/get-cli/ | bash
-          RELEASENAME="Readarr@${READARRVERSION}-${BUILD_SOURCEBRANCHNAME}"
+          RELEASENAME="${READARRVERSION}-${BUILD_SOURCEBRANCHNAME}"
           sentry-cli releases new --finalize -p readarr -p readarr-ui -p readarr-update "${RELEASENAME}"
           sentry-cli releases -p readarr-ui files "${RELEASENAME}" upload-sourcemaps _output/UI/ --rewrite
           sentry-cli releases set-commits --auto "${RELEASENAME}"
@@ -391,29 +405,14 @@ stages:
           SENTRY_AUTH_TOKEN: $(sentryAuthTokenServarr)
           SENTRY_ORG: $(sentryOrg)
           SENTRY_URL: $(sentryUrl)
-
+    
   - stage: Unit_Test
     displayName: Unit Tests
-    dependsOn: Build_Backend
+    dependsOn: Build_Backend_Windows
-
+    condition: succeeded()
     jobs:
-    - job: Prepare
-      pool:
-        vmImage: ${{ variables.linuxImage }}
-      steps:
-      - checkout: none
-      - task: DownloadPipelineArtifact@2
-        inputs:
-          buildType: 'current'
-          artifactName: 'not_backend_update'
-          targetPath: '.'
-      - bash: echo "##vso[task.setvariable variable=backendNotUpdated;isOutput=true]$(cat not_backend_update)"
-        name: setVar
-
     - job: Unit
       displayName: Unit Native
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       workspace:
         clean: all
 
@@ -479,8 +478,6 @@ stages:
 
     - job: Unit_Docker
       displayName: Unit Docker
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       strategy:
         matrix:
           alpine:
@@ -494,11 +491,11 @@ stages:
 
       pool:
         vmImage: ${{ variables.linuxImage }}
-
+      
       container: $[ variables['containerImage'] ]
 
       timeoutInMinutes: 10
-
+        
       steps:
       - task: UseDotNet@2
         displayName: 'Install .NET'
@@ -532,14 +529,12 @@ stages:
           testResultsFiles: '**/TestResult.xml'
           testRunTitle: '$(testName) Unit Tests'
           failTaskOnFailedTests: true
-
+          
-    - job: Unit_LinuxCore_Postgres14
+    - job: Unit_LinuxCore_Postgres
-      displayName: Unit Native LinuxCore with Postgres14 Database
+      displayName: Unit Native LinuxCore with Postgres Database
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       variables:
         pattern: 'Readarr.*.linux-core-x64.tar.gz'
-        artifactName: linux-x64-tests
+        artifactName: LinuxCoreTests
         Readarr__Postgres__Host: 'localhost'
         Readarr__Postgres__Port: '5432'
         Readarr__Postgres__User: 'readarr'
@@ -549,7 +544,7 @@ stages:
         vmImage: ${{ variables.linuxImage }}
 
       timeoutInMinutes: 10
-
+        
       steps:
       - task: UseDotNet@2
         displayName: 'Install .net core'
@@ -560,7 +555,7 @@ stages:
         displayName: Download Test Artifact
         inputs:
           buildType: 'current'
-          artifactName: $(artifactName)
+          artifactName: 'linux-x64-Tests'
           targetPath: $(testsFolder)
       - bash: find ${TESTSFOLDER} -name "Readarr.Test.Dummy" -exec chmod a+x {} \;
         displayName: Make Test Dummy Executable
@@ -583,84 +578,15 @@ stages:
         inputs:
           testResultsFormat: 'NUnit'
           testResultsFiles: '**/TestResult.xml'
-          testRunTitle: 'LinuxCore Postgres14 Unit Tests'
+          testRunTitle: 'LinuxCore Postgres Unit Tests'
-          failTaskOnFailedTests: true
-
-    - job: Unit_LinuxCore_Postgres15
-      displayName: Unit Native LinuxCore with Postgres15 Database
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-      variables:
-        pattern: 'Readarr.*.linux-core-x64.tar.gz'
-        artifactName: linux-x64-tests
-        Readarr__Postgres__Host: 'localhost'
-        Readarr__Postgres__Port: '5432'
-        Readarr__Postgres__User: 'readarr'
-        Readarr__Postgres__Password: 'readarr'
-
-      pool:
-        vmImage: ${{ variables.linuxImage }}
-
-      timeoutInMinutes: 10
-
-      steps:
-      - task: UseDotNet@2
-        displayName: 'Install .net core'
-        inputs:
-          version: $(dotnetVersion)
-      - checkout: none
-      - task: DownloadPipelineArtifact@2
-        displayName: Download Test Artifact
-        inputs:
-          buildType: 'current'
-          artifactName: $(artifactName)
-          targetPath: $(testsFolder)
-      - bash: find ${TESTSFOLDER} -name "Readarr.Test.Dummy" -exec chmod a+x {} \;
-        displayName: Make Test Dummy Executable
-        condition: and(succeeded(), ne(variables['osName'], 'Windows'))
-      - bash: |
-          docker run -d --name=postgres15 \
-          -e POSTGRES_PASSWORD=readarr \
-          -e POSTGRES_USER=readarr \
-          -p 5432:5432/tcp \
-          -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
-          postgres:15
-        displayName: Start postgres
-      - bash: |
-          chmod a+x ${TESTSFOLDER}/test.sh
-          ls -lR ${TESTSFOLDER}
-          ${TESTSFOLDER}/test.sh Linux Unit Test
-        displayName: Run Tests
-      - task: PublishTestResults@2
-        displayName: Publish Test Results
-        inputs:
-          testResultsFormat: 'NUnit'
-          testResultsFiles: '**/TestResult.xml'
-          testRunTitle: 'LinuxCore Postgres15 Unit Tests'
           failTaskOnFailedTests: true
 
   - stage: Integration
     displayName: Integration
     dependsOn: Packages
-
     jobs:
-    - job: Prepare
-      pool:
-        vmImage: ${{ variables.linuxImage }}
-      steps:
-      - checkout: none
-      - task: DownloadPipelineArtifact@2
-        inputs:
-          buildType: 'current'
-          artifactName: 'not_backend_update'
-          targetPath: '.'
-      - bash: echo "##vso[task.setvariable variable=backendNotUpdated;isOutput=true]$(cat not_backend_update)"
-        name: setVar
-
     - job: Integration_Native
       displayName: Integration Native
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       strategy:
         matrix:
           MacCore:
@@ -681,7 +607,7 @@ stages:
 
       pool:
         vmImage: $(imageName)
-
+        
       steps:
       - task: UseDotNet@2
         displayName: 'Install .net core'
@@ -703,7 +629,7 @@ stages:
           targetPath: $(Build.ArtifactStagingDirectory)
       - task: ExtractFiles@1
         inputs:
-          archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)'
+          archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)' 
           destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
         displayName: Extract Package
       - bash: |
@@ -722,10 +648,8 @@ stages:
           failTaskOnFailedTests: true
         displayName: Publish Test Results
 
-    - job: Integration_LinuxCore_Postgres14
+    - job: Integration_LinuxCore_Postgres
-      displayName: Integration Native LinuxCore with Postgres14 Database
+      displayName: Integration Native LinuxCore with Postgres Database
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       variables:
         pattern: 'Readarr.*.linux-core-x64.tar.gz'
         Readarr__Postgres__Host: 'localhost'
@@ -757,7 +681,7 @@ stages:
             targetPath: $(Build.ArtifactStagingDirectory)
         - task: ExtractFiles@1
           inputs:
-            archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)'
+            archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)' 
             destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
           displayName: Extract Package
         - bash: |
@@ -780,77 +704,12 @@ stages:
           inputs:
             testResultsFormat: 'NUnit'
             testResultsFiles: '**/TestResult.xml'
-            testRunTitle: 'Integration LinuxCore Postgres14 Database Integration Tests'
+            testRunTitle: 'Integration LinuxCore Postgres Database Integration Tests'
-            failTaskOnFailedTests: true
-          displayName: Publish Test Results
-
-
-    - job: Integration_LinuxCore_Postgres15
-      displayName: Integration Native LinuxCore with Postgres Database
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-      variables:
-        pattern: 'Readarr.*.linux-core-x64.tar.gz'
-        Readarr__Postgres__Host: 'localhost'
-        Readarr__Postgres__Port: '5432'
-        Readarr__Postgres__User: 'readarr'
-        Readarr__Postgres__Password: 'readarr'
-
-      pool:
-        vmImage: ${{ variables.linuxImage }}
-
-      steps:
-        - task: UseDotNet@2
-          displayName: 'Install .net core'
-          inputs:
-            version: $(dotnetVersion)
-        - checkout: none
-        - task: DownloadPipelineArtifact@2
-          displayName: Download Test Artifact
-          inputs:
-            buildType: 'current'
-            artifactName: 'linux-x64-tests'
-            targetPath: $(testsFolder)
-        - task: DownloadPipelineArtifact@2
-          displayName: Download Build Artifact
-          inputs:
-            buildType: 'current'
-            artifactName: Packages
-            itemPattern: '**/$(pattern)'
-            targetPath: $(Build.ArtifactStagingDirectory)
-        - task: ExtractFiles@1
-          inputs:
-            archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)'
-            destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
-          displayName: Extract Package
-        - bash: |
-            mkdir -p ./bin/
-            cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Readarr/. ./bin/
-          displayName: Move Package Contents
-        - bash: |
-            docker run -d --name=postgres15 \
-            -e POSTGRES_PASSWORD=readarr \
-            -e POSTGRES_USER=readarr \
-            -p 5432:5432/tcp \
-            -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
-            postgres:15
-          displayName: Start postgres
-        - bash: |
-            chmod a+x ${TESTSFOLDER}/test.sh
-            ${TESTSFOLDER}/test.sh Linux Integration Test
-          displayName: Run Integration Tests
-        - task: PublishTestResults@2
-          inputs:
-            testResultsFormat: 'NUnit'
-            testResultsFiles: '**/TestResult.xml'
-            testRunTitle: 'Integration LinuxCore Postgres15 Database Integration Tests'
             failTaskOnFailedTests: true
           displayName: Publish Test Results
 
     - job: Integration_FreeBSD
       displayName: Integration Native FreeBSD
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       workspace:
         clean: all
       variables:
@@ -871,7 +730,7 @@ stages:
         inputs:
           buildType: 'current'
           artifactName: Packages
-          itemPattern: '**/$(pattern)'
+          itemPattern: '/$(pattern)'
           targetPath: $(Build.ArtifactStagingDirectory)
       - bash: |
           mkdir -p ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin
@@ -895,8 +754,6 @@ stages:
 
     - job: Integration_Docker
       displayName: Integration Docker
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       strategy:
         matrix:
           alpine:
@@ -915,7 +772,7 @@ stages:
       container: $[ variables['containerImage'] ]
 
       timeoutInMinutes: 15
-
+        
       steps:
       - task: UseDotNet@2
         displayName: 'Install .NET'
@@ -943,7 +800,7 @@ stages:
           targetPath: $(Build.ArtifactStagingDirectory)
       - task: ExtractFiles@1
         inputs:
-          archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)'
+          archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)' 
           destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
         displayName: Extract Package
       - bash: |
@@ -965,7 +822,7 @@ stages:
   - stage: Automation
     displayName: Automation
     dependsOn: Packages
-
+    
     jobs:
     - job: Automation
       strategy:
@@ -975,23 +832,20 @@ stages:
             artifactName: 'linux-x64'
             imageName: ${{ variables.linuxImage }}
             pattern: 'Readarr.*.linux-core-x64.tar.gz'
-            failBuild: true
           Mac:
             osName: 'Mac'
             artifactName: 'osx-x64'
             imageName: ${{ variables.macImage }}
             pattern: 'Readarr.*.osx-core-x64.tar.gz'
-            failBuild: true
           Windows:
             osName: 'Windows'
             artifactName: 'win-x64'
             imageName: ${{ variables.windowsImage }}
             pattern: 'Readarr.*.windows-core-x64.zip'
-            failBuild: true
 
       pool:
         vmImage: $(imageName)
-
+        
       steps:
       - task: UseDotNet@2
         displayName: 'Install .net core'
@@ -1013,7 +867,7 @@ stages:
           targetPath: $(Build.ArtifactStagingDirectory)
       - task: ExtractFiles@1
         inputs:
-          archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)'
+          archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)' 
           destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
         displayName: Extract Package
       - bash: |
@@ -1033,35 +887,20 @@ stages:
           TargetFolder: '$(Build.ArtifactStagingDirectory)/screenshots'
       - publish: $(Build.ArtifactStagingDirectory)/screenshots
         artifact: '$(osName)AutomationScreenshots'
-        displayName: Publish Screenshot Bundle
         condition: and(succeeded(), eq(variables['System.JobAttempt'], '1'))
+        displayName: Publish Screenshot Bundle
       - task: PublishTestResults@2
         inputs:
           testResultsFormat: 'NUnit'
           testResultsFiles: '**/TestResult.xml'
           testRunTitle: '$(osName) Automation Tests'
-          failTaskOnFailedTests: $(failBuild)
+          failTaskOnFailedTests: true
         displayName: Publish Test Results
 
   - stage: Analyze
-    dependsOn:
+    dependsOn: []
-    - Setup
     displayName: Analyze
-
     jobs:
-    - job: Prepare
-      pool:
-        vmImage: ${{ variables.linuxImage }}
-      steps:
-      - checkout: none
-      - task: DownloadPipelineArtifact@2
-        inputs:
-          buildType: 'current'
-          artifactName: 'not_backend_update'
-          targetPath: '.'
-      - bash: echo "##vso[task.setvariable variable=backendNotUpdated;isOutput=true]$(cat not_backend_update)"
-        name: setVar
-
     - job: Lint_Frontend
       displayName: Lint Frontend
       strategy:
@@ -1075,10 +914,10 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - task: UseNode@1
+      - task: NodeTool@0
         displayName: Set Node.js version
         inputs:
-          version: $(nodeVersion)
+          versionSpec: '12.x'
       - checkout: self
         submodules: true
         fetchDepth: 1
@@ -1087,6 +926,7 @@ stages:
           key: 'yarn | "$(osName)" | yarn.lock'
           restoreKeys: |
              yarn | "$(osName)"
+             yarn
           path: $(yarnCacheFolder)
         displayName: Cache Yarn packages
       - bash: ./build.sh --lint
@@ -1102,7 +942,7 @@ stages:
         vmImage: ${{ variables.windowsImage }}
       steps:
       - checkout: self # Need history for Sonar analysis
-      - task: SonarCloudPrepare@2
+      - task: SonarCloudPrepare@1
         env:
           SONAR_SCANNER_OPTS: ''
         inputs:
@@ -1114,83 +954,38 @@ stages:
           cliProjectName: 'ReadarrUI'
           cliProjectVersion: '$(readarrVersion)'
           cliSources: './frontend'
-      - task: SonarCloudAnalyze@2
+      - task: SonarCloudAnalyze@1
-
-    - job: Api_Docs
-      displayName: API Docs
-      dependsOn: Prepare
-      condition: |
-        and
-        (
-          and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')),
-          and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-        )
-
-      pool:
-        vmImage: ${{ variables.windowsImage }}
-
-      steps:
-      - task: UseDotNet@2
-        displayName: 'Install .net core'
-        inputs:
-          version: $(dotnetVersion)
-      - checkout: self
-        submodules: true
-        persistCredentials: true
-        fetchDepth: 1
-      - bash: ./docs.sh Windows
-        displayName: Create openapi.json
-      - bash: |
-          git config --global user.email "development@lidarr.audio"
-          git config --global user.name "Servarr"
-          git checkout -b api-docs
-          git add .
-          if git status | grep -q modified
-          then
-            git commit -am 'Automated API Docs update'
-            git push -f --set-upstream origin api-docs
-            curl -X POST -H "Authorization: token ${GITHUBTOKEN}" -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/readarr/readarr/pulls -d '{"head":"api-docs","base":"develop","title":"Update API docs"}'
-          else
-            echo "No changes since last run"
-          fi
-        displayName: Commit API Doc Change
-        continueOnError: true
-        env:
-          GITHUBTOKEN: $(githubToken)
-      - task: CopyFiles@2
-        displayName: 'Copy openapi.json to: $(Build.ArtifactStagingDirectory)'
-        inputs:
-          SourceFolder: '$(Build.SourcesDirectory)'
-          Contents: |
-            **/*openapi.json
-          TargetFolder: '$(Build.ArtifactStagingDirectory)/api_docs'
-      - publish: $(Build.ArtifactStagingDirectory)/api_docs
-        artifact: 'APIDocs'
-        displayName: Publish API Docs Bundle
-        condition: and(succeeded(), eq(variables['System.JobAttempt'], '1'))
 
     - job: Analyze_Backend
       displayName: Backend
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
 
       variables:
         disable.coverage.autogenerate: 'true'
-        EnableAnalyzers: 'false'
-
       pool:
-        vmImage: ${{ variables.windowsImage }}
+        vmImage: ${{ variables.linuxImage }}
 
       steps:
       - task: UseDotNet@2
-        displayName: 'Install .net core'
+        displayName: 'Install .net core 2.1'
+        inputs:
+          version: 2.1.815
+      - task: UseDotNet@2
+        displayName: 'Install .net core 3.1'
+        inputs:
+          version: 3.1.413    
+      - task: UseDotNet@2
+        displayName: 'Install .net core 5.0'
         inputs:
           version: $(dotnetVersion)
       - checkout: self # Need history for Sonar analysis
         submodules: true
-      - powershell: Set-Service SCardSvr -StartupType Manual
+      - task: Cache@2
-        displayName: Enable Windows Test Service
+        inputs:
-      - task: SonarCloudPrepare@2
+          key: 'nuget | "$(Agent.OS)" | $(Build.SourcesDirectory)/src/Directory.Packages.props'
+          path: $(nugetCacheFolder)
+        displayName: Cache NuGet packages
+
+      - task: SonarCloudPrepare@1
         condition: eq(variables['System.PullRequest.IsFork'], 'False')
         inputs:
           SonarCloud: 'SonarCloud'
@@ -1200,24 +995,31 @@ stages:
           projectName: 'Readarr'
           projectVersion: '$(readarrVersion)'
           extraProperties: |
-            sonar.exclusions=**/obj/**,**/*.dll,**/NzbDrone.Core.Test/Files/**/*,./frontend/**,**/ExternalModules/**,./src/Libraries/**
+            sonar.exclusions=**/obj/**,**/*.dll,**/NzbDrone.Core.Test/Files/**/*,./frontend/**,./src/Libraries/**
             sonar.coverage.exclusions=**/Readarr.Api.V1/**/*
             sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml
             sonar.cs.nunit.reportsPaths=$(Build.SourcesDirectory)/TestResult.xml
       - bash: |
-          ./build.sh --backend -f net6.0 -r win-x64
+          ./build.sh --backend -f net6.0 -r linux-x64
-          TEST_DIR=_tests/net6.0/win-x64/publish/ ./test.sh Windows Unit Coverage
+          TEST_DIR=_tests/net6.0/linux-x64/publish/ ./test.sh Linux Unit Coverage
         displayName: Coverage Unit Tests
-      - task: SonarCloudAnalyze@2
+        env:
+          NUGET_PACKAGES: $(nugetCacheFolder)
+      - task: SonarCloudAnalyze@1
         condition: eq(variables['System.PullRequest.IsFork'], 'False')
         displayName: Publish SonarCloud Results
-      - task: reportgenerator@5.3.11
+      - task: reportgenerator@4
         displayName: Generate Coverage Report
         inputs:
           reports: '$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml'
           targetdir: '$(Build.SourcesDirectory)/CoverageResults/combined'
           reporttypes: 'HtmlInline_AzurePipelines;Cobertura;Badges'
-          publishCodeCoverageResults: true
+      - task: PublishCodeCoverageResults@1
+        displayName: Publish Coverage Report
+        inputs:
+          codeCoverageTool: 'cobertura'
+          summaryFileLocation: './CoverageResults/combined/Cobertura.xml'
+          reportDirectory: './CoverageResults/combined/'
 
   - stage: Report_Out
     dependsOn:
@@ -1225,6 +1027,7 @@ stages:
     - Unit_Test
     - Integration
     - Automation
+    - Build_Backend_Other
     condition: eq(variables['system.pullrequest.isfork'], false)
     displayName: Build Status Report
     jobs:
@@ -1247,5 +1050,3 @@ stages:
             SYSTEM_ACCESSTOKEN: $(System.AccessToken)
             DISCORDCHANNELID: $(discordChannelId)
             DISCORDWEBHOOKKEY: $(discordWebhookKey)
-            DISCORDTHREADID: $(discordThreadId)
-

build.sh

@@ -23,7 +23,7 @@ UpdateVersionNumber()
         echo "Updating Version Info"
         sed -i'' -e "s/<AssemblyVersion>[0-9.*]\+<\/AssemblyVersion>/<AssemblyVersion>$READARRVERSION<\/AssemblyVersion>/g" src/Directory.Build.props
         sed -i'' -e "s/<AssemblyConfiguration>[\$()A-Za-z-]\+<\/AssemblyConfiguration>/<AssemblyConfiguration>${BUILD_SOURCEBRANCHNAME}<\/AssemblyConfiguration>/g" src/Directory.Build.props
-        sed -i'' -e "s/<string>10.0.0.0<\/string>/<string>$READARRVERSION<\/string>/g" distribution/osx/Readarr.app/Contents/Info.plist
+        sed -i'' -e "s/<string>10.0.0.0<\/string>/<string>$READARRVERSION<\/string>/g" macOS/Readarr.app/Contents/Info.plist
     fi
 }
 
@@ -183,7 +183,7 @@ PackageMacOSApp()
 
     rm -rf $folder
     mkdir -p $folder
-    cp -r distribution/osx/Readarr.app $folder
+    cp -r macOS/Readarr.app $folder
     mkdir -p $folder/Readarr.app/Contents/MacOS
 
     echo "Copying Binaries"
@@ -245,7 +245,7 @@ BuildInstaller()
     local framework="$1"
     local runtime="$2"
     
-    ./_inno/ISCC.exe distribution/windows/setup/readarr.iss "//DFramework=$framework" "//DRuntime=$runtime"
+    ./_inno/ISCC.exe setup/readarr.iss "//DFramework=$framework" "//DRuntime=$runtime"
 }
 
 InstallInno()
@@ -391,21 +391,22 @@ then
     fi
 fi
 
-if [[ "$LINT" = "YES" || "$FRONTEND" = "YES" ]];
+if [ "$FRONTEND" = "YES" ];
 then
     YarnInstall
+    RunWebpack
 fi
 
 if [ "$LINT" = "YES" ];
 then
+    if [ -z "$FRONTEND" ];
+    then
+        YarnInstall
+    fi
+    
     LintUI
 fi
 
-if [ "$FRONTEND" = "YES" ];
-then
-    RunWebpack
-fi
-
 if [ "$PACKAGES" = "YES" ];
 then
     UpdateVersionNumber

docs.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-set -e
-
-FRAMEWORK="net6.0"
-PLATFORM=$1
-
-if [ "$PLATFORM" = "Windows" ]; then
-  RUNTIME="win-x64"
-elif [ "$PLATFORM" = "Linux" ]; then
-  RUNTIME="linux-x64"
-elif [ "$PLATFORM" = "Mac" ]; then
-  RUNTIME="osx-x64"
-else
-  echo "Platform must be provided as first arguement: Windows, Linux or Mac"
-  exit 1
-fi
-
-outputFolder='_output'
-testPackageFolder='_tests'
-
-rm -rf $outputFolder
-rm -rf $testPackageFolder
-
-slnFile=src/Readarr.sln
-
-platform=Posix
-
-if [ "$PLATFORM" = "Windows" ]; then
-  application=Readarr.Console.dll
-else
-  application=Readarr.dll
-fi
-
-dotnet clean $slnFile -c Debug
-dotnet clean $slnFile -c Release
-
-dotnet msbuild -restore $slnFile -p:Configuration=Debug -p:Platform=$platform -p:RuntimeIdentifiers=$RUNTIME -t:PublishAllRids
-
-dotnet new tool-manifest
-dotnet tool install --version 6.6.2 Swashbuckle.AspNetCore.Cli
-
-dotnet tool run swagger tofile --output ./src/Readarr.Api.V1/openapi.json "$outputFolder/$FRAMEWORK/$RUNTIME/$application" v1 &
-
-sleep 45
-
-kill %1
-
-exit 0

frontend/.csscomb.json

@@ -0,0 +1,25 @@
+{
+  "remove-empty-rulesets": true,
+  "always-semicolon": true,
+  "color-case": "lower",
+  "block-indent": "  ",
+  "color-shorthand": false,
+  "element-case": "lower",
+  "eof-newline": true,
+  "leading-zero": true,
+  "quotes": "double",
+  "sort-order-fallback": "abc",
+  "space-before-colon": "",
+  "space-after-colon": " ",
+  "space-before-combinator": " ",
+  "space-after-combinator": " ",
+  "space-between-declarations": "\n",
+  "space-before-opening-brace": " ",
+  "space-after-opening-brace": "\n",
+  "space-after-selector-delimiter": " ",
+  "space-before-selector-delimiter": "",
+  "space-before-closing-brace": "\n",
+  "strip-spaces": true,
+  "tab-size": true,
+  "unitless-zero": false
+}

frontend/.esformatter

@@ -0,0 +1,335 @@
+{
+  "indent": {
+    "value": "  ",
+    "FunctionExpression": 1,
+    "ArrayExpression": 1,
+    "ObjectExpression": 1
+  },
+  "lineBreak": {
+    "value": "\n",
+
+    "before": {
+      "ArrayPatternClosing": 0,
+      "ArrayPatternComma": 0,
+      "ArrayPatternOpening": 0,
+      "ArrowFunctionExpressionArrow": 0,
+      "ArrowFunctionExpressionClosingBrace": ">=1",
+      "ArrowFunctionExpressionOpeningBrace": 0,
+      "AssignmentExpression": ">=1",
+      "AssignmentOperator": 0,
+      "BlockStatement": 0,
+      "BreakKeyword": ">=1",
+      "CallExpression": -1,
+      "CallExpressionClosingParentheses": -1,
+      "CallExpressionOpeningParentheses": 0,
+      "CatchClosingBrace": ">=1",
+      "CatchKeyword": 0,
+      "CatchOpeningBrace": 0,
+      "ClassDeclaration": ">=1",
+      "ClassDeclarationClosingBrace": ">=1",
+      "ClassDeclarationOpeningBrace": 0,
+      "ConditionalExpression": ">=1",
+      "DeleteOperator": ">=1",
+      "DoWhileStatement": ">=1",
+      "DoWhileStatementClosingBrace": ">=1",
+      "DoWhileStatementOpeningBrace": 0,
+      "ElseIfStatement": 0,
+      "ElseIfStatementClosingBrace": ">=1",
+      "ElseIfStatementOpeningBrace": 0,
+      "ElseStatement": 0,
+      "ElseStatementClosingBrace": ">=1",
+      "ElseStatementOpeningBrace": 0,
+      "EmptyStatement": -1,
+      "EndOfFile": -1,
+      "FinallyClosingBrace": ">=1",
+      "FinallyKeyword": -1,
+      "FinallyOpeningBrace": 0,
+      "ForInStatement": ">=1",
+      "ForInStatementClosingBrace": ">=1",
+      "ForInStatementExpressionClosing": 0,
+      "ForInStatementExpressionOpening": 0,
+      "ForInStatementOpeningBrace": 0,
+      "ForStatement": ">=1",
+      "ForStatementClosingBrace": ">=1",
+      "ForStatementExpressionClosing": "<2",
+      "ForStatementExpressionOpening": 0,
+      "ForStatementOpeningBrace": 0,
+      "FunctionDeclaration": ">=1",
+      "FunctionDeclarationClosingBrace": ">=1",
+      "FunctionDeclarationOpeningBrace": 0,
+      "FunctionExpression": 0,
+      "FunctionExpressionClosingBrace": 1,
+      "FunctionExpressionOpeningBrace":0,
+      "IIFEClosingParentheses": 0,
+      "IfStatement": ">=1",
+      "IfStatementClosingBrace": ">=1",
+      "IfStatementOpeningBrace": 0,
+      "LogicalExpression": -1,
+      "MemberExpressionClosing": 0,
+      "MemberExpressionOpening": 0,
+      "MemberExpressionPeriod": -1,
+      "MethodDefinition": ">=1",
+      "ObjectExpressionClosingBrace": "<=1",
+      "ObjectPatternClosingBrace": 0,
+      "ObjectPatternComma": 0,
+      "ObjectPatternOpeningBrace": 0,
+      "ParameterDefault": 0,
+      "Property": "<=2",
+      "PropertyValue": 0,
+      "ReturnStatement": -1,
+      "SwitchClosingBrace": ">=1",
+      "SwitchOpeningBrace": 0,
+      "ThisExpression": -1,
+      "ThrowStatement": ">=1",
+      "TryClosingBrace": ">=1",
+      "TryKeyword": -1,
+      "TryOpeningBrace": 0,
+      "VariableDeclaration": ">=1",
+      "VariableDeclarationSemiColon": 0,
+      "VariableDeclarationWithoutInit": ">=1",
+      "VariableName": ">=1",
+      "VariableValue": 0,
+      "WhileStatement": ">=1",
+      "WhileStatementClosingBrace": ">=1",
+      "WhileStatementOpeningBrace": 0
+    },
+
+    "after": {
+      "ArrayPatternClosing": 0,
+      "ArrayPatternComma": 0,
+      "ArrayPatternOpening": 0,
+      "ArrowFunctionExpressionArrow": 0,
+      "ArrowFunctionExpressionClosingBrace": -1,
+      "ArrowFunctionExpressionOpeningBrace": ">=1",
+      "AssignmentExpression": ">=1",
+      "AssignmentOperator": 0,
+      "BlockStatement": 0,
+      "BreakKeyword": -1,
+      "CallExpression": -1,
+      "CallExpressionClosingParentheses": -1,
+      "CallExpressionOpeningParentheses": -1,
+      "CatchClosingBrace": ">=0",
+      "CatchKeyword": 0,
+      "CatchOpeningBrace": ">=1",
+      "ClassDeclaration": ">=1",
+      "ClassDeclarationClosingBrace": ">=1",
+      "ClassDeclarationOpeningBrace": ">=1",
+      "ConditionalExpression": ">=1",
+      "DeleteOperator": ">=1",
+      "DoWhileStatement": ">=1",
+      "DoWhileStatementClosingBrace": 0,
+      "DoWhileStatementOpeningBrace": ">=1",
+      "ElseIfStatement": ">=1",
+      "ElseIfStatementClosingBrace": ">=1",
+      "ElseIfStatementOpeningBrace": ">=1",
+      "ElseStatement": ">=1",
+      "ElseStatementClosingBrace": ">=1",
+      "ElseStatementOpeningBrace": ">=1",
+      "EmptyStatement": -1,
+      "FinallyClosingBrace": ">=1",
+      "FinallyKeyword": -1,
+      "FinallyOpeningBrace": ">=1",
+      "ForInStatement": ">=1",
+      "ForInStatementClosingBrace": ">=1",
+      "ForInStatementExpressionClosing": -1,
+      "ForInStatementExpressionOpening": "<2",
+      "ForInStatementOpeningBrace": ">=1",
+      "ForStatement": ">=1",
+      "ForStatementClosingBrace": ">=1",
+      "ForStatementExpressionClosing": -1,
+      "ForStatementExpressionOpening": "<2",
+      "ForStatementOpeningBrace": ">=1",
+      "FunctionDeclaration": ">=1",
+      "FunctionDeclarationClosingBrace": ">=1",
+      "FunctionDeclarationOpeningBrace": ">=1",
+      "FunctionExpression": 0,
+      "FunctionExpressionClosingBrace": -1,
+      "FunctionExpressionOpeningBrace": 1,
+      "IIFEOpeningParentheses": 0,
+      "IfStatement": ">=1",
+      "IfStatementClosingBrace": ">=1",
+      "IfStatementOpeningBrace": ">=1",
+      "LogicalExpression": -1,
+      "MemberExpressionClosing": 0,
+      "MemberExpressionOpening": 0,
+      "MemberExpressionPeriod": 0,
+      "MethodDefinition": ">=1",
+      "ObjectExpressionOpeningBrace": "<=1",
+      "ObjectPatternClosingBrace": 0,
+      "ObjectPatternComma": 0,
+      "ObjectPatternOpeningBrace": 0,
+      "ParameterDefault": 0,
+      "Property": -1,
+      "PropertyName": 0,
+      "ReturnStatement": -1,
+      "SwitchCaseColon": ">=1",
+      "SwitchClosingBrace": ">=1",
+      "SwitchOpeningBrace": ">=1",
+      "ThisExpression": 0,
+      "ThrowStatement": ">=1",
+      "TryClosingBrace": 0,
+      "TryKeyword": -1,
+      "TryOpeningBrace": ">=1",
+      "VariableDeclaration": ">=1",
+      "VariableDeclarationSemiColon": ">=1",
+      "VariableValue": -1,
+      "WhileStatement": ">=1",
+      "WhileStatementClosingBrace": ">=1",
+      "WhileStatementOpeningBrace": ">=1"
+    }
+  },
+  "whiteSpace": {
+    "value": " ",
+    "removeTrailing": 1,
+    "before": {
+      "ArgumentComma": 0,
+      "ArgumentList": 0,
+      "ArgumentListArrayExpression": 0,
+      "ArgumentListFunctionExpression": 1,
+      "ArgumentListObjectExpression": 0,
+      "ArrayExpressionClosing": 0,
+      "ArrayExpressionComma": 0,
+      "ArrayExpressionOpening": 1,
+      "AssignmentOperator": 1,
+      "BinaryExpression": 0,
+      "BinaryExpressionOperator": 1,
+      "BlockComment": 1,
+      "CallExpression": 1,
+      "CatchClosingBrace": 1,
+      "CatchKeyword": 1,
+      "CatchOpeningBrace": 1,
+      "CatchParameterList": 0,
+      "CommaOperator": 0,
+      "ConditionalExpressionAlternate": 1,
+      "ConditionalExpressionConsequent": 1,
+      "DoWhileStatementClosingBrace": 1,
+      "DoWhileStatementConditional": 1,
+      "DoWhileStatementOpeningBrace": 1,
+      "ElseIfStatementClosingBrace": 1,
+      "ElseIfStatementOpeningBrace": 1,
+      "ElseStatementClosingBrace": 1,
+      "ElseStatementOpeningBrace": 1,
+      "EmptyStatement": 0,
+      "ExpressionClosingParentheses": 0,
+      "FinallyClosingBrace": 1,
+      "FinallyKeyword": -1,
+      "FinallyOpeningBrace": 1,
+      "ForInStatement": 1,
+      "ForInStatementClosingBrace": 1,
+      "ForInStatementExpressionClosing": 0,
+      "ForInStatementExpressionOpening": 1,
+      "ForInStatementOpeningBrace": 1,
+      "ForStatement": 1,
+      "ForStatementClosingBrace": 1,
+      "ForStatementExpressionClosing": 0,
+      "ForStatementExpressionOpening": 1,
+      "ForStatementOpeningBrace": 1,
+      "ForStatementSemicolon": 0,
+      "FunctionDeclarationClosingBrace": 1,
+      "FunctionDeclarationOpeningBrace": 1,
+      "FunctionExpressionClosingBrace": 1,
+      "FunctionExpressionOpeningBrace": 1,
+      "IfStatementClosingBrace": 1,
+      "IfStatementConditionalClosing": 0,
+      "IfStatementConditionalOpening": 1,
+      "IfStatementOpeningBrace": 1,
+      "LineComment": 1,
+      "LogicalExpressionOperator": 1,
+      "MemberExpressionClosing": 0,
+      "ObjectExpressionClosingBrace": 1,
+      "ParameterComma": 0,
+      "ParameterList": 0,
+      "Property": 1,
+      "PropertyName": 1,
+      "PropertyValue": 1,
+      "SwitchDiscriminantClosing": 0,
+      "SwitchDiscriminantOpening": 1,
+      "ThrowKeyword": 1,
+      "TryClosingBrace": 1,
+      "TryKeyword": -1,
+      "TryOpeningBrace": 1,
+      "UnaryExpressionOperator": 0,
+      "VariableName": 1,
+      "VariableValue": 1,
+      "WhileStatementClosingBrace": 1,
+      "WhileStatementConditionalClosing": 0,
+      "WhileStatementConditionalOpening": 1,
+      "WhileStatementOpeningBrace": 1
+    },
+    "after": {
+      "ArgumentComma": 1,
+      "ArgumentList": 0,
+      "ArgumentListArrayExpression": 1,
+      "ArgumentListFunctionExpression": 1,
+      "ArgumentListObjectExpression": 0,
+      "ArrayExpressionClosing": 0,
+      "ArrayExpressionComma": 1,
+      "ArrayExpressionOpening": 0,
+      "AssignmentOperator": 1,
+      "BinaryExpression": 0,
+      "BinaryExpressionOperator": 1,
+      "BlockComment": 1,
+      "CallExpression": 0,
+      "CatchClosingBrace": 1,
+      "CatchKeyword": 1,
+      "CatchOpeningBrace": 1,
+      "CatchParameterList": 0,
+      "CommaOperator": 1,
+      "ConditionalExpressionConsequent": 1,
+      "ConditionalExpressionTest": 1,
+      "DoWhileStatementBody": 1,
+      "DoWhileStatementClosingBrace": 1,
+      "DoWhileStatementOpeningBrace": 1,
+      "ElseIfStatementClosingBrace": 1,
+      "ElseIfStatementOpeningBrace": 1,
+      "ElseStatementClosingBrace": 1,
+      "ElseStatementOpeningBrace": 1,
+      "EmptyStatement": 0,
+      "ExpressionOpeningParentheses": 0,
+      "FinallyClosingBrace": 1,
+      "FinallyKeyword": -1,
+      "FinallyOpeningBrace": 1,
+      "ForInStatement": 1,
+      "ForInStatementClosingBrace": 1,
+      "ForInStatementExpressionClosing": 1,
+      "ForInStatementExpressionOpening": 0,
+      "ForInStatementOpeningBrace": 1,
+      "ForStatement": 1,
+      "ForStatementClosingBrace": 1,
+      "ForStatementExpressionClosing": 1,
+      "ForStatementExpressionOpening": 0,
+      "ForStatementOpeningBrace": 1,
+      "ForStatementSemicolon": 1,
+      "FunctionDeclarationClosingBrace": 0,
+      "FunctionDeclarationOpeningBrace": 0,
+      "FunctionExpressionClosingBrace": 0,
+      "FunctionExpressionOpeningBrace": 0,
+      "FunctionName": 0,
+      "FunctionReservedWord": 0,
+      "IfStatementClosingBrace": 1,
+      "IfStatementConditionalClosing": 0,
+      "IfStatementConditionalOpening": 0,
+      "IfStatementOpeningBrace": 1,
+      "LogicalExpressionOperator": 1,
+      "MemberExpressionOpening": 0,
+      "ObjectExpressionClosingBrace": 0,
+      "ObjectExpressionOpeningBrace": 1,
+      "ParameterComma": 1,
+      "ParameterList": 0,
+      "PropertyName": 0,
+      "PropertyValue": 0,
+      "SwitchDiscriminantClosing": 1,
+      "SwitchDiscriminantOpening": 0,
+      "ThrowKeyword": 1,
+      "TryClosingBrace": 1,
+      "TryKeyword": -1,
+      "TryOpeningBrace": 1,
+      "UnaryExpressionOperator": 0,
+      "VariableName": 1,
+      "WhileStatementClosingBrace": 1,
+      "WhileStatementConditionalClosing": 1,
+      "WhileStatementConditionalOpening": 0,
+      "WhileStatementOpeningBrace": 1
+    }
+  }
+}

frontend/.eslintignore

@@ -1,2 +1 @@
 **/JsLibraries/**
-**/*.css.d.ts

frontend/.eslintrc.js

@@ -1,21 +1,14 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
 const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const typescriptEslintRecommended = require('@typescript-eslint/eslint-plugin').configs.recommended;
-
-const frontendFolder = __dirname;
 
 const dirs = fs
-  .readdirSync(path.join(frontendFolder, 'src'), { withFileTypes: true })
+  .readdirSync('frontend/src', { withFileTypes: true })
   .filter((dirent) => dirent.isDirectory())
   .map((dirent) => dirent.name)
   .join('|');
 
-module.exports = {
+const frontendFolder = __dirname;
-  root: true,
 
+module.exports = {
   parser: '@babel/eslint-parser',
 
   env: {
@@ -35,7 +28,7 @@ module.exports = {
     ecmaVersion: 6,
     sourceType: 'module',
     babelOptions: {
-      configFile: `${frontendFolder}/babel.config.js`
+      configFile: `${frontendFolder}/babel.config.js`,
     },
     ecmaFeatures: {
       modules: true,
@@ -46,11 +39,8 @@ module.exports = {
   plugins: [
     'filenames',
     'react',
-    'react-hooks',
     'simple-import-sort',
-    'import',
+    'import'
-    '@typescript-eslint',
-    'prettier'
   ],
 
   settings: {
@@ -233,7 +223,7 @@ module.exports = {
     'consistent-this': ['error', 'self'],
     'eol-last': 'error',
     'func-names': 'off',
-    'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
+    'func-style': ['error', 'declaration'],
     indent: ['error', 2, { SwitchCase: 1 }],
     'key-spacing': ['error', { beforeColon: false, afterColon: true }],
     'keyword-spacing': ['error', { before: true, after: true }],
@@ -318,15 +308,11 @@ module.exports = {
     'react/react-in-jsx-scope': 2,
     'react/self-closing-comp': 2,
     'react/sort-comp': 2,
-    'react/jsx-wrap-multilines': 2,
+    'react/jsx-wrap-multilines': 2
-    'react-hooks/rules-of-hooks': 'error',
-    'react-hooks/exhaustive-deps': 'error'
   },
   overrides: [
     {
-      files: [
+      files: ['*.js'],
-        '*.js'
-      ],
       rules: {
         'simple-import-sort/imports': [
           'error',
@@ -341,52 +327,6 @@ module.exports = {
           }
         ]
       }
-    },
-    {
-      files: [
-        '*.ts',
-        '*.tsx'
-      ],
-
-      parser: '@typescript-eslint/parser',
-      parserOptions: {
-        project: './tsconfig.json'
-      },
-
-      extends: [
-        'prettier'
-      ],
-
-      rules: Object.assign(typescriptEslintRecommended.rules, {
-        'no-shadow': 'off',
-        // These should be enabled after cleaning things up
-        '@typescript-eslint/no-unused-vars': 'warn',
-        '@typescript-eslint/explicit-function-return-type': 'off',
-        'react/prop-types': 'off',
-        'prettier/prettier': 'error',
-        'simple-import-sort/imports': [
-          'error',
-          {
-            groups: [
-              // Packages
-              // Absolute Paths
-              // Relative Paths
-              // Css
-              ['^@?\\w', `^(${dirs})(/.*|$)`, '^\\.', '^\\..*css$']
-            ]
-          }
-        ]
-      })
-    },
-    {
-      files: [
-        '*.css.d.ts'
-      ],
-      rules: {
-        'filenames/match-exported': 'off',
-        'init-declarations': 'off',
-        'prettier/prettier': 'off'
-      }
     }
   ]
 };

frontend/.jsbeautifyrc

@@ -0,0 +1,12 @@
+{
+  "js": {
+    "indent_size": 2,
+    "indent_char": " ",
+    "indent_level": 2,
+    "indent_with_tabs": false,
+    "preserve_newlines": true,
+    "brace_style": "collapse",
+    "max_preserve_newlines": 2,
+    "jslint_happy": true
+  }
+}

frontend/.prettierignore

@@ -1,10 +0,0 @@
-# Ignore everything recursively
-*
-
-# But not the .ts files
-!*.ts*
-
-*css.d.ts
-
-# Check subdirectories too
-!*/

frontend/.prettierrc.json

@@ -1,6 +0,0 @@
-{
-  "arrowParens": "always",
-  "endOfLine": "auto",
-  "singleQuote": true,
-  "trailingComma": "es5"
-}

frontend/.stylelintrc

@@ -1,12 +1,12 @@
 {
-  "plugins": [
+"plugins": [
-    "stylelint-order"
+  "stylelint-order"
-  ],
+],
-  "ignoreFiles": [
+"ignoreFiles": [
-    "frontend/src/Styles/scaffolding.css",
+  "frontend/src/Styles/scaffolding.css",
-    "**/*.js"
+  "**/*.js"
-  ],
+],
-  "rules": {
+"rules": {
     "at-rule-empty-line-before": [
       "always",
       {
@@ -15,6 +15,9 @@
         ]
       }
     ],
+    "at-rule-name-case": "lower",
+    "at-rule-name-newline-after": "always-multi-line",
+    "at-rule-name-space-after": "always",
     "at-rule-no-unknown": [
       true,
       {
@@ -25,36 +28,83 @@
       }
     ],
     "at-rule-no-vendor-prefix": true,
+    "at-rule-semicolon-newline-after": "always",
+    "at-rule-semicolon-space-before": "never",
+    "block-closing-brace-empty-line-before": "never",
+    "block-closing-brace-newline-after": "always",
+    "block-closing-brace-newline-before": "always",
+    "block-closing-brace-space-after": "always-single-line",
+    "block-closing-brace-space-before": "always-single-line",
     "block-no-empty": true,
+    "block-opening-brace-newline-after": "always",
+    "block-opening-brace-newline-before": "never-single-line",
+    "block-opening-brace-space-after": "always-single-line",
+    "block-opening-brace-space-before": "always",
+    "color-hex-case": "lower",
     "color-hex-length": "short",
     "color-named": "never",
     "color-no-invalid-hex": true,
     "comment-whitespace-inside": "always",
+    "declaration-bang-space-after": "never",
+    "declaration-bang-space-before": "always",
     "declaration-block-no-duplicate-properties": [
       true,
       {
         "ignoreProperties": [
-          "composes"
+            "composes"
         ]
       }
     ],
     "declaration-block-no-redundant-longhand-properties": true,
     "declaration-block-no-shorthand-property-overrides": true,
+    "declaration-block-semicolon-newline-after": "always",
+    "declaration-block-semicolon-newline-before": "never-multi-line",
+    "declaration-block-semicolon-space-before": "never",
     "declaration-block-single-line-max-declarations": 1,
+    "declaration-block-trailing-semicolon": "always",
+    "declaration-colon-space-after": "always",
+    "declaration-colon-space-before": "never",
     "font-family-name-quotes": "always-unless-keyword",
     "function-calc-no-unspaced-operator": true,
+    "function-comma-newline-after": "never-multi-line",
+    "function-comma-newline-before": "never-multi-line",
+    "function-comma-space-after": "always",
+    "function-comma-space-before": "never",
     "function-linear-gradient-no-nonstandard-direction": true,
     "function-name-case": "lower",
+    "function-parentheses-newline-inside": "never-multi-line",
+    "function-parentheses-space-inside": "never",
     "function-url-quotes": "always",
     "function-url-scheme-disallowed-list": [
       "data"
     ],
+    "function-whitespace-after": "always",
+    "indentation": 2,
     "keyframe-declaration-no-important": true,
     "length-zero-no-unit": true,
+    "max-empty-lines": 1,
+    "max-line-length": [
+      100,
+      {
+        "ignore": [
+          "non-comments"
+        ]
+      }
+    ],
     "max-nesting-depth": 2,
+    "media-feature-colon-space-after": "always",
+    "media-feature-colon-space-before": "never",
+    "media-feature-name-case": "lower",
     "media-feature-name-no-vendor-prefix": true,
+    "media-feature-range-operator-space-after": "always",
+    "media-feature-range-operator-space-before": "always",
     "no-empty-source": true,
+    "no-eol-whitespace": true,
+    "no-extra-semicolons": true,
     "no-invalid-double-slash-comments": true,
+    "no-missing-end-of-source-newline": true,
+    "number-leading-zero": "always",
+    "number-no-trailing-zeros": true,
     "order/order": [
       "custom-properties",
       "dollar-variables",
@@ -82,7 +132,6 @@
           "right",
           "bottom",
           "left",
-          "inset",
           "z-index",
           "display",
           "visibility",
@@ -294,33 +343,54 @@
         ]
       }
     ],
+    "property-case": "lower",
     "property-no-vendor-prefix": true,
     "rule-empty-line-before": [
       "always",
       {
         "except": [
-          "first-nested"
+            "first-nested"
         ],
         "ignore": [
-          "after-comment"
+            "after-comment"
         ]
       }
     ],
+    "selector-attribute-brackets-space-inside": "never",
+    "selector-attribute-operator-space-after": "never",
+    "selector-attribute-operator-space-before": "never",
     "selector-attribute-quotes": "never",
     "selector-class-pattern": "^[A-Za-z0-9]+$",
+    "selector-combinator-space-after": "always",
+    "selector-combinator-space-before": "always",
+    "selector-descendant-combinator-no-non-space": true,
+    "selector-list-comma-newline-after": "always",
+    "selector-list-comma-newline-before": "never-multi-line",
+    "selector-list-comma-space-before": "never",
     "selector-max-attribute": 0,
     "selector-max-class": 3,
     "selector-max-compound-selectors": 3,
+    "selector-max-empty-lines": 0,
     "selector-max-id": 0,
     "selector-max-universal": 0,
+    "selector-pseudo-class-case": "lower",
+    "selector-pseudo-class-parentheses-space-inside": "never",
+    "selector-pseudo-element-case": "lower",
     "selector-pseudo-element-colon-notation": "double",
     "selector-pseudo-element-no-unknown": true,
     "selector-type-case": "lower",
     "selector-type-no-unknown": true,
     "shorthand-property-no-redundant-values": true,
     "string-no-newline": true,
+    "string-quotes": "single",
     "time-min-milliseconds": 100,
+    "unit-case": "lower",
     "unit-no-unknown": true,
+    "value-list-comma-newline-after": "never-multi-line",
+    "value-list-comma-newline-before": "never-multi-line",
+    "value-list-comma-space-after": "always",
+    "value-list-comma-space-before": "never",
+    "value-list-max-empty-lines": 0,
     "value-no-vendor-prefix": true
   }
-}
+}

frontend/.vscode/extensions.json

@@ -1,7 +0,0 @@
-{
-    "recommendations": [
-        "stylelint.vscode-stylelint",
-        "dbaeumer.vscode-eslint",
-        "esbenp.prettier-vscode"
-    ]
-}

frontend/.vscode/settings.json

@@ -1,23 +0,0 @@
-// Place your settings in this file to overwrite default and user settings.
-{
-  "files.insertFinalNewline": true,
-
-  "files.exclude": {
-    "**/node_modules": true,
-    "**/*.d.css": true
-  },
-
-  "editor.formatOnSave": false,
-  "editor.codeActionsOnSave": {
-    "source.fixAll": "explicit"
-  },
-
-  "typescript.preferences.quoteStyle": "single",
-
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    "typescript",
-    "typescriptreact"
-  ],
-}

frontend/babel.config.js

@@ -2,25 +2,22 @@ const loose = true;
 
 module.exports = {
   plugins: [
-    '@babel/plugin-transform-logical-assignment-operators',
-
     // Stage 1
     '@babel/plugin-proposal-export-default-from',
-    ['@babel/plugin-transform-optional-chaining', { loose }],
+    ['@babel/plugin-proposal-optional-chaining', { loose }],
-    ['@babel/plugin-transform-nullish-coalescing-operator', { loose }],
+    ['@babel/plugin-proposal-nullish-coalescing-operator', { loose }],
 
     // Stage 2
-    '@babel/plugin-transform-export-namespace-from',
+    '@babel/plugin-proposal-export-namespace-from',
 
     // Stage 3
-    ['@babel/plugin-transform-class-properties', { loose }],
+    ['@babel/plugin-proposal-class-properties', { loose }],
     '@babel/plugin-syntax-dynamic-import'
   ],
   env: {
     development: {
       presets: [
-        ['@babel/preset-react', { development: true }],
+        ['@babel/preset-react', { development: true }]
-        '@babel/preset-typescript'
       ],
       plugins: [
         'babel-plugin-inline-classnames'
@@ -28,8 +25,7 @@ module.exports = {
     },
     production: {
       presets: [
-        '@babel/preset-react',
+        '@babel/preset-react'
-        '@babel/preset-typescript'
       ],
       plugins: [
         'babel-plugin-transform-react-remove-prop-types'

frontend/build/webpack.config.js

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
 const path = require('path');
 const webpack = require('webpack');
 const FileManagerPlugin = require('filemanager-webpack-plugin');
@@ -6,7 +5,6 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const LiveReloadPlugin = require('webpack-livereload-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
-const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 
 module.exports = (env) => {
   const uiFolder = 'UI';
@@ -26,7 +24,6 @@ module.exports = (env) => {
   const config = {
     mode: isProduction ? 'production' : 'development',
     devtool: isProduction ? 'source-map' : 'eval-source-map',
-    target: 'web',
 
     stats: {
       children: false
@@ -37,23 +34,17 @@ module.exports = (env) => {
     },
 
     entry: {
-      index: 'index.ts'
+      index: 'index.js'
     },
 
     resolve: {
-      extensions: [
-        '.ts',
-        '.tsx',
-        '.js'
-      ],
       modules: [
         srcFolder,
         path.join(srcFolder, 'Shims'),
         'node_modules'
       ],
       alias: {
-        jquery: 'jquery/dist/jquery.min',
+        jquery: 'jquery/src/jquery'
-        'react-middle-truncate': 'react-middle-truncate/lib/react-middle-truncate'
       },
       fallback: {
         buffer: false,
@@ -68,23 +59,23 @@ module.exports = (env) => {
     output: {
       path: distFolder,
       publicPath: '/',
-      filename: isProduction ? '[name]-[contenthash].js' : '[name].js',
+      filename: '[name].js',
       sourceMapFilename: '[file].map'
     },
 
     optimization: {
       moduleIds: 'deterministic',
-      chunkIds: isProduction ? 'deterministic' : 'named'
+      chunkIds: 'named',
+      splitChunks: {
+        chunks: 'initial',
+        name: 'vendors'
+      }
     },
 
     performance: {
       hints: false
     },
 
-    experiments: {
-      topLevelAwait: true
-    },
-
     plugins: [
       new webpack.DefinePlugin({
         __DEV__: !isProduction,
@@ -92,15 +83,13 @@ module.exports = (env) => {
       }),
 
       new MiniCssExtractPlugin({
-        filename: 'Content/styles.css',
+        filename: 'Content/styles.css'
-        chunkFilename: isProduction ? 'Content/[id]-[chunkhash].css' : 'Content/[id].css'
       }),
 
       new HtmlWebpackPlugin({
         template: 'frontend/src/index.ejs',
         filename: 'index.html',
-        publicPath: '/',
+        publicPath: '/'
-        inject: false
       }),
 
       new FileManagerPlugin({
@@ -141,8 +130,6 @@ module.exports = (env) => {
         }
       }),
 
-      new ForkTsCheckerWebpackPlugin(),
-
       new LiveReloadPlugin()
     ],
 
@@ -166,7 +153,7 @@ module.exports = (env) => {
           }
         },
         {
-          test: [/\.jsx?$/, /\.tsx?$/],
+          test: /\.js?$/,
           exclude: /(node_modules|JsLibraries)/,
           use: [
             {
@@ -197,13 +184,12 @@ module.exports = (env) => {
           exclude: /(node_modules|globals.css)/,
           use: [
             { loader: MiniCssExtractPlugin.loader },
-            { loader: 'css-modules-typescript-loader' },
             {
               loader: 'css-loader',
               options: {
                 importLoaders: 1,
                 modules: {
-                  localIdentName: isProduction ? '[name]/[local]/[hash:base64:5]' : '[name]/[local]'
+                  localIdentName: '[name]/[local]/[hash:base64:5]'
                 }
               }
             },
@@ -266,19 +252,18 @@ module.exports = (env) => {
     config.resolve.alias['react-dom$'] = 'react-dom/profiling';
     config.resolve.alias['scheduler/tracing'] = 'scheduler/tracing-profiling';
 
-    config.optimization = {
+    config.optimization.minimizer = [
-      minimize: true,
+      new TerserPlugin({
-      minimizer: [
+        cache: true,
-        new TerserPlugin({
+        parallel: true,
-          terserOptions: {
+        sourceMap: true, // Must be set to true if using source-maps in production
-            sourceMap: true, // Must be set to true if using source-maps in production
+        terserOptions: {
-            mangle: false,
+          mangle: false,
-            keep_classnames: true,
+          keep_classnames: true,
-            keep_fnames: true
+          keep_fnames: true
-          }
+        }
-        })
+      })
-      ]
+    ];
-    };
   }
 
   return config;

frontend/build/webpack/css-variables-loader.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line filenames/match-exported
 const loaderUtils = require('loader-utils');
 
 module.exports = function cssVariablesLoader(source) {

frontend/postcss.config.js

@@ -1,6 +1,7 @@
 const reload = require('require-nocache')(module);
 
 const cssVarsFiles = [
+  './src/Styles/Variables/colors',
   './src/Styles/Variables/dimensions',
   './src/Styles/Variables/fonts',
   './src/Styles/Variables/animations',

frontend/src/.vscode/settings.json

@@ -0,0 +1,4 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+  "files.insertFinalNewline": true
+}

frontend/src/Activity/Blocklist/Blocklist.js

@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Alert from 'Components/Alert';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import PageContent from 'Components/Page/PageContent';
@@ -62,33 +61,33 @@ class Blocklist extends Component {
 
   getSelectedIds = () => {
     return getSelectedIds(this.state.selectedState);
-  };
+  }
 
   //
   // Listeners
 
   onSelectAllChange = ({ value }) => {
     this.setState(selectAll(this.state.selectedState, value));
-  };
+  }
 
   onSelectedChange = ({ id, value, shiftKey = false }) => {
     this.setState((state) => {
       return toggleSelected(state, this.props.items, id, value, shiftKey);
     });
-  };
+  }
 
   onRemoveSelectedPress = () => {
     this.setState({ isConfirmRemoveModalOpen: true });
-  };
+  }
 
   onRemoveSelectedConfirmed = () => {
     this.props.onRemoveSelected(this.getSelectedIds());
     this.setState({ isConfirmRemoveModalOpen: false });
-  };
+  }
 
   onConfirmRemoveModalClose = () => {
     this.setState({ isConfirmRemoveModalOpen: false });
-  };
+  }
 
   //
   // Render
@@ -162,16 +161,16 @@ class Blocklist extends Component {
 
           {
             !isAnyFetching && !!error &&
-              <Alert kind={kinds.DANGER}>
+              <div>
                 {translate('UnableToLoadBlocklist')}
-              </Alert>
+              </div>
           }
 
           {
             isAllPopulated && !error && !items.length &&
-              <Alert kind={kinds.INFO}>
+              <div>
                 {translate('NoHistoryBlocklist')}
-              </Alert>
+              </div>
           }
 
           {
@@ -215,7 +214,7 @@ class Blocklist extends Component {
           isOpen={isConfirmRemoveModalOpen}
           kind={kinds.DANGER}
           title={translate('RemoveSelected')}
-          message={translate('RemoveSelectedItemBlocklistMessageText')}
+          message={translate('RemoveSelectedMessageText')}
           confirmLabel={translate('RemoveSelected')}
           onConfirm={this.onRemoveSelectedConfirmed}
           onCancel={this.onConfirmRemoveModalClose}

frontend/src/Activity/Blocklist/BlocklistConnector.js

@@ -68,37 +68,37 @@ class BlocklistConnector extends Component {
 
   repopulate = () => {
     this.props.fetchBlocklist();
-  };
+  }
   //
   // Listeners
 
   onFirstPagePress = () => {
     this.props.gotoBlocklistFirstPage();
-  };
+  }
 
   onPreviousPagePress = () => {
     this.props.gotoBlocklistPreviousPage();
-  };
+  }
 
   onNextPagePress = () => {
     this.props.gotoBlocklistNextPage();
-  };
+  }
 
   onLastPagePress = () => {
     this.props.gotoBlocklistLastPage();
-  };
+  }
 
   onPageSelect = (page) => {
     this.props.gotoBlocklistPage({ page });
-  };
+  }
 
   onRemoveSelected = (ids) => {
     this.props.removeBlocklistItems({ ids });
-  };
+  }
 
   onSortPress = (sortKey) => {
     this.props.setBlocklistSort({ sortKey });
-  };
+  }
 
   onTableOptionChange = (payload) => {
     this.props.setBlocklistTableOption(payload);
@@ -106,11 +106,11 @@ class BlocklistConnector extends Component {
     if (payload.pageSize) {
       this.props.gotoBlocklistFirstPage();
     }
-  };
+  }
 
   onClearBlocklistPress = () => {
     this.props.executeCommand({ name: commandNames.CLEAR_BLOCKLIST });
-  };
+  }
 
   //
   // Render

frontend/src/Activity/Blocklist/BlocklistRow.css.d.ts

@@ -1,9 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'actions': string;
-  'indexer': string;
-  'quality': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/Activity/Blocklist/BlocklistRow.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import AuthorNameLink from 'Author/AuthorNameLink';
-import BookFormats from 'Book/BookFormats';
 import BookQuality from 'Book/BookQuality';
 import IconButton from 'Components/Link/IconButton';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
@@ -31,11 +30,11 @@ class BlocklistRow extends Component {
 
   onDetailsPress = () => {
     this.setState({ isDetailsModalOpen: true });
-  };
+  }
 
   onDetailsModalClose = () => {
     this.setState({ isDetailsModalOpen: false });
-  };
+  }
 
   //
   // Render
@@ -46,7 +45,6 @@ class BlocklistRow extends Component {
       author,
       sourceTitle,
       quality,
-      customFormats,
       date,
       protocol,
       indexer,
@@ -112,16 +110,6 @@ class BlocklistRow extends Component {
               );
             }
 
-            if (name === 'customFormats') {
-              return (
-                <TableRowCell key={name}>
-                  <BookFormats
-                    formats={customFormats}
-                  />
-                </TableRowCell>
-              );
-            }
-
             if (name === 'date') {
               return (
                 <RelativeDateCellConnector
@@ -186,7 +174,6 @@ BlocklistRow.propTypes = {
   author: PropTypes.object.isRequired,
   sourceTitle: PropTypes.string.isRequired,
   quality: PropTypes.object.isRequired,
-  customFormats: PropTypes.arrayOf(PropTypes.object).isRequired,
   date: PropTypes.string.isRequired,
   protocol: PropTypes.string.isRequired,
   indexer: PropTypes.string,

frontend/src/Activity/History/Details/HistoryDetails.css.d.ts

@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'description': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/Activity/History/Details/HistoryDetails.js

@@ -9,7 +9,6 @@ import Link from 'Components/Link/Link';
 import { icons } from 'Helpers/Props';
 import formatDateTime from 'Utilities/Date/formatDateTime';
 import formatAge from 'Utilities/Number/formatAge';
-import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import translate from 'Utilities/String/translate';
 import styles from './HistoryDetails.css';
 
@@ -66,10 +65,8 @@ function HistoryDetails(props) {
     const {
       indexer,
       releaseGroup,
-      customFormatScore,
       nzbInfoUrl,
       downloadClient,
-      downloadClientName,
       downloadId,
       age,
       ageHours,
@@ -77,8 +74,6 @@ function HistoryDetails(props) {
       publishedDate
     } = data;
 
-    const downloadClientNameInfo = downloadClientName ?? downloadClient;
-
     return (
       <DescriptionList>
         <DescriptionListItem
@@ -105,16 +100,7 @@ function HistoryDetails(props) {
         }
 
         {
-          customFormatScore && customFormatScore !== '0' ?
+          !!nzbInfoUrl &&
-            <DescriptionListItem
-              title={translate('CustomFormatScore')}
-              data={formatCustomFormatScore(customFormatScore)}
-            /> :
-            null
-        }
-
-        {
-          nzbInfoUrl ?
             <span>
               <DescriptionListItemTitle>
                 Info URL
@@ -123,17 +109,15 @@ function HistoryDetails(props) {
               <DescriptionListItemDescription>
                 <Link to={nzbInfoUrl}>{nzbInfoUrl}</Link>
               </DescriptionListItemDescription>
-            </span> :
+            </span>
-            null
         }
 
         {
-          downloadClientNameInfo ?
+          !!downloadClient &&
             <DescriptionListItem
               title={translate('DownloadClient')}
-              data={downloadClientNameInfo}
+              data={downloadClient}
-            /> :
+            />
-            null
         }
 
         {
@@ -189,7 +173,6 @@ function HistoryDetails(props) {
 
   if (eventType === 'bookFileImported') {
     const {
-      customFormatScore,
       droppedPath,
       importedPath
     } = data;
@@ -212,22 +195,12 @@ function HistoryDetails(props) {
         }
 
         {
-          importedPath ?
+          !!importedPath &&
             <DescriptionListItem
               descriptionClassName={styles.description}
               title={translate('ImportedTo')}
               data={importedPath}
-            /> :
+            />
-            null
-        }
-
-        {
-          customFormatScore && customFormatScore !== '0' ?
-            <DescriptionListItem
-              title={translate('CustomFormatScore')}
-              data={formatCustomFormatScore(customFormatScore)}
-            /> :
-            null
         }
       </DescriptionList>
     );
@@ -235,8 +208,7 @@ function HistoryDetails(props) {
 
   if (eventType === 'bookFileDeleted') {
     const {
-      reason,
+      reason
-      customFormatScore
     } = data;
 
     let reasonMessage = '';
@@ -266,15 +238,6 @@ function HistoryDetails(props) {
           title={translate('Reason')}
           data={reasonMessage}
         />
-
-        {
-          customFormatScore && customFormatScore !== '0' ?
-            <DescriptionListItem
-              title={translate('CustomFormatScore')}
-              data={formatCustomFormatScore(customFormatScore)}
-            /> :
-            null
-        }
       </DescriptionList>
     );
   }

frontend/src/Activity/History/Details/HistoryDetailsModal.css.d.ts

@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'markAsFailedButton': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/Activity/History/History.js

@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Alert from 'Components/Alert';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import FilterMenu from 'Components/Menu/FilterMenu';
 import PageContent from 'Components/Page/PageContent';
@@ -12,7 +11,7 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
 import TablePager from 'Components/Table/TablePager';
-import { align, icons, kinds } from 'Helpers/Props';
+import { align, icons } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import HistoryRowConnector from './HistoryRowConnector';
 
@@ -86,9 +85,9 @@ class History extends Component {
 
           {
             !isFetchingAny && hasError &&
-              <Alert kind={kinds.DANGER}>
+              <div>
                 {translate('UnableToLoadHistory')}
-              </Alert>
+              </div>
           }
 
           {
@@ -96,9 +95,9 @@ class History extends Component {
             // wait for the books to populate because they are never coming.
 
             isPopulated && !hasError && !items.length &&
-              <Alert kind={kinds.INFO}>
+              <div>
-                {translate('NoHistory')}
+                No history found
-              </Alert>
+              </div>
           }
 
           {

frontend/src/Activity/History/HistoryConnector.js

@@ -60,38 +60,38 @@ class HistoryConnector extends Component {
 
   repopulate = () => {
     this.props.fetchHistory();
-  };
+  }
 
   //
   // Listeners
 
   onFirstPagePress = () => {
     this.props.gotoHistoryFirstPage();
-  };
+  }
 
   onPreviousPagePress = () => {
     this.props.gotoHistoryPreviousPage();
-  };
+  }
 
   onNextPagePress = () => {
     this.props.gotoHistoryNextPage();
-  };
+  }
 
   onLastPagePress = () => {
     this.props.gotoHistoryLastPage();
-  };
+  }
 
   onPageSelect = (page) => {
     this.props.gotoHistoryPage({ page });
-  };
+  }
 
   onSortPress = (sortKey) => {
     this.props.setHistorySort({ sortKey });
-  };
+  }
 
   onFilterSelect = (selectedFilterKey) => {
     this.props.setHistoryFilter({ selectedFilterKey });
-  };
+  }
 
   onTableOptionChange = (payload) => {
     this.props.setHistoryTableOption(payload);
@@ -99,7 +99,7 @@ class HistoryConnector extends Component {
     if (payload.pageSize) {
       this.props.gotoHistoryFirstPage();
     }
-  };
+  }
 
   //
   // Render

frontend/src/Activity/History/HistoryEventTypeCell.css.d.ts

@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'cell': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/Activity/History/HistoryRow.css

@@ -10,12 +10,6 @@
   width: 80px;
 }
 
-.customFormatScore {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
-
-  width: 55px;
-}
-
 .releaseGroup {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 

frontend/src/Activity/History/HistoryRow.css.d.ts

@@ -1,11 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'customFormatScore': string;
-  'details': string;
-  'downloadClient': string;
-  'indexer': string;
-  'releaseGroup': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/Activity/History/HistoryRow.js

@@ -1,16 +1,13 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import AuthorNameLink from 'Author/AuthorNameLink';
-import BookFormats from 'Book/BookFormats';
 import BookQuality from 'Book/BookQuality';
 import BookTitleLink from 'Book/BookTitleLink';
 import IconButton from 'Components/Link/IconButton';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
-import Tooltip from 'Components/Tooltip/Tooltip';
+import { icons } from 'Helpers/Props';
-import { icons, tooltipPositions } from 'Helpers/Props';
-import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import HistoryDetailsModal from './Details/HistoryDetailsModal';
 import HistoryEventTypeCell from './HistoryEventTypeCell';
 import styles from './HistoryRow.css';
@@ -43,11 +40,11 @@ class HistoryRow extends Component {
 
   onDetailsPress = () => {
     this.setState({ isDetailsModalOpen: true });
-  };
+  }
 
   onDetailsModalClose = () => {
     this.setState({ isDetailsModalOpen: false });
-  };
+  }
 
   //
   // Render
@@ -57,8 +54,6 @@ class HistoryRow extends Component {
       author,
       book,
       quality,
-      customFormats,
-      customFormatScore,
       qualityCutoffNotMet,
       eventType,
       sourceTitle,
@@ -132,16 +127,6 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'customFormats') {
-              return (
-                <TableRowCell key={name}>
-                  <BookFormats
-                    formats={customFormats}
-                  />
-                </TableRowCell>
-              );
-            }
-
             if (name === 'date') {
               return (
                 <RelativeDateCellConnector
@@ -173,24 +158,6 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'customFormatScore') {
-              return (
-                <TableRowCell
-                  key={name}
-                  className={styles.customFormatScore}
-                >
-                  <Tooltip
-                    anchor={formatCustomFormatScore(
-                      customFormatScore,
-                      customFormats.length
-                    )}
-                    tooltip={<BookFormats formats={customFormats} />}
-                    position={tooltipPositions.BOTTOM}
-                  />
-                </TableRowCell>
-              );
-            }
-
             if (name === 'releaseGroup') {
               return (
                 <TableRowCell
@@ -202,28 +169,16 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'sourceTitle') {
-              return (
-                <TableRowCell
-                  key={name}
-                >
-                  {sourceTitle}
-                </TableRowCell>
-              );
-            }
-
             if (name === 'details') {
               return (
                 <TableRowCell
                   key={name}
                   className={styles.details}
                 >
-                  <div className={styles.actionContents}>
+                  <IconButton
-                    <IconButton
+                    name={icons.INFO}
-                      name={icons.INFO}
+                    onPress={this.onDetailsPress}
-                      onPress={this.onDetailsPress}
+                  />
-                    />
-                  </div>
                 </TableRowCell>
               );
             }
@@ -254,8 +209,6 @@ HistoryRow.propTypes = {
   author: PropTypes.object.isRequired,
   book: PropTypes.object,
   quality: PropTypes.object.isRequired,
-  customFormats: PropTypes.arrayOf(PropTypes.object),
-  customFormatScore: PropTypes.number.isRequired,
   qualityCutoffNotMet: PropTypes.bool.isRequired,
   eventType: PropTypes.string.isRequired,
   sourceTitle: PropTypes.string.isRequired,
@@ -269,8 +222,4 @@ HistoryRow.propTypes = {
   onMarkAsFailedPress: PropTypes.func.isRequired
 };
 
-HistoryRow.defaultProps = {
-  customFormats: []
-};
-
 export default HistoryRow;

frontend/src/Activity/History/HistoryRowConnector.js

@@ -49,7 +49,7 @@ class HistoryRowConnector extends Component {
 
   onMarkAsFailedPress = () => {
     this.props.markAsFailed({ id: this.props.id });
-  };
+  }
 
   //
   // Render

frontend/src/Activity/Queue/ProtocolLabel.css

@@ -1,13 +1,13 @@
 .torrent {
   composes: label from '~Components/Label.css';
 
-  border-color: var(--torrentColor);
+  border-color: $torrentColor;
-  background-color: var(--torrentColor);
+  background-color: $torrentColor;
 }
 
 .usenet {
   composes: label from '~Components/Label.css';
 
-  border-color: var(--usenetColor);
+  border-color: $usenetColor;
-  background-color: var(--usenetColor);
+  background-color: $usenetColor;
 }

frontend/src/Activity/Queue/ProtocolLabel.css.d.ts

@@ -1,8 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'torrent': string;
-  'usenet': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/Activity/Queue/Queue.js

@@ -1,7 +1,6 @@
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Alert from 'Components/Alert';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
@@ -13,7 +12,7 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
 import TablePager from 'Components/Table/TablePager';
-import { align, icons, kinds } from 'Helpers/Props';
+import { align, icons } from 'Helpers/Props';
 import getRemovedItems from 'Utilities/Object/getRemovedItems';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
 import translate from 'Utilities/String/translate';
@@ -23,7 +22,7 @@ import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
 import QueueOptionsConnector from './QueueOptionsConnector';
 import QueueRowConnector from './QueueRowConnector';
-import RemoveQueueItemModal from './RemoveQueueItemModal';
+import RemoveQueueItemsModal from './RemoveQueueItemsModal';
 
 class Queue extends Component {
 
@@ -76,23 +75,13 @@ class Queue extends Component {
       return;
     }
 
-    const nextState = {};
-
-    if (prevProps.items !== items) {
-      nextState.items = items;
-    }
-
     const selectedIds = this.getSelectedIds();
     const isPendingSelected = _.some(this.props.items, (item) => {
       return selectedIds.indexOf(item.id) > -1 && item.status === 'delay';
     });
 
     if (isPendingSelected !== this.state.isPendingSelected) {
-      nextState.isPendingSelected = isPendingSelected;
+      this.setState({ isPendingSelected });
-    }
-
-    if (!_.isEmpty(nextState)) {
-      this.setState(nextState);
     }
   }
 
@@ -101,45 +90,45 @@ class Queue extends Component {
 
   getSelectedIds = () => {
     return getSelectedIds(this.state.selectedState);
-  };
+  }
 
   //
   // Listeners
 
   onQueueRowModalOpenOrClose = (isOpen) => {
     this._shouldBlockRefresh = isOpen;
-  };
+  }
 
   onSelectAllChange = ({ value }) => {
     this.setState(selectAll(this.state.selectedState, value));
-  };
+  }
 
   onSelectedChange = ({ id, value, shiftKey = false }) => {
     this.setState((state) => {
       return toggleSelected(state, this.props.items, id, value, shiftKey);
     });
-  };
+  }
 
   onGrabSelectedPress = () => {
     this.props.onGrabSelectedPress(this.getSelectedIds());
-  };
+  }
 
   onRemoveSelectedPress = () => {
     this.setState({ isConfirmRemoveModalOpen: true }, () => {
       this._shouldBlockRefresh = true;
     });
-  };
+  }
 
   onRemoveSelectedConfirmed = (payload) => {
     this._shouldBlockRefresh = false;
     this.props.onRemoveSelectedPress({ ids: this.getSelectedIds(), ...payload });
     this.setState({ isConfirmRemoveModalOpen: false });
-  };
+  }
 
   onConfirmRemoveModalClose = () => {
     this._shouldBlockRefresh = false;
     this.setState({ isConfirmRemoveModalOpen: false });
-  };
+  }
 
   //
   // Render
@@ -227,29 +216,26 @@ class Queue extends Component {
 
         <PageContentBody>
           {
-            isRefreshing && !isAllPopulated ?
+            isRefreshing && !isAllPopulated &&
-              <LoadingIndicator /> :
+              <LoadingIndicator />
-              null
           }
 
           {
-            !isRefreshing && hasError ?
+            !isRefreshing && hasError &&
-              <Alert kind={kinds.DANGER}>
+              <div>
                 {translate('FailedToLoadQueue')}
-              </Alert> :
+              </div>
-              null
           }
 
           {
-            isAllPopulated && !hasError && !items.length ?
+            isAllPopulated && !hasError && !items.length &&
-              <Alert kind={kinds.INFO}>
+              <div>
                 {translate('QueueIsEmpty')}
-              </Alert> :
+              </div>
-              null
           }
 
           {
-            isAllPopulated && !hasError && !!items.length ?
+            isAllPopulated && !hasError && !!items.length &&
               <div>
                 <Table
                   columns={columns}
@@ -284,21 +270,13 @@ class Queue extends Component {
                   isFetching={isRefreshing}
                   {...otherProps}
                 />
-              </div> :
+              </div>
-              null
           }
         </PageContentBody>
 
-        <RemoveQueueItemModal
+        <RemoveQueueItemsModal
           isOpen={isConfirmRemoveModalOpen}
           selectedCount={selectedCount}
-          canChangeCategory={isConfirmRemoveModalOpen && (
-            selectedIds.every((id) => {
-              const item = items.find((i) => i.id === id);
-
-              return !!(item && item.downloadClientHasPostImportCategory);
-            })
-          )}
           canIgnore={isConfirmRemoveModalOpen && (
             selectedIds.every((id) => {
               const item = items.find((i) => i.id === id);
@@ -306,7 +284,7 @@ class Queue extends Component {
               return !!(item && item.authorId && item.bookId);
             })
           )}
-          pending={isConfirmRemoveModalOpen && (
+          allPending={isConfirmRemoveModalOpen && (
             selectedIds.every((id) => {
               const item = items.find((i) => i.id === id);
 
@@ -345,8 +323,4 @@ Queue.propTypes = {
   onRemoveSelectedPress: PropTypes.func.isRequired
 };
 
-Queue.defaultProps = {
-  count: 0
-};
-
 export default Queue;

frontend/src/Activity/Queue/QueueConnector.js

@@ -79,34 +79,34 @@ class QueueConnector extends Component {
 
   repopulate = () => {
     this.props.fetchQueue();
-  };
+  }
 
   //
   // Listeners
 
   onFirstPagePress = () => {
     this.props.gotoQueueFirstPage();
-  };
+  }
 
   onPreviousPagePress = () => {
     this.props.gotoQueuePreviousPage();
-  };
+  }
 
   onNextPagePress = () => {
     this.props.gotoQueueNextPage();
-  };
+  }
 
   onLastPagePress = () => {
     this.props.gotoQueueLastPage();
-  };
+  }
 
   onPageSelect = (page) => {
     this.props.gotoQueuePage({ page });
-  };
+  }
 
   onSortPress = (sortKey) => {
     this.props.setQueueSort({ sortKey });
-  };
+  }
 
   onTableOptionChange = (payload) => {
     this.props.setQueueTableOption(payload);
@@ -114,21 +114,21 @@ class QueueConnector extends Component {
     if (payload.pageSize) {
       this.props.gotoQueueFirstPage();
     }
-  };
+  }
 
   onRefreshPress = () => {
     this.props.executeCommand({
       name: commandNames.REFRESH_MONITORED_DOWNLOADS
     });
-  };
+  }
 
   onGrabSelectedPress = (ids) => {
     this.props.grabQueueItems({ ids });
-  };
+  }
 
   onRemoveSelectedPress = (payload) => {
     this.props.removeQueueItems(payload);
-  };
+  }
 
   //
   // Render

frontend/src/Activity/Queue/QueueOptions.js

@@ -42,7 +42,7 @@ class QueueOptions extends Component {
         [name]: value
       });
     });
-  };
+  }
 
   //
   // Render

frontend/src/Activity/Queue/QueueRow.css

@@ -16,12 +16,6 @@
   width: 150px;
 }
 
-.customFormatScore {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
-
-  width: 55px;
-}
-
 .actions {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 

frontend/src/Activity/Queue/QueueRow.css.d.ts

@@ -1,11 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'actions': string;
-  'customFormatScore': string;
-  'progress': string;
-  'protocol': string;
-  'quality': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/Activity/Queue/QueueRow.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import ProtocolLabel from 'Activity/Queue/ProtocolLabel';
 import AuthorNameLink from 'Author/AuthorNameLink';
-import BookFormats from 'Book/BookFormats';
 import BookQuality from 'Book/BookQuality';
 import BookTitleLink from 'Book/BookTitleLink';
 import Icon from 'Components/Icon';
@@ -14,11 +13,9 @@ import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import TableRow from 'Components/Table/TableRow';
 import Popover from 'Components/Tooltip/Popover';
-import Tooltip from 'Components/Tooltip/Tooltip';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal';
 import formatBytes from 'Utilities/Number/formatBytes';
-import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import translate from 'Utilities/String/translate';
 import QueueStatusCell from './QueueStatusCell';
 import RemoveQueueItemModal from './RemoveQueueItemModal';
@@ -44,37 +41,37 @@ class QueueRow extends Component {
 
   onRemoveQueueItemPress = () => {
     this.setState({ isRemoveQueueItemModalOpen: true });
-  };
+  }
 
-  onRemoveQueueItemModalConfirmed = (blocklist, skipRedownload) => {
+  onRemoveQueueItemModalConfirmed = (blocklist, skipredownload) => {
     const {
       onRemoveQueueItemPress,
       onQueueRowModalOpenOrClose
     } = this.props;
 
     onQueueRowModalOpenOrClose(false);
-    onRemoveQueueItemPress(blocklist, skipRedownload);
+    onRemoveQueueItemPress(blocklist, skipredownload);
 
     this.setState({ isRemoveQueueItemModalOpen: false });
-  };
+  }
 
   onRemoveQueueItemModalClose = () => {
     this.props.onQueueRowModalOpenOrClose(false);
 
     this.setState({ isRemoveQueueItemModalOpen: false });
-  };
+  }
 
   onInteractiveImportPress = () => {
     this.props.onQueueRowModalOpenOrClose(true);
 
     this.setState({ isInteractiveImportModalOpen: true });
-  };
+  }
 
   onInteractiveImportModalClose = () => {
     this.props.onQueueRowModalOpenOrClose(false);
 
     this.setState({ isInteractiveImportModalOpen: false });
-  };
+  }
 
   //
   // Render
@@ -92,13 +89,10 @@ class QueueRow extends Component {
       author,
       book,
       quality,
-      customFormats,
-      customFormatScore,
       protocol,
       indexer,
       outputPath,
       downloadClient,
-      downloadClientHasPostImportCategory,
       downloadForced,
       estimatedCompletionTime,
       timeleft,
@@ -216,34 +210,6 @@ class QueueRow extends Component {
               );
             }
 
-            if (name === 'customFormats') {
-              return (
-                <TableRowCell key={name}>
-                  <BookFormats
-                    formats={customFormats}
-                  />
-                </TableRowCell>
-              );
-            }
-
-            if (name === 'customFormatScore') {
-              return (
-                <TableRowCell
-                  key={name}
-                  className={styles.customFormatScore}
-                >
-                  <Tooltip
-                    anchor={formatCustomFormatScore(
-                      customFormatScore,
-                      customFormats.length
-                    )}
-                    tooltip={<BookFormats formats={customFormats} />}
-                    position={tooltipPositions.BOTTOM}
-                  />
-                </TableRowCell>
-              );
-            }
-
             if (name === 'protocol') {
               return (
                 <TableRowCell key={name}>
@@ -390,7 +356,6 @@ class QueueRow extends Component {
         <RemoveQueueItemModal
           isOpen={isRemoveQueueItemModalOpen}
           sourceTitle={title}
-          canChangeCategory={!!downloadClientHasPostImportCategory}
           canIgnore={!!author}
           isPending={isPending}
           onRemovePress={this.onRemoveQueueItemModalConfirmed}
@@ -414,13 +379,10 @@ QueueRow.propTypes = {
   author: PropTypes.object,
   book: PropTypes.object,
   quality: PropTypes.object.isRequired,
-  customFormats: PropTypes.arrayOf(PropTypes.object),
-  customFormatScore: PropTypes.number.isRequired,
   protocol: PropTypes.string.isRequired,
   indexer: PropTypes.string,
   outputPath: PropTypes.string,
   downloadClient: PropTypes.string,
-  downloadClientHasPostImportCategory: PropTypes.bool,
   downloadForced: PropTypes.bool.isRequired,
   estimatedCompletionTime: PropTypes.string,
   timeleft: PropTypes.string,
@@ -441,7 +403,6 @@ QueueRow.propTypes = {
 };
 
 QueueRow.defaultProps = {
-  customFormats: [],
   isGrabbing: false,
   isRemoving: false
 };

frontend/src/Activity/Queue/QueueRowConnector.js

@@ -41,11 +41,11 @@ class QueueRowConnector extends Component {
 
   onGrabPress = () => {
     this.props.grabQueueItem({ id: this.props.id });
-  };
+  }
 
   onRemoveQueueItemPress = (payload) => {
     this.props.removeQueueItem({ id: this.props.id, ...payload });
-  };
+  }
 
   //
   // Render

frontend/src/Activity/Queue/QueueStatusCell.css.d.ts

@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'status': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/Activity/Queue/RemoveQueueItemModal.css.d.ts

@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'message': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/Activity/Queue/RemoveQueueItemModal.js

@@ -0,0 +1,177 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import Button from 'Components/Link/Button';
+import Modal from 'Components/Modal/Modal';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import { inputTypes, kinds, sizes } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+
+class RemoveQueueItemModal extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      remove: true,
+      blocklist: false,
+      skipredownload: false
+    };
+  }
+
+  //
+  // Control
+
+  resetState = function() {
+    this.setState({
+      remove: true,
+      blocklist: false,
+      skipredownload: false
+    });
+  }
+
+  //
+  // Listeners
+
+  onRemoveChange = ({ value }) => {
+    this.setState({ remove: value });
+  }
+
+  onBlocklistChange = ({ value }) => {
+    this.setState({ blocklist: value });
+  }
+
+  onSkipReDownloadChange = ({ value }) => {
+    this.setState({ skipredownload: value });
+  }
+
+  onRemoveConfirmed = () => {
+    const state = this.state;
+
+    this.resetState();
+    this.props.onRemovePress(state);
+  }
+
+  onModalClose = () => {
+    this.resetState();
+    this.props.onModalClose();
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      isOpen,
+      sourceTitle,
+      canIgnore,
+      isPending
+    } = this.props;
+
+    const { remove, blocklist, skipredownload } = this.state;
+
+    return (
+      <Modal
+        isOpen={isOpen}
+        size={sizes.MEDIUM}
+        onModalClose={this.onModalClose}
+      >
+        <ModalContent
+          onModalClose={this.onModalClose}
+        >
+          <ModalHeader>
+            Remove - {sourceTitle}
+          </ModalHeader>
+
+          <ModalBody>
+            <div>
+              Are you sure you want to remove '{sourceTitle}' from the queue?
+            </div>
+
+            {
+              isPending ?
+                null :
+                <FormGroup>
+                  <FormLabel>
+                    {translate('RemoveFromDownloadClient')}
+                  </FormLabel>
+
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="remove"
+                    value={remove}
+                    helpTextWarning={translate('RemoveHelpTextWarning')}
+                    isDisabled={!canIgnore}
+                    onChange={this.onRemoveChange}
+                  />
+                </FormGroup>
+            }
+
+            <FormGroup>
+              <FormLabel>
+                {translate('BlocklistRelease')}
+              </FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="blocklist"
+                value={blocklist}
+                helpText={translate('BlocklistHelpText')}
+                onChange={this.onBlocklistChange}
+              />
+            </FormGroup>
+
+            {
+              blocklist &&
+                <FormGroup>
+                  <FormLabel>
+                    {translate('SkipRedownload')}
+                  </FormLabel>
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="skipredownload"
+                    value={skipredownload}
+                    helpText={translate('SkipredownloadHelpText')}
+                    onChange={this.onSkipReDownloadChange}
+                  />
+                </FormGroup>
+            }
+
+          </ModalBody>
+
+          <ModalFooter>
+            <Button onPress={this.onModalClose}>
+              Close
+            </Button>
+
+            <Button
+              kind={kinds.DANGER}
+              onPress={this.onRemoveConfirmed}
+            >
+              Remove
+            </Button>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
+    );
+  }
+}
+
+RemoveQueueItemModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  sourceTitle: PropTypes.string.isRequired,
+  canIgnore: PropTypes.bool.isRequired,
+  isPending: PropTypes.bool.isRequired,
+  onRemovePress: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default RemoveQueueItemModal;

frontend/src/Activity/Queue/RemoveQueueItemModal.tsx

@@ -1,230 +0,0 @@
-import React, { useCallback, useMemo, useState } from 'react';
-import FormGroup from 'Components/Form/FormGroup';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import Button from 'Components/Link/Button';
-import Modal from 'Components/Modal/Modal';
-import ModalBody from 'Components/Modal/ModalBody';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalFooter from 'Components/Modal/ModalFooter';
-import ModalHeader from 'Components/Modal/ModalHeader';
-import { inputTypes, kinds, sizes } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import styles from './RemoveQueueItemModal.css';
-
-interface RemovePressProps {
-  remove: boolean;
-  changeCategory: boolean;
-  blocklist: boolean;
-  skipRedownload: boolean;
-}
-
-interface RemoveQueueItemModalProps {
-  isOpen: boolean;
-  sourceTitle: string;
-  canChangeCategory: boolean;
-  canIgnore: boolean;
-  isPending: boolean;
-  selectedCount?: number;
-  onRemovePress(props: RemovePressProps): void;
-  onModalClose: () => void;
-}
-
-type RemovalMethod = 'removeFromClient' | 'changeCategory' | 'ignore';
-type BlocklistMethod =
-  | 'doNotBlocklist'
-  | 'blocklistAndSearch'
-  | 'blocklistOnly';
-
-function RemoveQueueItemModal(props: RemoveQueueItemModalProps) {
-  const {
-    isOpen,
-    sourceTitle,
-    canIgnore,
-    canChangeCategory,
-    isPending,
-    selectedCount,
-    onRemovePress,
-    onModalClose,
-  } = props;
-
-  const multipleSelected = selectedCount && selectedCount > 1;
-
-  const [removalMethod, setRemovalMethod] =
-    useState<RemovalMethod>('removeFromClient');
-  const [blocklistMethod, setBlocklistMethod] =
-    useState<BlocklistMethod>('doNotBlocklist');
-
-  const { title, message } = useMemo(() => {
-    if (!selectedCount) {
-      return {
-        title: translate('RemoveQueueItem', { sourceTitle }),
-        message: translate('RemoveQueueItemConfirmation', { sourceTitle }),
-      };
-    }
-
-    if (selectedCount === 1) {
-      return {
-        title: translate('RemoveSelectedItem'),
-        message: translate('RemoveSelectedItemQueueMessageText'),
-      };
-    }
-
-    return {
-      title: translate('RemoveSelectedItems'),
-      message: translate('RemoveSelectedItemsQueueMessageText', {
-        selectedCount,
-      }),
-    };
-  }, [sourceTitle, selectedCount]);
-
-  const removalMethodOptions = useMemo(() => {
-    return [
-      {
-        key: 'removeFromClient',
-        value: translate('RemoveFromDownloadClient'),
-        hint: multipleSelected
-          ? translate('RemoveMultipleFromDownloadClientHint')
-          : translate('RemoveFromDownloadClientHint'),
-      },
-      {
-        key: 'changeCategory',
-        value: translate('ChangeCategory'),
-        isDisabled: !canChangeCategory,
-        hint: multipleSelected
-          ? translate('ChangeCategoryMultipleHint')
-          : translate('ChangeCategoryHint'),
-      },
-      {
-        key: 'ignore',
-        value: multipleSelected
-          ? translate('IgnoreDownloads')
-          : translate('IgnoreDownload'),
-        isDisabled: !canIgnore,
-        hint: multipleSelected
-          ? translate('IgnoreDownloadsHint')
-          : translate('IgnoreDownloadHint'),
-      },
-    ];
-  }, [canChangeCategory, canIgnore, multipleSelected]);
-
-  const blocklistMethodOptions = useMemo(() => {
-    return [
-      {
-        key: 'doNotBlocklist',
-        value: translate('DoNotBlocklist'),
-        hint: translate('DoNotBlocklistHint'),
-      },
-      {
-        key: 'blocklistAndSearch',
-        value: translate('BlocklistAndSearch'),
-        hint: multipleSelected
-          ? translate('BlocklistAndSearchMultipleHint')
-          : translate('BlocklistAndSearchHint'),
-      },
-      {
-        key: 'blocklistOnly',
-        value: translate('BlocklistOnly'),
-        hint: multipleSelected
-          ? translate('BlocklistMultipleOnlyHint')
-          : translate('BlocklistOnlyHint'),
-      },
-    ];
-  }, [multipleSelected]);
-
-  const handleRemovalMethodChange = useCallback(
-    ({ value }: { value: RemovalMethod }) => {
-      setRemovalMethod(value);
-    },
-    [setRemovalMethod]
-  );
-
-  const handleBlocklistMethodChange = useCallback(
-    ({ value }: { value: BlocklistMethod }) => {
-      setBlocklistMethod(value);
-    },
-    [setBlocklistMethod]
-  );
-
-  const handleConfirmRemove = useCallback(() => {
-    onRemovePress({
-      remove: removalMethod === 'removeFromClient',
-      changeCategory: removalMethod === 'changeCategory',
-      blocklist: blocklistMethod !== 'doNotBlocklist',
-      skipRedownload: blocklistMethod === 'blocklistOnly',
-    });
-
-    setRemovalMethod('removeFromClient');
-    setBlocklistMethod('doNotBlocklist');
-  }, [
-    removalMethod,
-    blocklistMethod,
-    setRemovalMethod,
-    setBlocklistMethod,
-    onRemovePress,
-  ]);
-
-  const handleModalClose = useCallback(() => {
-    setRemovalMethod('removeFromClient');
-    setBlocklistMethod('doNotBlocklist');
-
-    onModalClose();
-  }, [setRemovalMethod, setBlocklistMethod, onModalClose]);
-
-  return (
-    <Modal isOpen={isOpen} size={sizes.MEDIUM} onModalClose={handleModalClose}>
-      <ModalContent onModalClose={handleModalClose}>
-        <ModalHeader>{title}</ModalHeader>
-
-        <ModalBody>
-          <div className={styles.message}>{message}</div>
-
-          {isPending ? null : (
-            <FormGroup>
-              <FormLabel>{translate('RemoveQueueItemRemovalMethod')}</FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.SELECT}
-                name="removalMethod"
-                value={removalMethod}
-                values={removalMethodOptions}
-                isDisabled={!canChangeCategory && !canIgnore}
-                helpTextWarning={translate(
-                  'RemoveQueueItemRemovalMethodHelpTextWarning'
-                )}
-                onChange={handleRemovalMethodChange}
-              />
-            </FormGroup>
-          )}
-
-          <FormGroup>
-            <FormLabel>
-              {multipleSelected
-                ? translate('BlocklistReleases')
-                : translate('BlocklistRelease')}
-            </FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.SELECT}
-              name="blocklistMethod"
-              value={blocklistMethod}
-              values={blocklistMethodOptions}
-              helpText={translate('BlocklistReleaseHelpText')}
-              onChange={handleBlocklistMethodChange}
-            />
-          </FormGroup>
-        </ModalBody>
-
-        <ModalFooter>
-          <Button onPress={handleModalClose}>{translate('Close')}</Button>
-
-          <Button kind={kinds.DANGER} onPress={handleConfirmRemove}>
-            {translate('Remove')}
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-}
-
-export default RemoveQueueItemModal;

frontend/src/Activity/Queue/RemoveQueueItemsModal.js

@@ -0,0 +1,178 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import Button from 'Components/Link/Button';
+import Modal from 'Components/Modal/Modal';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import { inputTypes, kinds, sizes } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import styles from './RemoveQueueItemsModal.css';
+
+class RemoveQueueItemsModal extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      remove: true,
+      blocklist: false,
+      skipredownload: false
+    };
+  }
+
+  //
+  // Control
+
+   resetState = function() {
+     this.setState({
+       remove: true,
+       blocklist: false,
+       skipredownload: false
+     });
+   }
+
+   //
+   // Listeners
+
+   onRemoveChange = ({ value }) => {
+     this.setState({ remove: value });
+   }
+
+  onBlocklistChange = ({ value }) => {
+    this.setState({ blocklist: value });
+  }
+
+  onSkipReDownloadChange = ({ value }) => {
+    this.setState({ skipredownload: value });
+  }
+
+  onRemoveConfirmed = () => {
+    const state = this.state;
+
+    this.resetState();
+    this.props.onRemovePress(state);
+  }
+
+  onModalClose = () => {
+    this.resetState();
+    this.props.onModalClose();
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      isOpen,
+      selectedCount,
+      canIgnore,
+      allPending
+    } = this.props;
+
+    const { remove, blocklist, skipredownload } = this.state;
+
+    return (
+      <Modal
+        isOpen={isOpen}
+        size={sizes.MEDIUM}
+        onModalClose={this.onModalClose}
+      >
+        <ModalContent
+          onModalClose={this.onModalClose}
+        >
+          <ModalHeader>
+            Remove Selected Item{selectedCount > 1 ? 's' : ''}
+          </ModalHeader>
+
+          <ModalBody>
+            <div className={styles.message}>
+              Are you sure you want to remove {selectedCount} item{selectedCount > 1 ? 's' : ''} from the queue?
+            </div>
+
+            {
+              allPending ?
+                null :
+                <FormGroup>
+                  <FormLabel>
+                    {translate('RemoveFromDownloadClient')}
+                  </FormLabel>
+
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="remove"
+                    value={remove}
+                    helpTextWarning={translate('RemoveHelpTextWarning')}
+                    isDisabled={!canIgnore}
+                    onChange={this.onRemoveChange}
+                  />
+                </FormGroup>
+            }
+
+            <FormGroup>
+              <FormLabel>
+                Add Release{selectedCount > 1 ? 's' : ''} To Blocklist
+              </FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="blocklist"
+                value={blocklist}
+                helpText={translate('BlocklistHelpText')}
+                onChange={this.onBlocklistChange}
+              />
+            </FormGroup>
+
+            {
+              blocklist &&
+                <FormGroup>
+                  <FormLabel>
+                    {translate('SkipRedownload')}
+                  </FormLabel>
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="skipredownload"
+                    value={skipredownload}
+                    helpText={translate('SkipredownloadHelpText')}
+                    onChange={this.onSkipReDownloadChange}
+                  />
+                </FormGroup>
+            }
+
+          </ModalBody>
+
+          <ModalFooter>
+            <Button onPress={this.onModalClose}>
+              Close
+            </Button>
+
+            <Button
+              kind={kinds.DANGER}
+              onPress={this.onRemoveConfirmed}
+            >
+              Remove
+            </Button>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
+    );
+  }
+}
+
+RemoveQueueItemsModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  selectedCount: PropTypes.number.isRequired,
+  canIgnore: PropTypes.bool.isRequired,
+  allPending: PropTypes.bool.isRequired,
+  onRemovePress: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default RemoveQueueItemsModal;

frontend/src/Activity/Queue/TimeleftCell.css.d.ts

@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'timeleft': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/App/App.js

@@ -4,7 +4,6 @@ import React from 'react';
 import DocumentTitle from 'react-document-title';
 import { Provider } from 'react-redux';
 import PageConnector from 'Components/Page/PageConnector';
-import ApplyTheme from './ApplyTheme';
 import AppRoutes from './AppRoutes';
 
 function App({ store, history }) {
@@ -12,11 +11,9 @@ function App({ store, history }) {
     <DocumentTitle title={window.Readarr.instanceName}>
       <Provider store={store}>
         <ConnectedRouter history={history}>
-          <ApplyTheme>
+          <PageConnector>
-            <PageConnector>
+            <AppRoutes app={App} />
-              <AppRoutes app={App} />
+          </PageConnector>
-            </PageConnector>
-          </ApplyTheme>
         </ConnectedRouter>
       </Provider>
     </DocumentTitle>

frontend/src/App/AppRoutes.js

@@ -13,7 +13,6 @@ import CalendarPageConnector from 'Calendar/CalendarPageConnector';
 import NotFound from 'Components/NotFound';
 import Switch from 'Components/Router/Switch';
 import AddNewItemConnector from 'Search/AddNewItemConnector';
-import CustomFormatSettingsConnector from 'Settings/CustomFormats/CustomFormatSettingsConnector';
 import DevelopmentSettingsConnector from 'Settings/Development/DevelopmentSettingsConnector';
 import DownloadClientSettingsConnector from 'Settings/DownloadClients/DownloadClientSettingsConnector';
 import GeneralSettingsConnector from 'Settings/General/GeneralSettingsConnector';
@@ -23,7 +22,7 @@ import MediaManagementConnector from 'Settings/MediaManagement/MediaManagementCo
 import MetadataSettings from 'Settings/Metadata/MetadataSettings';
 import NotificationSettings from 'Settings/Notifications/NotificationSettings';
 import Profiles from 'Settings/Profiles/Profiles';
-import QualityConnector from 'Settings/Quality/QualityConnector';
+import Quality from 'Settings/Quality/Quality';
 import Settings from 'Settings/Settings';
 import TagSettings from 'Settings/Tags/TagSettings';
 import UISettingsConnector from 'Settings/UI/UISettingsConnector';
@@ -32,7 +31,7 @@ import LogsTableConnector from 'System/Events/LogsTableConnector';
 import Logs from 'System/Logs/Logs';
 import Status from 'System/Status/Status';
 import Tasks from 'System/Tasks/Tasks';
-import Updates from 'System/Updates/Updates';
+import UpdatesConnector from 'System/Updates/UpdatesConnector';
 import UnmappedFilesTableConnector from 'UnmappedFiles/UnmappedFilesTableConnector';
 import getPathWithUrlBase from 'Utilities/getPathWithUrlBase';
 import CutoffUnmetConnector from 'Wanted/CutoffUnmet/CutoffUnmetConnector';
@@ -173,12 +172,7 @@ function AppRoutes(props) {
 
       <Route
         path="/settings/quality"
-        component={QualityConnector}
+        component={Quality}
-      />
-
-      <Route
-        path="/settings/customformats"
-        component={CustomFormatSettingsConnector}
       />
 
       <Route
@@ -247,7 +241,7 @@ function AppRoutes(props) {
 
       <Route
         path="/system/updates"
-        component={Updates}
+        component={UpdatesConnector}
       />
 
       <Route

frontend/src/App/AppUpdatedModalContent.css

@@ -1,7 +1,6 @@
 .version {
   margin: 0 3px;
   font-weight: bold;
-  font-family: var(--defaultFontFamily);
 }
 
 .maintenance {

frontend/src/App/AppUpdatedModalContent.css.d.ts

@@ -1,9 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'changes': string;
-  'maintenance': string;
-  'version': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/App/AppUpdatedModalContent.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Button from 'Components/Link/Button';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
@@ -12,47 +11,9 @@ import UpdateChanges from 'System/Updates/UpdateChanges';
 import translate from 'Utilities/String/translate';
 import styles from './AppUpdatedModalContent.css';
 
-function mergeUpdates(items, version, prevVersion) {
-  let installedIndex = items.findIndex((u) => u.version === version);
-  let installedPreviouslyIndex = items.findIndex((u) => u.version === prevVersion);
-
-  if (installedIndex === -1) {
-    installedIndex = 0;
-  }
-
-  if (installedPreviouslyIndex === -1) {
-    installedPreviouslyIndex = items.length;
-  } else if (installedPreviouslyIndex === installedIndex && items.length) {
-    installedPreviouslyIndex += 1;
-  }
-
-  const appliedUpdates = items.slice(installedIndex, installedPreviouslyIndex);
-
-  if (!appliedUpdates.length) {
-    return null;
-  }
-
-  const appliedChanges = { new: [], fixed: [] };
-  appliedUpdates.forEach((u) => {
-    if (u.changes) {
-      appliedChanges.new.push(... u.changes.new);
-      appliedChanges.fixed.push(... u.changes.fixed);
-    }
-  });
-
-  const mergedUpdate = Object.assign({}, appliedUpdates[0], { changes: appliedChanges });
-
-  if (!appliedChanges.new.length && !appliedChanges.fixed.length) {
-    mergedUpdate.changes = null;
-  }
-
-  return mergedUpdate;
-}
-
 function AppUpdatedModalContent(props) {
   const {
     version,
-    prevVersion,
     isPopulated,
     error,
     items,
@@ -60,17 +21,17 @@ function AppUpdatedModalContent(props) {
     onModalClose
   } = props;
 
-  const update = mergeUpdates(items, version, prevVersion);
+  const update = items[0];
 
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {translate('AppUpdated', { appName: 'Readarr' })}
+        Readarr Updated
       </ModalHeader>
 
       <ModalBody>
         <div>
-          <InlineMarkdown data={translate('AppUpdatedVersion', { appName: 'Readarr', version })} blockClassName={styles.version} />
+          Version <span className={styles.version}>{version}</span> of Readarr has been installed, in order to get the latest changes you'll need to reload Readarr.
         </div>
 
         {
@@ -78,14 +39,16 @@ function AppUpdatedModalContent(props) {
             <div>
               {
                 !update.changes &&
-                  <div className={styles.maintenance}>{translate('MaintenanceRelease')}</div>
+                  <div className={styles.maintenance}>
+                    {translate('MaintenanceRelease')}
+                  </div>
               }
 
               {
                 !!update.changes &&
                   <div>
                     <div className={styles.changes}>
-                      {translate('WhatsNew')}
+                      What's new?
                     </div>
 
                     <UpdateChanges
@@ -112,14 +75,14 @@ function AppUpdatedModalContent(props) {
         <Button
           onPress={onSeeChangesPress}
         >
-          {translate('RecentChanges')}
+          Recent Changes
         </Button>
 
         <Button
           kind={kinds.PRIMARY}
           onPress={onModalClose}
         >
-          {translate('Reload')}
+          Reload
         </Button>
       </ModalFooter>
     </ModalContent>
@@ -128,7 +91,6 @@ function AppUpdatedModalContent(props) {
 
 AppUpdatedModalContent.propTypes = {
   version: PropTypes.string.isRequired,
-  prevVersion: PropTypes.string,
   isPopulated: PropTypes.bool.isRequired,
   error: PropTypes.object,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,

frontend/src/App/AppUpdatedModalContentConnector.js

@@ -8,9 +8,8 @@ import AppUpdatedModalContent from './AppUpdatedModalContent';
 function createMapStateToProps() {
   return createSelector(
     (state) => state.app.version,
-    (state) => state.app.prevVersion,
     (state) => state.system.updates,
-    (version, prevVersion, updates) => {
+    (version, updates) => {
       const {
         isPopulated,
         error,
@@ -19,7 +18,6 @@ function createMapStateToProps() {
 
       return {
         version,
-        prevVersion,
         isPopulated,
         error,
         items

frontend/src/App/ApplyTheme.js

@@ -1,49 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Fragment, useCallback, useEffect } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import themes from 'Styles/Themes';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.settings.ui.item.theme || window.Readarr.theme,
-    (
-      theme
-    ) => {
-      return {
-        theme
-      };
-    }
-  );
-}
-
-function ApplyTheme({ theme, children }) {
-  // Update the CSS Variables
-  const updateCSSVariables = useCallback(() => {
-    const arrayOfVariableKeys = Object.keys(themes[theme]);
-    const arrayOfVariableValues = Object.values(themes[theme]);
-
-    // Loop through each array key and set the CSS Variables
-    arrayOfVariableKeys.forEach((cssVariableKey, index) => {
-      // Based on our snippet from MDN
-      document.documentElement.style.setProperty(
-        `--${cssVariableKey}`,
-        arrayOfVariableValues[index]
-      );
-    });
-  }, [theme]);
-
-  // On Component Mount and Component Update
-  useEffect(() => {
-    updateCSSVariables(theme);
-  }, [updateCSSVariables, theme]);
-
-  return <Fragment>{children}</Fragment>;
-}
-
-ApplyTheme.propTypes = {
-  theme: PropTypes.string.isRequired,
-  children: PropTypes.object.isRequired
-};
-
-export default connect(createMapStateToProps)(ApplyTheme);

frontend/src/App/ConnectionLostModal.css.d.ts

@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'automatic': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/App/ConnectionLostModal.js

@@ -7,7 +7,6 @@ import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
 import styles from './ConnectionLostModal.css';
 
 function ConnectionLostModal(props) {
@@ -23,16 +22,16 @@ function ConnectionLostModal(props) {
     >
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          {translate('ConnectionLost')}
+          Connection Lost
         </ModalHeader>
 
         <ModalBody>
           <div>
-            {translate('ConnectionLostToBackend', { appName: 'Readarr' })}
+            Readarr has lost its connection to the backend and will need to be reloaded to restore functionality.
           </div>
 
           <div className={styles.automatic}>
-            {translate('ConnectionLostReconnect', { appName: 'Readarr' })}
+            Readarr will try to connect automatically, or you can click reload below.
           </div>
         </ModalBody>
         <ModalFooter>
@@ -40,7 +39,7 @@ function ConnectionLostModal(props) {
             kind={kinds.PRIMARY}
             onPress={onModalClose}
           >
-            {translate('Reload')}
+            Reload
           </Button>
         </ModalFooter>
       </ModalContent>

frontend/src/App/ModelBase.ts

@@ -1,5 +0,0 @@
-interface ModelBase {
-  id: number;
-}
-
-export default ModelBase;

frontend/src/App/State/AppSectionState.ts

@@ -1,48 +0,0 @@
-import SortDirection from 'Helpers/Props/SortDirection';
-
-export interface Error {
-  responseJSON: {
-    message: string;
-  };
-}
-
-export interface AppSectionDeleteState {
-  isDeleting: boolean;
-  deleteError: Error;
-}
-
-export interface AppSectionSaveState {
-  isSaving: boolean;
-  saveError: Error;
-}
-
-export interface PagedAppSectionState {
-  pageSize: number;
-}
-
-export interface AppSectionSchemaState<T> {
-  isSchemaFetching: boolean;
-  isSchemaPopulated: boolean;
-  schemaError: Error;
-  schema: {
-    items: T[];
-  };
-}
-
-export interface AppSectionItemState<T> {
-  isFetching: boolean;
-  isPopulated: boolean;
-  error: Error;
-  item: T;
-}
-
-interface AppSectionState<T> {
-  isFetching: boolean;
-  isPopulated: boolean;
-  error: Error;
-  items: T[];
-  sortKey: string;
-  sortDirection: SortDirection;
-}
-
-export default AppSectionState;

frontend/src/App/State/AppState.ts

@@ -1,60 +0,0 @@
-import AuthorsAppState from './AuthorsAppState';
-import CommandAppState from './CommandAppState';
-import SettingsAppState from './SettingsAppState';
-import SystemAppState from './SystemAppState';
-import TagsAppState from './TagsAppState';
-
-interface FilterBuilderPropOption {
-  id: string;
-  name: string;
-}
-
-export interface FilterBuilderProp<T> {
-  name: string;
-  label: string;
-  type: string;
-  valueType?: string;
-  optionsSelector?: (items: T[]) => FilterBuilderPropOption[];
-}
-
-export interface PropertyFilter {
-  key: string;
-  value: boolean | string | number | string[] | number[];
-  type: string;
-}
-
-export interface Filter {
-  key: string;
-  label: string;
-  filers: PropertyFilter[];
-}
-
-export interface CustomFilter {
-  id: number;
-  type: string;
-  label: string;
-  filers: PropertyFilter[];
-}
-
-export interface AppSectionState {
-  isConnected: boolean;
-  isReconnecting: boolean;
-  version: string;
-  prevVersion?: string;
-  dimensions: {
-    isSmallScreen: boolean;
-    width: number;
-    height: number;
-  };
-}
-
-interface AppState {
-  app: AppSectionState;
-  authors: AuthorsAppState;
-  commands: CommandAppState;
-  settings: SettingsAppState;
-  system: SystemAppState;
-  tags: TagsAppState;
-}
-
-export default AppState;

frontend/src/App/State/AuthorsAppState.ts

@@ -1,18 +0,0 @@
-import AppSectionState, {
-  AppSectionDeleteState,
-  AppSectionSaveState,
-} from 'App/State/AppSectionState';
-import Author from 'Author/Author';
-
-interface AuthorsAppState
-  extends AppSectionState<Author>,
-    AppSectionDeleteState,
-    AppSectionSaveState {
-  itemMap: Record<number, number>;
-
-  deleteOptions: {
-    addImportListExclusion: boolean;
-  };
-}
-
-export default AuthorsAppState;

frontend/src/App/State/CommandAppState.ts

@@ -1,6 +0,0 @@
-import AppSectionState from 'App/State/AppSectionState';
-import Command from 'Commands/Command';
-
-export type CommandAppState = AppSectionState<Command>;
-
-export default CommandAppState;

frontend/src/App/State/SettingsAppState.ts

@@ -1,48 +0,0 @@
-import AppSectionState, {
-  AppSectionDeleteState,
-  AppSectionItemState,
-  AppSectionSaveState,
-} from 'App/State/AppSectionState';
-import DownloadClient from 'typings/DownloadClient';
-import ImportList from 'typings/ImportList';
-import Indexer from 'typings/Indexer';
-import IndexerFlag from 'typings/IndexerFlag';
-import Notification from 'typings/Notification';
-import General from 'typings/Settings/General';
-import UiSettings from 'typings/Settings/UiSettings';
-
-export interface DownloadClientAppState
-  extends AppSectionState<DownloadClient>,
-    AppSectionDeleteState,
-    AppSectionSaveState {}
-
-export type GeneralAppState = AppSectionItemState<General>;
-
-export interface ImportListAppState
-  extends AppSectionState<ImportList>,
-    AppSectionDeleteState,
-    AppSectionSaveState {}
-
-export interface IndexerAppState
-  extends AppSectionState<Indexer>,
-    AppSectionDeleteState,
-    AppSectionSaveState {}
-
-export interface NotificationAppState
-  extends AppSectionState<Notification>,
-    AppSectionDeleteState {}
-
-export type IndexerFlagSettingsAppState = AppSectionState<IndexerFlag>;
-export type UiSettingsAppState = AppSectionState<UiSettings>;
-
-interface SettingsAppState {
-  downloadClients: DownloadClientAppState;
-  general: GeneralAppState;
-  importLists: ImportListAppState;
-  indexerFlags: IndexerFlagSettingsAppState;
-  indexers: IndexerAppState;
-  notifications: NotificationAppState;
-  ui: UiSettingsAppState;
-}
-
-export default SettingsAppState;

frontend/src/App/State/SystemAppState.ts

@@ -1,13 +0,0 @@
-import SystemStatus from 'typings/SystemStatus';
-import Update from 'typings/Update';
-import AppSectionState, { AppSectionItemState } from './AppSectionState';
-
-export type SystemStatusAppState = AppSectionItemState<SystemStatus>;
-export type UpdateAppState = AppSectionState<Update>;
-
-interface SystemAppState {
-  updates: UpdateAppState;
-  status: SystemStatusAppState;
-}
-
-export default SystemAppState;

frontend/src/App/State/TagsAppState.ts

@@ -1,12 +0,0 @@
-import ModelBase from 'App/ModelBase';
-import AppSectionState, {
-  AppSectionDeleteState,
-} from 'App/State/AppSectionState';
-
-export interface Tag extends ModelBase {
-  label: string;
-}
-
-interface TagsAppState extends AppSectionState<Tag>, AppSectionDeleteState {}
-
-export default TagsAppState;

frontend/src/Author/Author.ts

@@ -1,18 +0,0 @@
-import ModelBase from 'App/ModelBase';
-
-interface Author extends ModelBase {
-  added: string;
-  genres: string[];
-  monitored: boolean;
-  overview: string;
-  path: string;
-  qualityProfileId: number;
-  metadataProfileId: number;
-  rootFolderPath: string;
-  sortName: string;
-  tags: number[];
-  authorName: string;
-  isSaving?: boolean;
-}
-
-export default Author;

frontend/src/Author/AuthorImage.js

@@ -7,10 +7,13 @@ function findImage(images, coverType) {
 }
 
 function getUrl(image, coverType, size) {
-  const imageUrl = image?.url;
+  if (image) {
+    // Remove protocol
+    let url = image.url;
 
-  if (imageUrl) {
+    url = url.replace(`${coverType}.jpg`, `${coverType}-${size}.jpg`);
-    return imageUrl.replace(`${coverType}.jpg`, `${coverType}-${size}.jpg`);
+
+    return url;
   }
 }
 
@@ -96,7 +99,7 @@ class AuthorImage extends Component {
     if (this.props.onError) {
       this.props.onError();
     }
-  };
+  }
 
   onLoad = () => {
     this.setState({
@@ -107,7 +110,7 @@ class AuthorImage extends Component {
     if (this.props.onLoad) {
       this.props.onLoad();
     }
-  };
+  }
 
   //
   // Render

frontend/src/Author/AuthorNameLink.js

@@ -2,11 +2,11 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Link from 'Components/Link/Link';
 
-function AuthorNameLink({ titleSlug, authorName, ...otherProps }) {
+function AuthorNameLink({ titleSlug, authorName }) {
   const link = `/author/${titleSlug}`;
 
   return (
-    <Link to={link} {...otherProps}>
+    <Link to={link}>
       {authorName}
     </Link>
   );

frontend/src/Author/Delete/DeleteAuthorModalContent.css

@@ -8,5 +8,5 @@
 
 .deleteFilesMessage {
   margin-top: 20px;
-  color: var(--dangerColor);
+  color: $dangerColor;
 }

frontend/src/Author/Delete/DeleteAuthorModalContent.css.d.ts

@@ -1,9 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'deleteFilesMessage': string;
-  'pathContainer': string;
-  'pathIcon': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/Author/Delete/DeleteAuthorModalContent.js

@@ -33,11 +33,11 @@ class DeleteAuthorModalContent extends Component {
 
   onDeleteFilesChange = ({ value }) => {
     this.setState({ deleteFiles: value });
-  };
+  }
 
   onAddImportListExclusionChange = ({ value }) => {
     this.setState({ addImportListExclusion: value });
-  };
+  }
 
   onDeleteAuthorConfirmed = () => {
     const deleteFiles = this.state.deleteFiles;
@@ -46,7 +46,7 @@ class DeleteAuthorModalContent extends Component {
     this.setState({ deleteFiles: false });
     this.setState({ addImportListExclusion: false });
     this.props.onDeletePress(deleteFiles, addImportListExclusion);
-  };
+  }
 
   //
   // Render

frontend/src/Author/Delete/DeleteAuthorModalContentConnector.js

@@ -32,7 +32,7 @@ class DeleteAuthorModalContentConnector extends Component {
     });
 
     this.props.onModalClose(true);
-  };
+  }
 
   //
   // Render

frontend/src/Author/Details/AuthorAlternateTitles.css.d.ts

@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'alternateTitle': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/Author/Details/AuthorDetails.css

@@ -9,7 +9,7 @@
 }
 
 .metadataMessage {
-  color: var(--helpTextColor);
+  color: $helpTextColor;
   text-align: center;
   font-weight: 300;
   font-size: 20px;
@@ -22,7 +22,7 @@
 .tabList {
   margin: 0;
   padding: 0;
-  border-bottom: 1px solid var(--lightGray);
+  border-bottom: 1px solid $lightGray;
 }
 
 .tab {
@@ -37,17 +37,13 @@
 }
 
 .selectedTab {
-  border-bottom: 4px solid var(--linkColor);
+  border-bottom: 4px solid $linkColor;
 }
 
 .tabContent {
   margin-top: 20px;
 }
 
-.filterIcon {
-  float: right;
-}
-
 .authorNavigationButtons {
   position: absolute;
   right: 0;
@@ -67,7 +63,7 @@
   white-space: nowrap;
 
   &:hover {
-    color: var(--iconButtonHoverLightColor);
+    color: $iconButtonHoverLightColor;
   }
 }
 

frontend/src/Author/Details/AuthorDetails.css.d.ts

@@ -1,18 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'authorNavigationButton': string;
-  'authorNavigationButtons': string;
-  'authorUpButton': string;
-  'contentContainer': string;
-  'errorMessage': string;
-  'filterIcon': string;
-  'innerContentBody': string;
-  'metadataMessage': string;
-  'selectedTab': string;
-  'tab': string;
-  'tabContent': string;
-  'tabList': string;
-}
-export const cssExports: CssExports;
-export default cssExports;