New: Add Monitored specification to Auto Tagging

(cherry picked from commit 8bd91bd86b5955da5d19c9f866e7de701b843e7b)
New: Book interactive search modal size
2026-04-18 21:34:28 -04:00 · 2023-08-01 23:59:43 +00:00 · 2023-08-01 18:32:14 +03:00 · 2023-07-31 08:33:52 +03:00 · 2023-07-31 08:01:50 +03:00 · 2023-07-30 09:12:56 +03:00
2261 changed files with 57750 additions and 24048 deletions
@@ -19,10 +19,10 @@ indent_size = 4
 dotnet_sort_system_directives_first = true

 # Avoid "this." and "Me." if not necessary
-dotnet_style_qualification_for_field = false:refactoring
-dotnet_style_qualification_for_property = false:refactoring
-dotnet_style_qualification_for_method = false:refactoring
-dotnet_style_qualification_for_event = false:refactoring
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning

 # Indentation preferences
 csharp_indent_block_contents = true
@@ -32,17 +32,22 @@ csharp_indent_case_contents_when_block = true
 csharp_indent_switch_labels = true
 csharp_indent_labels = flush_left

-dotnet_style_qualification_for_field = false:suggestion
-dotnet_style_qualification_for_property = false:suggestion
-dotnet_style_qualification_for_method = false:suggestion
-dotnet_style_qualification_for_event = false:suggestion
 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:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_for_built_in_types = true
+csharp_style_var_when_type_is_apparent = true
+csharp_style_var_elsewhere = true
+# 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
@@ -270,7 +275,7 @@ dotnet_diagnostic.CA5397.severity = suggestion



-[*.{js,html,js,hbs,less,css}]
+[*.{js,html,hbs,less,css,ts,tsx}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
@@ -1,9 +0,0 @@
-{
-  "paths": [
-    "frontend/src/**/*.js"
-  ],
-  "ignored": [
-    "**/node_modules/**/*"
-  ],
-  "port": 5004
-}
@@ -1,14 +1,13 @@
 name: Bug Report
-title: "[BUG]: "
 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
  attributes:
    label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the bug you encountered.
+    description: Please search to see if an open or closed issue already exists for the bug you encountered. If a bug exists and is closed note that it may only be fixed in an unstable branch. 
    options:
-    - label: I have searched the existing issues
+    - label: I have searched the existing open and closed issues
      required: true
 - type: textarea
  attributes:
@@ -43,12 +42,14 @@ body:
        - **Docker Install**: Yes
        - **Using Reverse Proxy**: No
        - **Browser**: Firefox 90 (If UI related)
+        - **Database**: Sqlite 3.36.0
    value: |
        - OS: 
        - Readarr:
        - Docker Install:
        - Using Reverse Proxy:
        - Browser:
+        - Database:
    render: markdown
  validations:
    required: true
@@ -64,12 +65,18 @@ body:
    required: true
 - type: textarea
  attributes:
-    label: Anything else?
+    label: Trace Logs?
    description: |
      Trace Logs (https://wiki.servarr.com/readarr/troubleshooting#logging-and-log-files) 
-      Links? References? Anything that will give us more context about the issue you are encountering!
      ***Generally speaking, all bug reports must have trace logs provided.***
-
      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+      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
@@ -1,14 +1,13 @@
 name: Feature Request
-title: "[FEAT]: "
 description: 'Suggest an idea for Readarr'
 labels: ['Type: Feature Request', 'Status: Needs Triage']
 body:
 - type: checkboxes
  attributes:
    label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the feature you are requesting.
+    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.
    options:
-    - label: I have searched the existing issues
+    - label: I have searched the existing open and closed issues
      required: true
 - type: textarea
  attributes:
@@ -0,0 +1,28 @@
+'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
@@ -1,41 +0,0 @@
-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
@@ -0,0 +1,12 @@
+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
@@ -9,13 +9,13 @@ jobs:
  lock:
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/lock-threads@v2
+      - uses: dessant/lock-threads@v4
        with:
          github-token: ${{ github.token }}
-          issue-lock-inactive-days: '90'
-          issue-exclude-created-before: ''
-          issue-exclude-labels: ''
-          issue-lock-labels: ''
-          issue-lock-comment: ''
+          issue-inactive-days: '90'
+          exclude-issue-created-before: ''
+          exclude-any-issue-labels: ''
+          add-issue-labels: ''
+          issue-comment: ''
          issue-lock-reason: 'resolved'
          process-only: ''
@@ -8,7 +8,7 @@ jobs:
  support:
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/support-requests@v2
+      - uses: dessant/support-requests@v3
        with:
          github-token: ${{ github.token }}
          support-label: 'Type: Support'
@@ -19,3 +19,14 @@ jobs:
            or [Subreddit](https://reddit.com/r/readarr)
          close-issue: true
          lock-issue: false
+      - uses: dessant/support-requests@v3
+        with:
+          github-token: ${{ github.token }}
+          support-label: 'Status: Logs Needed'
+          issue-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).
+          close-issue: false
+          lock-issue: false
@@ -148,3 +148,6 @@ _temp_*/**/*
 ## Merge any idea folder
 */**/.idea
 *.iml
+
+# API doc generation
+.config/
@@ -1,5 +0,0 @@
-{
-  "files.associations": {
-    "*.yaml": "home-assistant"
-  }
-}
@@ -0,0 +1,132 @@
+# 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
@@ -1,51 +1,13 @@
-# How to Contribute #
+# How to Contribute

 We're always looking for people to help make Readarr even better, there are a number of ways to contribute.

-This file is updated on an ad-hoc basis, for the latest details please see the [contributing wiki page](https://wiki.servarr.com/readarr/contributing).
+This file has been moved to the wiki for the latest details please see the [contributing wiki page](https://wiki.servarr.com/readarr/contributing).

-## Documentation ##
-Setup guides, FAQ, the more information we have on the [wiki](https://wiki.servarr.com/readarr) the better.
+## Documentation

-## Development ##
+Setup guides, [FAQ](https://wiki.servarr.com/readarr/faq), the more information we have on the [wiki](https://wiki.servarr.com/readarr) the better.

-### Tools required ###
- Visual Studio 2019 or higher (https://www.visualstudio.com/vs/).  The community version is free and works (https://www.visualstudio.com/downloads/).
- HTML/Javascript editor of choice (VS Code/Sublime Text/Webstorm/Atom/etc)
- [Git](https://git-scm.com/downloads)
- [NodeJS](https://nodejs.org/en/download/) (Node 12.X.X or higher)
- [Yarn](https://yarnpkg.com/)
- .NET Core 5.0. 
+## Development

-### Getting started ###
-
-1. Fork Readarr
-2. Clone the repository into your development machine. [*info*](https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository-from-github)
-3. Install the required Node Packages `yarn install`
-4. Start gulp to monitor your dev environment for any changes that need post processing using `yarn start` command.
-5. Build the project in Visual Studio, Setting startup project to `Readarr.Console` and framework to `net5.0`
-6. Debug the project in Visual Studio
-7. Open http://localhost:8787
-
-### Contributing Code ###
- If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/Readarr/Readarr/issues "Github Issues") so work is not duplicated (If you want to add something not already on there, please talk to us first)
- Rebase from Readarr's develop branch, don't merge
- Make meaningful commits, or squash them
- Feel free to make a pull request before work is complete, this will let us see where its at and make comments/suggest improvements
- Reach out to us on the discord if you have any questions
- Add tests (unit/integration)
- Commit with *nix line endings for consistency (We checkout Windows and commit *nix)
- One feature/bug fix per pull request to keep things clean and easy to understand
- Use 4 spaces instead of tabs, this is the default for VS 2019 and WebStorm (to my knowledge)
-
-### Pull Requesting ###
- Only make pull requests to develop, never master, if you make a PR to master we'll comment on it and close it
- You're probably going to get some comments or questions from us, they will be to ensure consistency and maintainability
- We'll try to respond to pull requests as soon as possible, if its been a day or two, please reach out to us, we may have missed it
- Each PR should come from its own [feature branch](http://martinfowler.com/bliki/FeatureBranch.html) not develop in your fork, it should have a meaningful branch name (what is being added/fixed)
-  - new-feature (Good)
-  - fix-bug (Good)
-  - patch (Bad)
-  - develop (Bad)
-
-If you have any questions about any of this, please let us know.
+See the [Wiki Page](https://wiki.servarr.com/readarr/contributing)
@@ -1,56 +1,77 @@
 # Readarr

 [![Build Status](https://dev.azure.com/Readarr/Readarr/_apis/build/status/Readarr.Readarr?branchName=develop)](https://dev.azure.com/Readarr/Readarr/_build/latest?definitionId=1&branchName=develop)
-[![Docker Pulls](https://img.shields.io/docker/pulls/hotio/readarr)](https://hub.docker.com/r/hotio/readarr)
-[![Backers on Open Collective](https://opencollective.com/readarr/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/readarr/sponsors/badge.svg)](#sponsors)
+[![Translated](https://translate.servarr.com/widgets/servarr/-/readarr/svg-badge.svg)](https://translate.servarr.com/engage/readarr/?utm_source=widget)
+[![Docker Pulls](https://img.shields.io/docker/pulls/hotio/readarr)](https://wiki.servarr.com/readarr/installation#docker)
+[![Donors on Open Collective](https://opencollective.com/Readarr/backers/badge.svg)](#backers)
+[![Sponsors on Open Collective](https://opencollective.com/Readarr/sponsors/badge.svg)](#sponsors)
+[![Mega Sponsors on Open Collective](https://opencollective.com/Readarr/megasponsors/badge.svg)](#mega-sponsors)

-### Readarr is currently in beta testing and is generally still in a work in progress. Features may be broken, incomplete, or cause spontaneous combustion.
+### Readarr is currently in beta testing and is generally still in a work in progress. Features may be broken, incomplete, or cause spontaneous combustion

-Readarr is an ebook and audiobook collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new books from your favorite authors and will grab, sort and rename them.
+Readarr is an ebook and audiobook collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new books from your favorite authors and will grab, sort, and rename them.
 Note that only one type of a given book is supported. If you want both an audiobook and ebook of a given book you will need multiple instances.

-## Major Features Include:
+## Major Features Include

+* Can watch for better quality of the ebooks and audiobooks you have and do an automatic upgrade. *e.g. from PDF to AZW3*
 * Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc.
 * Automatically detects new books
 * Can scan your existing library and download any missing books
 * Automatic failed download handling will try another release if one fails
 * Manual search so you can pick any release or to see why a release was not downloaded automatically
+* Advanced customization for profiles, such that Readarr will always download the copy you want
 * Fully configurable book renaming
-* Full integration with SABnzbd and NZBGet
-* Full integration with Calibre (add to library, conversion)
+* SABnzbd, NZBGet, QBittorrent, Deluge, rTorrent, Transmission, uTorrent, and other download clients are supported and integrated
+* Full integration with Calibre (add to library, conversion) (Requires Calibre Content Server)
 * And a beautiful UI

 ## Support

-Note: GitHub Issues are for Bugs and Feature Requests Only
-
+[![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
+
 [![GitHub - Bugs and Feature Requests Only](https://img.shields.io/badge/github-issues-red.svg?maxAge=60)](https://github.com/Readarr/Readarr/issues)
-[![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/readarr)

-## Contributors
+## Contributors & Developers

-This project exists thanks to all the people who contribute. [Contribute](CONTRIBUTING.md).
-<a href="https://github.com/Readarr/Readarr/graphs/contributors"><img src="https://opencollective.com/Readarr/contributors.svg?width=890&button=false" /></a>
+[API Documentation](https://readarr.com/docs/api/)
+
+This project exists thanks to all the people who contribute.
+- [Contribute (GitHub)](CONTRIBUTING.md)
+- [Contribution (Wiki Article)](https://wiki.servarr.com/readarr/contributing)
+
+[![Contributors List](https://opencollective.com/Readarr/contributors.svg?width=890&button=false)](https://github.com/Readarr/Readarr/graphs/contributors)

 ## Backers

-Thank you to all our backers! 🙏 [Become a backer](https://opencollective.com/readarr#backer)
+Thank you to all our backers! 🙏 [Become a backer](https://opencollective.com/Readarr#backer)

-<img src="https://opencollective.com/readarr/backers.svg?width=890"></a>
+[![Backers List](https://opencollective.com/Readarr/backers.svg?width=890)](https://opencollective.com/Readarr#backer)

 ## Sponsors

 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [Become a sponsor](https://opencollective.com/readarr#sponsor)

-<img src="https://opencollective.com/readarr/sponsors.svg?width=890"></a>
+[![Sponsors List](https://opencollective.com/Readarr/sponsors.svg?width=890)](https://opencollective.com/readarr#sponsor)

 ## Mega Sponsors
-<img src="https://opencollective.com/readarr/tiers/mega-sponsor.svg?width=890"></a>
+
+[![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)
-* Copyright 2010-2021
+* Copyright 2010-2022
@@ -0,0 +1,8 @@
+# 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.
@@ -7,15 +7,20 @@ variables:
  outputFolder: './_output'
  artifactsFolder: './_artifacts'
  testsFolder: './_tests'
-  majorVersion: '0.1.0'
+  yarnCacheFolder: $(Pipeline.Workspace)/.yarn
+  nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
+  majorVersion: '0.3.1'
  minorVersion: $[counter('minorVersion', 1)]
  readarrVersion: '$(majorVersion).$(minorVersion)'
  buildName: '$(Build.SourceBranchName).$(readarrVersion)'
  sentryOrg: 'servarr'
  sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '5.0.302'
-  yarnCacheFolder: $(Pipeline.Workspace)/.yarn
-  nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
+  dotnetVersion: '6.0.408'
+  nodeVersion: '16.X'
+  innoVersion: '6.2.0'
+  windowsImage: 'windows-2022'
+  linuxImage: 'ubuntu-20.04'
+  macImage: 'macOS-11'

 trigger:
  branches:
@@ -42,7 +47,7 @@ stages:
        matrix:
          Windows:
            osName: 'Windows'
-            imageName: 'windows-2019'
+            imageName: ${{ variables.windowsImage }}
            enableAnalysis: 'false'

      pool:
@@ -62,16 +67,13 @@ stages:
        inputs:
          version: $(dotnetVersion)
      - bash: |
-          BUNDLEDVERSIONS=${AGENT_TOOLSDIRECTORY}/dotnet/sdk/${DOTNETVERSION}/Microsoft.NETCoreSdk.BundledVersions.props
-          echo $BUNDLEDVERSIONS
-          grep osx-x64 $BUNDLEDVERSIONS
-          if grep -q freebsd-x64 $BUNDLEDVERSIONS; then
-            echo "BSD already enabled"
-          else
-            echo "Enabling BSD support"
-            sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64/' $BUNDLEDVERSIONS
+          SDK_PATH="${AGENT_TOOLSDIRECTORY}/dotnet/sdk/${DOTNETVERSION}"
+          BUNDLEDVERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
+          
+          if ! grep -q freebsd-x64 $BUNDLEDVERSIONS; then
+            sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
          fi
-        displayName: Enable FreeBSD Support
+        displayName: Extra Platform Support
      - task: Cache@2
        inputs:
          key: 'nuget | "$(Agent.OS)" | $(Build.SourcesDirectory)/src/Directory.Packages.props'
@@ -81,31 +83,29 @@ stages:
        displayName: Build Readarr Backend
        env:
          NUGET_PACKAGES: $(nugetCacheFolder)
-      - powershell: Get-ChildItem _output\net5.0*,_output\*.Update\* -Recurse | Where { $_.Fullname -notlike "*\publish\*" -and $_.attributes -notlike "*directory*" } | Remove-Item
+      - powershell: Get-ChildItem _output\net6.0*,_output\*.Update\* -Recurse | Where { $_.Fullname -notlike "*\publish\*" -and $_.attributes -notlike "*directory*" } | Remove-Item
        displayName: Clean up intermediate output
-      - task: PublishPipelineArtifact@1
-        inputs:
-          path: $(outputFolder)
-          artifact: '$(osName)Backend'
-          artifactType: 'pipeline'
-          parallel: true
-          parallelCount: 100
+      - publish: $(outputFolder)
+        artifact: '$(osName)Backend'
        displayName: Publish Backend
-      - publish: '$(testsFolder)/net5.0/win-x64/publish'
-        artifact: WindowsCoreTests
-        displayName: Publish Windows Test Package
-      - publish: '$(testsFolder)/net5.0/linux-x64/publish'
-        artifact: LinuxCoreTests
-        displayName: Publish Linux Test Package
-      - publish: '$(testsFolder)/net5.0/linux-musl-x64/publish'
-        artifact: LinuxMuslCoreTests
-        displayName: Publish Linux Musl Test Package
-      - publish: '$(testsFolder)/net5.0/freebsd-x64/publish'
-        artifact: FreebsdCoreTests
-        displayName: Publish FreeBSD Test Package
-      - publish: '$(testsFolder)/net5.0/osx-x64/publish'
-        artifact: MacCoreTests
-        displayName: Publish MacOS Test Package
+      - 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)
@@ -116,11 +116,11 @@ stages:
        matrix:
          Linux:
            osName: 'Linux'
-            imageName: 'ubuntu-18.04'
+            imageName: ${{ variables.linuxImage }}
            enableAnalysis: 'true'
          Mac:
            osName: 'Mac'
-            imageName: 'macos-10.14'
+            imageName: ${{ variables.macImage }}
            enableAnalysis: 'false'

      pool:
@@ -137,25 +137,29 @@ stages:
        inputs:
          version: $(dotnetVersion)
      - bash: |
-          BUNDLEDVERSIONS=${AGENT_TOOLSDIRECTORY}/dotnet/sdk/${DOTNETVERSION}/Microsoft.NETCoreSdk.BundledVersions.props
-          echo $BUNDLEDVERSIONS
-          grep osx-x64 $BUNDLEDVERSIONS
-          if grep -q freebsd-x64 $BUNDLEDVERSIONS; then
-            echo "BSD already enabled"
-          else
-            echo "Enabling BSD support"
-            sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64/' $BUNDLEDVERSIONS
+          SDK_PATH="${AGENT_TOOLSDIRECTORY}/dotnet/sdk/${DOTNETVERSION}"
+          BUNDLEDVERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
+          
+          if ! grep -q freebsd-x64 $BUNDLEDVERSIONS; then
+            sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
          fi
-        displayName: Enable FreeBSD 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-bsd
+      - 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 "{}" \;
+          find ${TESTSFOLDER} -type f ! -path "*/publish/*" -exec rm -rf {} \;
+          find ${TESTSFOLDER} -depth -empty -type d -exec rm -r "{}" \;
+        displayName: Clean up intermediate output
+        condition: and(succeeded(), ne(variables['osName'], 'Windows'))

  - stage: Build_Frontend
    displayName: Frontend
@@ -166,20 +170,20 @@ stages:
        matrix:
          Linux:
            osName: 'Linux'
-            imageName: 'ubuntu-18.04'
+            imageName: ${{ variables.linuxImage }}
          Mac:
            osName: 'Mac'
-            imageName: 'macos-10.14'
+            imageName: ${{ variables.macImage }}
          Windows:
            osName: 'Windows'
-            imageName: 'windows-2019'
+            imageName: ${{ variables.windowsImage }}
      pool:
        vmImage: $(imageName)
      steps:
      - task: NodeTool@0
        displayName: Set Node.js version
        inputs:
-          versionSpec: '12.x'
+          versionSpec: $(nodeVersion)
      - checkout: self
        submodules: true
        fetchDepth: 1
@@ -209,7 +213,7 @@ stages:
    - job: Windows_Installer
      displayName: Create Installer
      pool:
-        vmImage: 'windows-2019'
+        vmImage: ${{ variables.windowsImage }}
      steps:
      - checkout: self
        fetchDepth: 1
@@ -225,16 +229,11 @@ stages:
          artifactName: WindowsFrontend
          targetPath: _output
        displayName: Fetch Frontend
-      - bash: ./build.sh --packages
-        displayName: Create Packages
      - bash: |
-          setup/inno/ISCC.exe setup/readarr.iss //DFramework=net5.0 //DRuntime=win-x86
-          cp setup/output/Readarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x86-installer.exe
-        displayName: Create .NET Core Windows installer
-      - bash: |
-          setup/inno/ISCC.exe setup/readarr.iss //DFramework=net5.0 //DRuntime=win-x64
-          cp setup/output/Readarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x64-installer.exe
-        displayName: Create .NET Core Windows installer
+          ./build.sh --packages --installer
+          cp setup/output/Readarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x64-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'
        displayName: Publish Installer
@@ -247,7 +246,7 @@ stages:
    - job: Other_Packages
      displayName: Create Standard Packages
      pool:
-        vmImage: 'ubuntu-18.04'
+        vmImage: ${{ variables.linuxImage }}
      steps:
      - checkout: self
        fetchDepth: 1
@@ -263,97 +262,127 @@ stages:
          artifactName: WindowsFrontend
          targetPath: _output
        displayName: Fetch Frontend
-      - bash: ./build.sh --packages --enable-bsd
+      - bash: ./build.sh --packages --enable-extra-platforms
        displayName: Create Packages
      - bash: |
-          find . -name "fpcalc" -exec chmod a+x {} \;
          find . -name "Readarr" -exec chmod a+x {} \;
          find . -name "Readarr.Update" -exec chmod a+x {} \;
        displayName: Set executable bits
      - task: ArchiveFiles@2
-        displayName: Create Windows Core zip
+        displayName: Create win-x64 zip
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).windows-core-x64.zip'
          archiveType: 'zip'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/win-x64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/win-x64/net6.0
      - task: ArchiveFiles@2
-        displayName: Create Windows x86 Core zip
+        displayName: Create win-x86 zip
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).windows-core-x86.zip'
          archiveType: 'zip'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/win-x86/net5.0
+          rootFolderOrFile: $(artifactsFolder)/win-x86/net6.0
      - task: ArchiveFiles@2
-        displayName: Create MacOS Core app
+        displayName: Create osx-x64 app
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).osx-app-core-x64.zip'
          archiveType: 'zip'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/macos-app/net5.0
+          rootFolderOrFile: $(artifactsFolder)/osx-x64-app/net6.0
      - task: ArchiveFiles@2
-        displayName: Create MacOS Core tar
+        displayName: Create osx-x64 tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).osx-core-x64.tar.gz'
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/macos/net5.0
+          rootFolderOrFile: $(artifactsFolder)/osx-x64/net6.0
      - task: ArchiveFiles@2
-        displayName: Create Linux Core tar
+        displayName: Create osx-arm64 app
+        inputs:
+          archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).osx-app-core-arm64.zip'
+          archiveType: 'zip'
+          includeRootFolder: false
+          rootFolderOrFile: $(artifactsFolder)/osx-arm64-app/net6.0
+      - task: ArchiveFiles@2
+        displayName: Create osx-arm64 tar
+        inputs:
+          archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).osx-core-arm64.tar.gz'
+          archiveType: 'tar'
+          tarCompression: 'gz'
+          includeRootFolder: false
+          rootFolderOrFile: $(artifactsFolder)/osx-arm64/net6.0
+      - task: ArchiveFiles@2
+        displayName: Create linux-x64 tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).linux-core-x64.tar.gz'
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-x64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-x64/net6.0
      - task: ArchiveFiles@2
-        displayName: Create Linux Musl Core tar
+        displayName: Create linux-musl-x64 tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).linux-musl-core-x64.tar.gz'
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/net6.0
      - task: ArchiveFiles@2
-        displayName: Create ARM32 Linux Core tar
+        displayName: Create linux-x86 tar
+        inputs:
+          archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).linux-core-x86.tar.gz'
+          archiveType: 'tar'
+          tarCompression: 'gz'
+          includeRootFolder: false
+          rootFolderOrFile: $(artifactsFolder)/linux-x86/net6.0
+      - task: ArchiveFiles@2
+        displayName: Create linux-arm tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).linux-core-arm.tar.gz'
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-arm/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-arm/net6.0
      - task: ArchiveFiles@2
-        displayName: Create Linux Core tar
+        displayName: Create linux-musl-arm tar
+        inputs:
+          archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).linux-musl-core-arm.tar.gz'
+          archiveType: 'tar'
+          tarCompression: 'gz'
+          includeRootFolder: false
+          rootFolderOrFile: $(artifactsFolder)/linux-musl-arm/net6.0
+      - task: ArchiveFiles@2
+        displayName: Create linux-arm64 tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).linux-core-arm64.tar.gz'
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-arm64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-arm64/net6.0
      - task: ArchiveFiles@2
-        displayName: Create ARM64 Linux Musl Core tar
+        displayName: Create linux-musl-arm64 tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).linux-musl-core-arm64.tar.gz'
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/net6.0
      - task: ArchiveFiles@2
-        displayName: Create FreeBSD Core Core tar
+        displayName: Create freebsd-x64 tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).freebsd-core-x64.tar.gz'
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/freebsd-x64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/freebsd-x64/net6.0
      - publish: $(Build.ArtifactStagingDirectory)
        artifact: 'Packages'
        displayName: Publish Packages
      - bash: |
          echo "Uploading source maps to sentry"
          curl -sL https://sentry.io/get-cli/ | bash
-          RELEASENAME="${READARRVERSION}-${BUILD_SOURCEBRANCHNAME}"
+          RELEASENAME="Readarr@${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}"
@@ -392,22 +421,22 @@ stages:
        matrix:
          MacCore:
            osName: 'Mac'
-            testName: 'MacCore'
+            testName: 'osx-x64'
            poolName: 'Azure Pipelines'
-            imageName: 'macos-10.14'
+            imageName: ${{ variables.macImage }}
          WindowsCore:
            osName: 'Windows'
-            testName: 'WindowsCore'
+            testName: 'win-x64'
            poolName: 'Azure Pipelines'
-            imageName: 'windows-2019'
+            imageName: ${{ variables.windowsImage }}
          LinuxCore:
            osName: 'Linux'
-            testName: 'LinuxCore'
+            testName: 'linux-x64'
            poolName: 'Azure Pipelines'
-            imageName: 'ubuntu-18.04'
+            imageName: ${{ variables.linuxImage }}
          FreebsdCore:
            osName: 'Linux'
-            testName: 'FreebsdCore'
+            testName: 'freebsd-x64'
            poolName: 'FreeBSD'
            imageName:

@@ -426,15 +455,11 @@ stages:
        displayName: Download Test Artifact
        inputs:
          buildType: 'current'
-          artifactName: '$(testName)Tests'
+          artifactName: '$(testName)-tests'
          targetPath: $(testsFolder)
      - powershell: Set-Service SCardSvr -StartupType Manual
        displayName: Enable Windows Test Service
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - bash: |
-          chmod a+x _tests/fpcalc
-        displayName: Make fpcalc Executable
-        condition: and(succeeded(), or(eq(variables['osName'], 'Mac'), eq(variables['testName'], 'LinuxCore')))
      - bash: find ${TESTSFOLDER} -name "Readarr.Test.Dummy" -exec chmod a+x {} \;
        displayName: Make Test Dummy Executable
        condition: and(succeeded(), ne(variables['osName'], 'Windows'))
@@ -458,11 +483,15 @@ stages:
        matrix:
          alpine:
            testName: 'Musl Net Core'
-            artifactName: LinuxMuslCoreTests
+            artifactName: linux-musl-x64-tests
            containerImage: ghcr.io/servarr/testimages:alpine
+          linux-x86:
+            testName: 'linux-x86'
+            artifactName: linux-x86-tests
+            containerImage: ghcr.io/servarr/testimages:linux-x86

      pool:
-        vmImage: 'ubuntu-18.04'
+        vmImage: ${{ variables.linuxImage }}
      
      container: $[ variables['containerImage'] ]

@@ -470,9 +499,15 @@ stages:
        
      steps:
      - task: UseDotNet@2
-        displayName: 'Install .net core'
+        displayName: 'Install .NET'
        inputs:
          version: $(dotnetVersion)
+        condition: and(succeeded(), ne(variables['testName'], 'linux-x86'))
+      - bash: |
+          SDKURL=$(curl -s https://api.github.com/repos/Servarr/dotnet-linux-x86/releases | jq -rc '.[].assets[].browser_download_url' | grep sdk-${DOTNETVERSION}.*gz$)
+          curl -fsSL $SDKURL | tar xzf - -C /opt/dotnet
+        displayName: 'Install .NET'
+        condition: and(succeeded(), eq(variables['testName'], 'linux-x86'))
      - checkout: none
      - task: DownloadPipelineArtifact@2
        displayName: Download Test Artifact
@@ -496,6 +531,57 @@ stages:
          testRunTitle: '$(testName) Unit Tests'
          failTaskOnFailedTests: true
          
+    - job: Unit_LinuxCore_Postgres
+      displayName: Unit Native LinuxCore with Postgres Database
+      variables:
+        pattern: 'Readarr.*.linux-core-x64.tar.gz'
+        artifactName: LinuxCoreTests
+        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: 'linux-x64-Tests'
+          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=postgres14 \
+          -e POSTGRES_PASSWORD=readarr \
+          -e POSTGRES_USER=readarr \
+          -p 5432:5432/tcp \
+          -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
+          postgres:14
+        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 Postgres Unit Tests'
+          failTaskOnFailedTests: true
+
  - stage: Integration
    displayName: Integration
    dependsOn: Packages
@@ -506,18 +592,18 @@ stages:
        matrix:
          MacCore:
            osName: 'Mac'
-            testName: 'MacCore'
-            imageName: 'macos-10.14'
+            testName: 'osx-x64'
+            imageName: ${{ variables.macImage }}
            pattern: 'Readarr.*.osx-core-x64.tar.gz'
          WindowsCore:
            osName: 'Windows'
-            testName: 'WindowsCore'
-            imageName: 'windows-2019'
+            testName: 'win-x64'
+            imageName: ${{ variables.windowsImage }}
            pattern: 'Readarr.*.windows-core-x64.zip'
          LinuxCore:
            osName: 'Linux'
-            testName: 'LinuxCore'
-            imageName: 'ubuntu-18.04'
+            testName: 'linux-x64'
+            imageName: ${{ variables.linuxImage }}
            pattern: 'Readarr.*.linux-core-x64.tar.gz'

      pool:
@@ -533,7 +619,7 @@ stages:
        displayName: Download Test Artifact
        inputs:
          buildType: 'current'
-          artifactName: '$(testName)Tests'
+          artifactName: '$(testName)-tests'
          targetPath: $(testsFolder)
      - task: DownloadPipelineArtifact@2
        displayName: Download Build Artifact
@@ -563,6 +649,66 @@ stages:
          failTaskOnFailedTests: true
        displayName: Publish Test Results

+    - job: Integration_LinuxCore_Postgres
+      displayName: Integration Native LinuxCore with Postgres Database
+      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=postgres14 \
+            -e POSTGRES_PASSWORD=readarr \
+            -e POSTGRES_USER=readarr \
+            -p 5432:5432/tcp \
+            -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
+            postgres:14
+          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 Postgres Database Integration Tests'
+            failTaskOnFailedTests: true
+          displayName: Publish Test Results
+
    - job: Integration_FreeBSD
      displayName: Integration Native FreeBSD
      workspace:
@@ -578,14 +724,14 @@ stages:
        displayName: Download Test Artifact
        inputs:
          buildType: 'current'
-          artifactName: 'FreebsdCoreTests'
+          artifactName: 'freebsd-x64-tests'
          targetPath: $(testsFolder)
      - task: DownloadPipelineArtifact@2
        displayName: Download Build Artifact
        inputs:
          buildType: 'current'
          artifactName: Packages
-          itemPattern: '/$(pattern)'
+          itemPattern: '**/$(pattern)'
          targetPath: $(Build.ArtifactStagingDirectory)
      - bash: |
          mkdir -p ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin
@@ -612,13 +758,17 @@ stages:
      strategy:
        matrix:
          alpine:
-            testName: 'Musl Net Core'
-            artifactName: LinuxMuslCoreTests
+            testName: 'linux-musl-x64'
+            artifactName: linux-musl-x64-tests
            containerImage: ghcr.io/servarr/testimages:alpine
            pattern: 'Readarr.*.linux-musl-core-x64.tar.gz'
-
+          linux-x86:
+            testName: 'linux-x86'
+            artifactName: linux-x86-tests
+            containerImage: ghcr.io/servarr/testimages:linux-x86
+            pattern: 'Readarr.*.linux-core-x86.tar.gz'
      pool:
-        vmImage: 'ubuntu-18.04'
+        vmImage: ${{ variables.linuxImage }}

      container: $[ variables['containerImage'] ]

@@ -626,9 +776,15 @@ stages:
        
      steps:
      - task: UseDotNet@2
-        displayName: 'Install .net core'
+        displayName: 'Install .NET'
        inputs:
          version: $(dotnetVersion)
+        condition: and(succeeded(), ne(variables['testName'], 'linux-x86'))
+      - bash: |
+          SDKURL=$(curl -s https://api.github.com/repos/Servarr/dotnet-linux-x86/releases | jq -rc '.[].assets[].browser_download_url' | grep sdk-${DOTNETVERSION}.*gz$)
+          curl -fsSL $SDKURL | tar xzf - -C /opt/dotnet
+        displayName: 'Install .NET'
+        condition: and(succeeded(), eq(variables['testName'], 'linux-x86'))
      - checkout: none
      - task: DownloadPipelineArtifact@2
        displayName: Download Test Artifact
@@ -674,15 +830,18 @@ stages:
        matrix:
          Linux:
            osName: 'Linux'
-            imageName: 'ubuntu-18.04'
+            artifactName: 'linux-x64'
+            imageName: ${{ variables.linuxImage }}
            pattern: 'Readarr.*.linux-core-x64.tar.gz'
          Mac:
            osName: 'Mac'
-            imageName: 'macos-10.14'
+            artifactName: 'osx-x64'
+            imageName: ${{ variables.macImage }}
            pattern: 'Readarr.*.osx-core-x64.tar.gz'
          Windows:
            osName: 'Windows'
-            imageName: 'windows-2019'
+            artifactName: 'win-x64'
+            imageName: ${{ variables.windowsImage }}
            pattern: 'Readarr.*.windows-core-x64.zip'

      pool:
@@ -698,7 +857,7 @@ stages:
        displayName: Download Test Artifact
        inputs:
          buildType: 'current'
-          artifactName: '$(osName)CoreTests'
+          artifactName: '$(artifactName)-tests'
          targetPath: $(testsFolder)
      - task: DownloadPipelineArtifact@2
        displayName: Download Build Artifact
@@ -749,17 +908,17 @@ stages:
        matrix:
          Linux:
            osName: 'Linux'
-            imageName: 'ubuntu-18.04'
+            imageName: ${{ variables.linuxImage }}
          Windows:
            osName: 'Windows'
-            imageName: 'windows-2019'
+            imageName: ${{ variables.windowsImage }}
      pool:
        vmImage: $(imageName)
      steps:
      - task: NodeTool@0
        displayName: Set Node.js version
        inputs:
-          versionSpec: '12.x'
+          versionSpec: $(nodeVersion)
      - checkout: self
        submodules: true
        fetchDepth: 1
@@ -781,7 +940,7 @@ stages:
      displayName: Frontend
      condition: eq(variables['System.PullRequest.IsFork'], 'False')
      pool:
-        vmImage: windows-2019
+        vmImage: ${{ variables.windowsImage }}
      steps:
      - checkout: self # Need history for Sonar analysis
      - task: SonarCloudPrepare@1
@@ -798,13 +957,62 @@ stages:
          cliSources: './frontend'
      - task: SonarCloudAnalyze@1
      
+    - job: Api_Docs
+      displayName: API Docs
+      condition: |
+        and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
+
+      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 .
+          git status
+          if git status | grep modified
+          then
+            git commit -am 'Automated API Docs update [skip ci]'
+            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

      variables:
        disable.coverage.autogenerate: 'true'
      pool:
-        vmImage: ubuntu-18.04
+        vmImage: ${{ variables.linuxImage }}

      steps:
      - task: UseDotNet@2
@@ -842,8 +1050,8 @@ stages:
            sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml
            sonar.cs.nunit.reportsPaths=$(Build.SourcesDirectory)/TestResult.xml
      - bash: |
-          ./build.sh --backend -f net5.0 -r linux-x64
-          TEST_DIR=_tests/net5.0/linux-x64/publish/ ./test.sh Linux Unit Coverage
+          ./build.sh --backend -f net6.0 -r linux-x64
+          TEST_DIR=_tests/net6.0/linux-x64/publish/ ./test.sh Linux Unit Coverage
        displayName: Coverage Unit Tests
        env:
          NUGET_PACKAGES: $(nugetCacheFolder)
@@ -876,7 +1084,7 @@ stages:
    - job:
      displayName: Discord Notification
      pool:
-        vmImage: 'ubuntu-18.04'
+        vmImage: ${{ variables.linuxImage }}
      steps:
        - task: DownloadPipelineArtifact@2
          continueOnError: true
@@ -892,3 +1100,4 @@ stages:
            SYSTEM_ACCESSTOKEN: $(System.AccessToken)
            DISCORDCHANNELID: $(discordChannelId)
            DISCORDWEBHOOKKEY: $(discordWebhookKey)
+            DISCORDTHREADID: $(discordThreadId)
@@ -27,15 +27,22 @@ UpdateVersionNumber()
    fi
 }

-EnableBsdSupport()
+EnableExtraPlatformsInSDK()
 {
-    #todo enable sdk with
-    #SDK_PATH=$(dotnet --list-sdks | grep -P '5\.\d\.\d+' | head -1 | sed 's/\(5\.[0-9]*\.[0-9]*\).*\[\(.*\)\]/\2\/\1/g')
-    # BUNDLED_VERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
+    SDK_PATH=$(dotnet --list-sdks | grep -P '6\.\d\.\d+' | head -1 | sed 's/\(6\.[0-9]*\.[0-9]*\).*\[\(.*\)\]/\2\/\1/g')
+    BUNDLEDVERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
+    if grep -q freebsd-x64 $BUNDLEDVERSIONS; then
+        echo "Extra platforms already enabled"
+    else
+        echo "Enabling extra platform support"
+        sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
+    fi
+}

+EnableExtraPlatforms()
+{
    if grep -qv freebsd-x64 src/Directory.Build.props; then
-        sed -i'' -e "s^<RuntimeIdentifiers>\(.*\)</RuntimeIdentifiers>^<RuntimeIdentifiers>\1;freebsd-x64</RuntimeIdentifiers>^g" src/Directory.Build.props
-        sed -i'' -e "s^<ExcludedRuntimeFrameworkPairs>\(.*\)</ExcludedRuntimeFrameworkPairs>^<ExcludedRuntimeFrameworkPairs>\1;freebsd-x64:net472</ExcludedRuntimeFrameworkPairs>^g" src/Directory.Build.props
+        sed -i'' -e "s^<RuntimeIdentifiers>\(.*\)</RuntimeIdentifiers>^<RuntimeIdentifiers>\1;freebsd-x64;linux-x86</RuntimeIdentifiers>^g" src/Directory.Build.props
    fi
 }

@@ -129,7 +136,7 @@ PackageLinux()

    echo "Adding Readarr.Mono to UpdatePackage"
    cp $folder/Readarr.Mono.* $folder/Readarr.Update
-    if [ "$framework" = "net5.0" ]; then
+    if [ "$framework" = "net6.0" ]; then
        cp $folder/Mono.Posix.NETStandard.* $folder/Readarr.Update
        cp $folder/libMonoPosixHelper.* $folder/Readarr.Update
    fi
@@ -140,12 +147,13 @@ PackageLinux()
 PackageMacOS()
 {
    local framework="$1"
+    local runtime="$2"
    
-    ProgressStart "Creating MacOS Package for $framework"
+    ProgressStart "Creating MacOS Package for $framework $runtime"

-    local folder=$artifactsFolder/macos/$framework/Readarr
+    local folder=$artifactsFolder/$runtime/$framework/Readarr

-    PackageFiles "$folder" "$framework" "osx-x64"
+    PackageFiles "$folder" "$framework" "$runtime"

    echo "Removing Service helpers"
    rm -f $folder/ServiceUninstall.*
@@ -156,7 +164,7 @@ PackageMacOS()

    echo "Adding Readarr.Mono to UpdatePackage"
    cp $folder/Readarr.Mono.* $folder/Readarr.Update
-    if [ "$framework" = "net5.0" ]; then
+    if [ "$framework" = "net6.0" ]; then
        cp $folder/Mono.Posix.NETStandard.* $folder/Readarr.Update
        cp $folder/libMonoPosixHelper.* $folder/Readarr.Update
    fi
@@ -167,10 +175,11 @@ PackageMacOS()
 PackageMacOSApp()
 {
    local framework="$1"
+    local runtime="$2"
    
-    ProgressStart "Creating macOS App Package for $framework"
+    ProgressStart "Creating macOS App Package for $framework $runtime"

-    local folder=$artifactsFolder/macos-app/$framework
+    local folder="$artifactsFolder/$runtime-app/$framework"

    rm -rf $folder
    mkdir -p $folder
@@ -178,7 +187,7 @@ PackageMacOSApp()
    mkdir -p $folder/Readarr.app/Contents/MacOS

    echo "Copying Binaries"
-    cp -r $artifactsFolder/macos/$framework/Readarr/* $folder/Readarr.app/Contents/MacOS
+    cp -r $artifactsFolder/$runtime/$framework/Readarr/* $folder/Readarr.app/Contents/MacOS

    echo "Removing Update Folder"
    rm -r $folder/Readarr.app/Contents/MacOS/Readarr.Update
@@ -225,12 +234,38 @@ Package()
            PackageWindows "$framework" "$runtime"
            ;;
        osx)
-            PackageMacOS "$framework"
-            PackageMacOSApp "$framework"
+            PackageMacOS "$framework" "$runtime"
+            PackageMacOSApp "$framework" "$runtime"
            ;;
    esac
 }

+BuildInstaller()
+{
+    local framework="$1"
+    local runtime="$2"
+    
+    ./_inno/ISCC.exe setup/readarr.iss "//DFramework=$framework" "//DRuntime=$runtime"
+}
+
+InstallInno()
+{
+    ProgressStart "Installing portable Inno Setup"
+    
+    rm -rf _inno
+    curl -s --output innosetup.exe "https://files.jrsoftware.org/is/6/innosetup-${INNOVERSION:-6.2.0}.exe"
+    mkdir _inno
+    ./innosetup.exe //portable=1 //silent //currentuser //dir=.\\_inno
+    rm innosetup.exe
+    
+    ProgressEnd "Installed portable Inno Setup"
+}
+
+RemoveInno()
+{
+    rm -rf _inno
+}
+
 PackageTests()
 {
    local framework="$1"
@@ -262,8 +297,10 @@ if [ $# -eq 0 ]; then
    BACKEND=YES
    FRONTEND=YES
    PACKAGES=YES
+    INSTALLER=NO
    LINT=YES
-    ENABLE_BSD=NO
+    ENABLE_EXTRA_PLATFORMS=NO
+    ENABLE_EXTRA_PLATFORMS_IN_SDK=NO
 fi

 while [[ $# -gt 0 ]]
@@ -275,8 +312,12 @@ case $key in
        BACKEND=YES
        shift # past argument
        ;;
-    --enable-bsd)
-        ENABLE_BSD=YES
+    --enable-bsd|--enable-extra-platforms)
+        ENABLE_EXTRA_PLATFORMS=YES
+        shift # past argument
+        ;;
+    --enable-extra-platforms-in-sdk)
+        ENABLE_EXTRA_PLATFORMS_IN_SDK=YES
        shift # past argument
        ;;
    -r|--runtime)
@@ -297,6 +338,10 @@ case $key in
        PACKAGES=YES
        shift # past argument
        ;;
+    --installer)
+        INSTALLER=YES
+        shift # past argument
+        ;;
    --lint)
        LINT=YES
        shift # past argument
@@ -316,65 +361,81 @@ esac
 done
 set -- "${POSITIONAL[@]}" # restore positional parameters

+if [ "$ENABLE_EXTRA_PLATFORMS_IN_SDK" = "YES" ];
+then
+    EnableExtraPlatformsInSDK
+fi
+
 if [ "$BACKEND" = "YES" ];
 then
    UpdateVersionNumber
-    if [ "$ENABLE_BSD" = "YES" ];
+    if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
    then
-        EnableBsdSupport
+        EnableExtraPlatforms
    fi
    Build
    if [[ -z "$RID" || -z "$FRAMEWORK" ]];
    then
-        PackageTests "net5.0" "win-x64"
-        PackageTests "net5.0" "win-x86"
-        PackageTests "net5.0" "linux-x64"
-        PackageTests "net5.0" "linux-musl-x64"
-        PackageTests "net5.0" "osx-x64"
-        if [ "$ENABLE_BSD" = "YES" ];
+        PackageTests "net6.0" "win-x64"
+        PackageTests "net6.0" "win-x86"
+        PackageTests "net6.0" "linux-x64"
+        PackageTests "net6.0" "linux-musl-x64"
+        PackageTests "net6.0" "osx-x64"
+        if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
        then
-            PackageTests "net5.0" "freebsd-x64"
+            PackageTests "net6.0" "freebsd-x64"
+            PackageTests "net6.0" "linux-x86"
        fi
    else
        PackageTests "$FRAMEWORK" "$RID"
    fi
 fi

-if [ "$FRONTEND" = "YES" ];
+if [[ "$LINT" = "YES" || "$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

    if [[ -z "$RID" || -z "$FRAMEWORK" ]];
    then
-        Package "net5.0" "win-x64"
-        Package "net5.0" "win-x86"
-        Package "net5.0" "linux-x64"
-        Package "net5.0" "linux-musl-x64"
-        Package "net5.0" "linux-arm64"
-        Package "net5.0" "linux-musl-arm64"
-        Package "net5.0" "linux-arm"
-        Package "net5.0" "osx-x64"
-        if [ "$ENABLE_BSD" = "YES" ];
+        Package "net6.0" "win-x64"
+        Package "net6.0" "win-x86"
+        Package "net6.0" "linux-x64"
+        Package "net6.0" "linux-musl-x64"
+        Package "net6.0" "linux-arm64"
+        Package "net6.0" "linux-musl-arm64"
+        Package "net6.0" "linux-arm"
+        Package "net6.0" "linux-musl-arm"
+        Package "net6.0" "osx-x64"
+        Package "net6.0" "osx-arm64"
+        if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
        then
-            Package "net5.0" "freebsd-x64"
+            Package "net6.0" "freebsd-x64"
+            Package "net6.0" "linux-x86"
        fi
    else
        Package "$FRAMEWORK" "$RID"
    fi
 fi
+
+if [ "$INSTALLER" = "YES" ];
+then
+    InstallInno
+    BuildInstaller "net6.0" "win-x64"
+    BuildInstaller "net6.0" "win-x86"
+    RemoveInno
+fi
@@ -1,5 +0,0 @@
-nzbdrone {version} {branch}; urgency=low
-
-  * Automatic Release.
-
- -- NzbDrone <contact@nzbdrone.com>  Mon, 26 Aug 2013 00:00:00 -0700
@@ -1 +0,0 @@
-8
@@ -1,12 +0,0 @@
-Section: web
-Priority: optional
-Maintainer: Sonarr <contact@nzbdrone.com>
-Source: nzbdrone
-Homepage: https://readarr.com
-Vcs-Git: git@github.com:readarr/Readarr.git
-Vcs-Browser: https://github.com/readarr/Readarr
-
-Package: nzbdrone
-Architecture: all
-Depends: libmono-cil-dev (>= 3.2), sqlite3 (>= 3.7), mediainfo (>= 0.7.52)
-Description: Readarr is a music collection manager
@@ -1,24 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: nzbdrone
-Source: https://github.com/readarr/Readarr
-
-Files: *
-Copyright: 2010-2016 Readarr <hello@readarr.com>
-
-License: GPL-3.0+
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
@@ -1 +0,0 @@
-nzbdrone_bin/* opt/NzbDrone
@@ -1,13 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-	dh $@ 
@@ -0,0 +1,38 @@
+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
+
+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.5.0 Swashbuckle.AspNetCore.Cli
+
+dotnet tool run swagger tofile --output ./src/Readarr.Api.V1/openapi.json "$outputFolder/net6.0/$RUNTIME/Readarr.console.dll" v1 &
+
+sleep 45
+
+kill %1
+
+exit 0
@@ -1,25 +0,0 @@
-{
-  "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
-}
@@ -1,335 +0,0 @@
-{
-  "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
-    }
-  }
-}
@@ -1 +1,2 @@
 **/JsLibraries/**
+**/*.css.d.ts
@@ -1,14 +1,21 @@
+// 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('frontend/src', { withFileTypes: true })
+  .readdirSync(path.join(frontendFolder, 'src'), { withFileTypes: true })
  .filter((dirent) => dirent.isDirectory())
  .map((dirent) => dirent.name)
  .join('|');

-const frontendFolder = __dirname;
-
 module.exports = {
+  root: true,
+
  parser: '@babel/eslint-parser',

  env: {
@@ -28,7 +35,7 @@ module.exports = {
    ecmaVersion: 6,
    sourceType: 'module',
    babelOptions: {
-      configFile: `${frontendFolder}/babel.config.js`,
+      configFile: `${frontendFolder}/babel.config.js`
    },
    ecmaFeatures: {
      modules: true,
@@ -39,8 +46,11 @@ module.exports = {
  plugins: [
    'filenames',
    'react',
+    'react-hooks',
    'simple-import-sort',
-    'import'
+    'import',
+    '@typescript-eslint',
+    'prettier'
  ],

  settings: {
@@ -223,7 +233,7 @@ module.exports = {
    'consistent-this': ['error', 'self'],
    'eol-last': 'error',
    'func-names': 'off',
-    'func-style': ['error', 'declaration'],
+    'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
    indent: ['error', 2, { SwitchCase: 1 }],
    'key-spacing': ['error', { beforeColon: false, afterColon: true }],
    'keyword-spacing': ['error', { before: true, after: true }],
@@ -308,11 +318,15 @@ 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: ['*.js'],
+      files: [
+        '*.js'
+      ],
      rules: {
        'simple-import-sort/imports': [
          'error',
@@ -327,6 +341,52 @@ 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'
+      }
    }
  ]
 };
@@ -1,12 +0,0 @@
-{
-  "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
-  }
-}
@@ -0,0 +1,10 @@
+# Ignore everything recursively
+*
+
+# But not the .ts files
+!*.ts*
+
+*css.d.ts
+
+# Check subdirectories too
+!*/
@@ -0,0 +1,6 @@
+{
+  "arrowParens": "always",
+  "endOfLine": "auto",
+  "singleQuote": true,
+  "trailingComma": "es5"
+}
@@ -1,12 +1,12 @@
 {
-"plugins": [
-  "stylelint-order"
-],
-"ignoreFiles": [
-  "frontend/src/Styles/scaffolding.css",
-  "**/*.js"
-],
-"rules": {
+  "plugins": [
+    "stylelint-order"
+  ],
+  "ignoreFiles": [
+    "frontend/src/Styles/scaffolding.css",
+    "**/*.js"
+  ],
+  "rules": {
    "at-rule-empty-line-before": [
      "always",
      {
@@ -15,9 +15,6 @@
        ]
      }
    ],
-    "at-rule-name-case": "lower",
-    "at-rule-name-newline-after": "always-multi-line",
-    "at-rule-name-space-after": "always",
    "at-rule-no-unknown": [
      true,
      {
@@ -28,83 +25,36 @@
      }
    ],
    "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",
@@ -132,6 +82,7 @@
          "right",
          "bottom",
          "left",
+          "inset",
          "z-index",
          "display",
          "visibility",
@@ -343,54 +294,33 @@
        ]
      }
    ],
-    "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
  }
 }
@@ -0,0 +1,7 @@
+{
+    "recommendations": [
+        "stylelint.vscode-stylelint",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode"
+    ]
+}
@@ -0,0 +1,23 @@
+// 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": true
+  },
+
+  "typescript.preferences.quoteStyle": "single",
+
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
+}
@@ -17,7 +17,8 @@ module.exports = {
  env: {
    development: {
      presets: [
-        ['@babel/preset-react', { development: true }]
+        ['@babel/preset-react', { development: true }],
+        '@babel/preset-typescript'
      ],
      plugins: [
        'babel-plugin-inline-classnames'
@@ -25,7 +26,8 @@ module.exports = {
    },
    production: {
      presets: [
-        '@babel/preset-react'
+        '@babel/preset-react',
+        '@babel/preset-typescript'
      ],
      plugins: [
        'babel-plugin-transform-react-remove-prop-types'
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 const path = require('path');
 const webpack = require('webpack');
 const FileManagerPlugin = require('filemanager-webpack-plugin');
@@ -5,6 +6,7 @@ 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';
@@ -38,13 +40,19 @@ module.exports = (env) => {
    },

    resolve: {
+      extensions: [
+        '.ts',
+        '.tsx',
+        '.js'
+      ],
      modules: [
        srcFolder,
        path.join(srcFolder, 'Shims'),
        'node_modules'
      ],
      alias: {
-        jquery: 'jquery/src/jquery'
+        jquery: 'jquery/dist/jquery.min',
+        'react-middle-truncate': 'react-middle-truncate/lib/react-middle-truncate'
      },
      fallback: {
        buffer: false,
@@ -59,23 +67,23 @@ module.exports = (env) => {
    output: {
      path: distFolder,
      publicPath: '/',
-      filename: '[name].js',
+      filename: '[name]-[contenthash].js',
      sourceMapFilename: '[file].map'
    },

    optimization: {
      moduleIds: 'deterministic',
-      chunkIds: 'named',
-      splitChunks: {
-        chunks: 'initial',
-        name: 'vendors'
-      }
+      chunkIds: isProduction ? 'deterministic' : 'named'
    },

    performance: {
      hints: false
    },

+    experiments: {
+      topLevelAwait: true
+    },
+
    plugins: [
      new webpack.DefinePlugin({
        __DEV__: !isProduction,
@@ -83,7 +91,8 @@ module.exports = (env) => {
      }),

      new MiniCssExtractPlugin({
-        filename: 'Content/styles.css'
+        filename: 'Content/styles.css',
+        chunkFilename: 'Content/[id]-[chunkhash].css'
      }),

      new HtmlWebpackPlugin({
@@ -130,6 +139,8 @@ module.exports = (env) => {
        }
      }),

+      new ForkTsCheckerWebpackPlugin(),
+
      new LiveReloadPlugin()
    ],

@@ -153,7 +164,7 @@ module.exports = (env) => {
          }
        },
        {
-          test: /\.js?$/,
+          test: [/\.jsx?$/, /\.tsx?$/],
          exclude: /(node_modules|JsLibraries)/,
          use: [
            {
@@ -184,6 +195,7 @@ module.exports = (env) => {
          exclude: /(node_modules|globals.css)/,
          use: [
            { loader: MiniCssExtractPlugin.loader },
+            { loader: 'css-modules-typescript-loader' },
            {
              loader: 'css-loader',
              options: {
@@ -252,18 +264,19 @@ module.exports = (env) => {
    config.resolve.alias['react-dom$'] = 'react-dom/profiling';
    config.resolve.alias['scheduler/tracing'] = 'scheduler/tracing-profiling';

-    config.optimization.minimizer = [
-      new TerserPlugin({
-        cache: true,
-        parallel: true,
-        sourceMap: true, // Must be set to true if using source-maps in production
-        terserOptions: {
-          mangle: false,
-          keep_classnames: true,
-          keep_fnames: true
-        }
-      })
-    ];
+    config.optimization = {
+      minimize: true,
+      minimizer: [
+        new TerserPlugin({
+          terserOptions: {
+            sourceMap: true, // Must be set to true if using source-maps in production
+            mangle: false,
+            keep_classnames: true,
+            keep_fnames: true
+          }
+        })
+      ]
+    };
  }

  return config;
@@ -1,3 +1,4 @@
+// eslint-disable-next-line filenames/match-exported
 const loaderUtils = require('loader-utils');

 module.exports = function cssVariablesLoader(source) {
@@ -1,7 +1,6 @@
 const reload = require('require-nocache')(module);

 const cssVarsFiles = [
-  './src/Styles/Variables/colors',
  './src/Styles/Variables/dimensions',
  './src/Styles/Variables/fonts',
  './src/Styles/Variables/animations',
@@ -1,4 +0,0 @@
-// Place your settings in this file to overwrite default and user settings.
-{
-  "files.insertFinalNewline": true
-}
@@ -1,5 +1,6 @@
 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';
@@ -19,9 +20,9 @@ import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
 import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
-import BlacklistRowConnector from './BlacklistRowConnector';
+import BlocklistRowConnector from './BlocklistRowConnector';

-class Blacklist extends Component {
+class Blocklist extends Component {

  //
  // Lifecycle
@@ -61,33 +62,33 @@ class Blacklist 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
@@ -103,8 +104,8 @@ class Blacklist extends Component {
      columns,
      totalRecords,
      isRemoving,
-      isClearingBlacklistExecuting,
-      onClearBlacklistPress,
+      isClearingBlocklistExecuting,
+      onClearBlocklistPress,
      ...otherProps
    } = this.props;

@@ -121,7 +122,7 @@ class Blacklist extends Component {
    const selectedIds = this.getSelectedIds();

    return (
-      <PageContent title={translate('Blacklist')}>
+      <PageContent title={translate('Blocklist')}>
        <PageToolbar>
          <PageToolbarSection>
            <PageToolbarButton
@@ -135,8 +136,8 @@ class Blacklist extends Component {
            <PageToolbarButton
              label={translate('Clear')}
              iconName={icons.CLEAR}
-              isSpinning={isClearingBlacklistExecuting}
-              onPress={onClearBlacklistPress}
+              isSpinning={isClearingBlocklistExecuting}
+              onPress={onClearBlocklistPress}
            />
          </PageToolbarSection>

@@ -161,16 +162,16 @@ class Blacklist extends Component {

          {
            !isAnyFetching && !!error &&
-              <div>
-                {translate('UnableToLoadBlacklist')}
-              </div>
+              <Alert kind={kinds.DANGER}>
+                {translate('UnableToLoadBlocklist')}
+              </Alert>
          }

          {
            isAllPopulated && !error && !items.length &&
-              <div>
-                No history blacklist
-              </div>
+              <Alert kind={kinds.INFO}>
+                {translate('NoHistoryBlocklist')}
+              </Alert>
          }

          {
@@ -188,7 +189,7 @@ class Blacklist extends Component {
                    {
                      items.map((item) => {
                        return (
-                          <BlacklistRowConnector
+                          <BlocklistRowConnector
                            key={item.id}
                            isSelected={selectedState[item.id] || false}
                            columns={columns}
@@ -214,7 +215,7 @@ class Blacklist extends Component {
          isOpen={isConfirmRemoveModalOpen}
          kind={kinds.DANGER}
          title={translate('RemoveSelected')}
-          message={translate('RemoveSelectedMessageText')}
+          message={translate('RemoveSelectedItemBlocklistMessageText')}
          confirmLabel={translate('RemoveSelected')}
          onConfirm={this.onRemoveSelectedConfirmed}
          onCancel={this.onConfirmRemoveModalClose}
@@ -224,7 +225,7 @@ class Blacklist extends Component {
  }
 }

-Blacklist.propTypes = {
+Blocklist.propTypes = {
  isAuthorFetching: PropTypes.bool.isRequired,
  isAuthorPopulated: PropTypes.bool.isRequired,
  isFetching: PropTypes.bool.isRequired,
@@ -234,9 +235,9 @@ Blacklist.propTypes = {
  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
  totalRecords: PropTypes.number,
  isRemoving: PropTypes.bool.isRequired,
-  isClearingBlacklistExecuting: PropTypes.bool.isRequired,
+  isClearingBlocklistExecuting: PropTypes.bool.isRequired,
  onRemoveSelected: PropTypes.func.isRequired,
-  onClearBlacklistPress: PropTypes.func.isRequired
+  onClearBlocklistPress: PropTypes.func.isRequired
 };

-export default Blacklist;
+export default Blocklist;
@@ -4,34 +4,34 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import * as commandNames from 'Commands/commandNames';
 import withCurrentPage from 'Components/withCurrentPage';
-import * as blacklistActions from 'Store/Actions/blacklistActions';
+import * as blocklistActions from 'Store/Actions/blocklistActions';
 import { executeCommand } from 'Store/Actions/commandActions';
 import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
-import Blacklist from './Blacklist';
+import Blocklist from './Blocklist';

 function createMapStateToProps() {
  return createSelector(
-    (state) => state.blacklist,
+    (state) => state.blocklist,
    (state) => state.authors,
-    createCommandExecutingSelector(commandNames.CLEAR_BLACKLIST),
-    (blacklist, authors, isClearingBlacklistExecuting) => {
+    createCommandExecutingSelector(commandNames.CLEAR_BLOCKLIST),
+    (blocklist, authors, isClearingBlocklistExecuting) => {
      return {
        isAuthorFetching: authors.isFetching,
        isAuthorPopulated: authors.isPopulated,
-        isClearingBlacklistExecuting,
-        ...blacklist
+        isClearingBlocklistExecuting,
+        ...blocklist
      };
    }
  );
 }

 const mapDispatchToProps = {
-  ...blacklistActions,
+  ...blocklistActions,
  executeCommand
 };

-class BlacklistConnector extends Component {
+class BlocklistConnector extends Component {

  //
  // Lifecycle
@@ -39,27 +39,27 @@ class BlacklistConnector extends Component {
  componentDidMount() {
    const {
      useCurrentPage,
-      fetchBlacklist,
-      gotoBlacklistFirstPage
+      fetchBlocklist,
+      gotoBlocklistFirstPage
    } = this.props;

    registerPagePopulator(this.repopulate);

    if (useCurrentPage) {
-      fetchBlacklist();
+      fetchBlocklist();
    } else {
-      gotoBlacklistFirstPage();
+      gotoBlocklistFirstPage();
    }
  }

  componentDidUpdate(prevProps) {
-    if (prevProps.isClearingBlacklistExecuting && !this.props.isClearingBlacklistExecuting) {
-      this.props.gotoBlacklistFirstPage();
+    if (prevProps.isClearingBlocklistExecuting && !this.props.isClearingBlocklistExecuting) {
+      this.props.gotoBlocklistFirstPage();
    }
  }

  componentWillUnmount() {
-    this.props.clearBlacklist();
+    this.props.clearBlocklist();
    unregisterPagePopulator(this.repopulate);
  }

@@ -67,57 +67,57 @@ class BlacklistConnector extends Component {
  // Control

  repopulate = () => {
-    this.props.fetchBlacklist();
-  }
+    this.props.fetchBlocklist();
+  };
  //
  // Listeners

  onFirstPagePress = () => {
-    this.props.gotoBlacklistFirstPage();
-  }
+    this.props.gotoBlocklistFirstPage();
+  };

  onPreviousPagePress = () => {
-    this.props.gotoBlacklistPreviousPage();
-  }
+    this.props.gotoBlocklistPreviousPage();
+  };

  onNextPagePress = () => {
-    this.props.gotoBlacklistNextPage();
-  }
+    this.props.gotoBlocklistNextPage();
+  };

  onLastPagePress = () => {
-    this.props.gotoBlacklistLastPage();
-  }
+    this.props.gotoBlocklistLastPage();
+  };

  onPageSelect = (page) => {
-    this.props.gotoBlacklistPage({ page });
-  }
+    this.props.gotoBlocklistPage({ page });
+  };

  onRemoveSelected = (ids) => {
-    this.props.removeBlacklistItems({ ids });
-  }
+    this.props.removeBlocklistItems({ ids });
+  };

  onSortPress = (sortKey) => {
-    this.props.setBlacklistSort({ sortKey });
-  }
+    this.props.setBlocklistSort({ sortKey });
+  };

  onTableOptionChange = (payload) => {
-    this.props.setBlacklistTableOption(payload);
+    this.props.setBlocklistTableOption(payload);

    if (payload.pageSize) {
-      this.props.gotoBlacklistFirstPage();
+      this.props.gotoBlocklistFirstPage();
    }
-  }
+  };

-  onClearBlacklistPress = () => {
-    this.props.executeCommand({ name: commandNames.CLEAR_BLACKLIST });
-  }
+  onClearBlocklistPress = () => {
+    this.props.executeCommand({ name: commandNames.CLEAR_BLOCKLIST });
+  };

  //
  // Render

  render() {
    return (
-      <Blacklist
+      <Blocklist
        onFirstPagePress={this.onFirstPagePress}
        onPreviousPagePress={this.onPreviousPagePress}
        onNextPagePress={this.onNextPagePress}
@@ -126,30 +126,30 @@ class BlacklistConnector extends Component {
        onRemoveSelected={this.onRemoveSelected}
        onSortPress={this.onSortPress}
        onTableOptionChange={this.onTableOptionChange}
-        onClearBlacklistPress={this.onClearBlacklistPress}
+        onClearBlocklistPress={this.onClearBlocklistPress}
        {...this.props}
      />
    );
  }
 }

-BlacklistConnector.propTypes = {
+BlocklistConnector.propTypes = {
  useCurrentPage: PropTypes.bool.isRequired,
-  isClearingBlacklistExecuting: PropTypes.bool.isRequired,
+  isClearingBlocklistExecuting: PropTypes.bool.isRequired,
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  fetchBlacklist: PropTypes.func.isRequired,
-  gotoBlacklistFirstPage: PropTypes.func.isRequired,
-  gotoBlacklistPreviousPage: PropTypes.func.isRequired,
-  gotoBlacklistNextPage: PropTypes.func.isRequired,
-  gotoBlacklistLastPage: PropTypes.func.isRequired,
-  gotoBlacklistPage: PropTypes.func.isRequired,
-  removeBlacklistItems: PropTypes.func.isRequired,
-  setBlacklistSort: PropTypes.func.isRequired,
-  setBlacklistTableOption: PropTypes.func.isRequired,
-  clearBlacklist: PropTypes.func.isRequired,
+  fetchBlocklist: PropTypes.func.isRequired,
+  gotoBlocklistFirstPage: PropTypes.func.isRequired,
+  gotoBlocklistPreviousPage: PropTypes.func.isRequired,
+  gotoBlocklistNextPage: PropTypes.func.isRequired,
+  gotoBlocklistLastPage: PropTypes.func.isRequired,
+  gotoBlocklistPage: PropTypes.func.isRequired,
+  removeBlocklistItems: PropTypes.func.isRequired,
+  setBlocklistSort: PropTypes.func.isRequired,
+  setBlocklistTableOption: PropTypes.func.isRequired,
+  clearBlocklist: PropTypes.func.isRequired,
  executeCommand: PropTypes.func.isRequired
 };

 export default withCurrentPage(
-  connect(createMapStateToProps, mapDispatchToProps)(BlacklistConnector)
+  connect(createMapStateToProps, mapDispatchToProps)(BlocklistConnector)
 );
@@ -10,7 +10,7 @@ import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import translate from 'Utilities/String/translate';

-class BlacklistDetailsModal extends Component {
+class BlocklistDetailsModal extends Component {

  //
  // Render
@@ -78,7 +78,7 @@ class BlacklistDetailsModal extends Component {
  }
 }

-BlacklistDetailsModal.propTypes = {
+BlocklistDetailsModal.propTypes = {
  isOpen: PropTypes.bool.isRequired,
  sourceTitle: PropTypes.string.isRequired,
  protocol: PropTypes.string.isRequired,
@@ -87,4 +87,4 @@ BlacklistDetailsModal.propTypes = {
  onModalClose: PropTypes.func.isRequired
 };

-export default BlacklistDetailsModal;
+export default BlocklistDetailsModal;
@@ -0,0 +1,9 @@
+// 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;
@@ -1,6 +1,7 @@
 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';
@@ -9,10 +10,10 @@ import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import TableRow from 'Components/Table/TableRow';
 import { icons, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
-import BlacklistDetailsModal from './BlacklistDetailsModal';
-import styles from './BlacklistRow.css';
+import BlocklistDetailsModal from './BlocklistDetailsModal';
+import styles from './BlocklistRow.css';

-class BlacklistRow extends Component {
+class BlocklistRow extends Component {

  //
  // Lifecycle
@@ -30,11 +31,11 @@ class BlacklistRow extends Component {

  onDetailsPress = () => {
    this.setState({ isDetailsModalOpen: true });
-  }
+  };

  onDetailsModalClose = () => {
    this.setState({ isDetailsModalOpen: false });
-  }
+  };

  //
  // Render
@@ -45,6 +46,7 @@ class BlacklistRow extends Component {
      author,
      sourceTitle,
      quality,
+      customFormats,
      date,
      protocol,
      indexer,
@@ -110,6 +112,16 @@ class BlacklistRow extends Component {
              );
            }

+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <BookFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
            if (name === 'date') {
              return (
                <RelativeDateCellConnector
@@ -142,7 +154,7 @@ class BlacklistRow extends Component {
                  />

                  <IconButton
-                    title={translate('RemoveFromBlacklist')}
+                    title={translate('RemoveFromBlocklist')}
                    name={icons.REMOVE}
                    kind={kinds.DANGER}
                    onPress={onRemovePress}
@@ -155,7 +167,7 @@ class BlacklistRow extends Component {
          })
        }

-        <BlacklistDetailsModal
+        <BlocklistDetailsModal
          isOpen={this.state.isDetailsModalOpen}
          sourceTitle={sourceTitle}
          protocol={protocol}
@@ -169,11 +181,12 @@ class BlacklistRow extends Component {

 }

-BlacklistRow.propTypes = {
+BlocklistRow.propTypes = {
  id: PropTypes.number.isRequired,
  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,
@@ -184,4 +197,4 @@ BlacklistRow.propTypes = {
  onRemovePress: PropTypes.func.isRequired
 };

-export default BlacklistRow;
+export default BlocklistRow;
@@ -1,8 +1,8 @@
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { removeBlacklistItem } from 'Store/Actions/blacklistActions';
+import { removeBlocklistItem } from 'Store/Actions/blocklistActions';
 import createAuthorSelector from 'Store/Selectors/createAuthorSelector';
-import BlacklistRow from './BlacklistRow';
+import BlocklistRow from './BlocklistRow';

 function createMapStateToProps() {
  return createSelector(
@@ -18,9 +18,9 @@ function createMapStateToProps() {
 function createMapDispatchToProps(dispatch, props) {
  return {
    onRemovePress() {
-      dispatch(removeBlacklistItem({ id: props.id }));
+      dispatch(removeBlocklistItem({ id: props.id }));
    }
  };
 }

-export default connect(createMapStateToProps, createMapDispatchToProps)(BlacklistRow);
+export default connect(createMapStateToProps, createMapDispatchToProps)(BlocklistRow);
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'description': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -9,6 +9,7 @@ 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';

@@ -65,8 +66,10 @@ function HistoryDetails(props) {
    const {
      indexer,
      releaseGroup,
+      customFormatScore,
      nzbInfoUrl,
      downloadClient,
+      downloadClientName,
      downloadId,
      age,
      ageHours,
@@ -74,6 +77,8 @@ function HistoryDetails(props) {
      publishedDate
    } = data;

+    const downloadClientNameInfo = downloadClientName ?? downloadClient;
+
    return (
      <DescriptionList>
        <DescriptionListItem
@@ -100,7 +105,16 @@ function HistoryDetails(props) {
        }

        {
-          !!nzbInfoUrl &&
+          customFormatScore && customFormatScore !== '0' ?
+            <DescriptionListItem
+              title={translate('CustomFormatScore')}
+              data={formatCustomFormatScore(customFormatScore)}
+            /> :
+            null
+        }
+
+        {
+          nzbInfoUrl ?
            <span>
              <DescriptionListItemTitle>
                Info URL
@@ -109,15 +123,17 @@ function HistoryDetails(props) {
              <DescriptionListItemDescription>
                <Link to={nzbInfoUrl}>{nzbInfoUrl}</Link>
              </DescriptionListItemDescription>
-            </span>
+            </span> :
+            null
        }

        {
-          !!downloadClient &&
+          downloadClientNameInfo ?
            <DescriptionListItem
              title={translate('DownloadClient')}
-              data={downloadClient}
-            />
+              data={downloadClientNameInfo}
+            /> :
+            null
        }

        {
@@ -173,6 +189,7 @@ function HistoryDetails(props) {

  if (eventType === 'bookFileImported') {
    const {
+      customFormatScore,
      droppedPath,
      importedPath
    } = data;
@@ -195,12 +212,22 @@ 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>
    );
@@ -208,20 +235,21 @@ function HistoryDetails(props) {

  if (eventType === 'bookFileDeleted') {
    const {
-      reason
+      reason,
+      customFormatScore
    } = data;

    let reasonMessage = '';

    switch (reason) {
      case 'Manual':
-        reasonMessage = 'File was deleted by via UI';
+        reasonMessage = translate('FileWasDeletedByViaUI');
        break;
      case 'MissingFromDisk':
-        reasonMessage = 'Readarr was unable to find the file on disk so it was removed';
+        reasonMessage = translate('MissingFromDisk');
        break;
      case 'Upgrade':
-        reasonMessage = 'File was deleted to import an upgrade';
+        reasonMessage = translate('FileWasDeletedByUpgrade');
        break;
      default:
        reasonMessage = '';
@@ -238,6 +266,15 @@ function HistoryDetails(props) {
          title={translate('Reason')}
          data={reasonMessage}
        />
+
+        {
+          customFormatScore && customFormatScore !== '0' ?
+            <DescriptionListItem
+              title={translate('CustomFormatScore')}
+              data={formatCustomFormatScore(customFormatScore)}
+            /> :
+            null
+        }
      </DescriptionList>
    );
  }
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'markAsFailedButton': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -1,5 +1,6 @@
 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';
@@ -11,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 } from 'Helpers/Props';
+import { align, icons, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import HistoryRowConnector from './HistoryRowConnector';

@@ -85,9 +86,9 @@ class History extends Component {

          {
            !isFetchingAny && hasError &&
-              <div>
+              <Alert kind={kinds.DANGER}>
                {translate('UnableToLoadHistory')}
-              </div>
+              </Alert>
          }

          {
@@ -95,9 +96,9 @@ class History extends Component {
            // wait for the books to populate because they are never coming.

            isPopulated && !hasError && !items.length &&
-              <div>
-                No history found
-              </div>
+              <Alert kind={kinds.INFO}>
+                {translate('NoHistory')}
+              </Alert>
          }

          {
@@ -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
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'cell': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -23,8 +23,6 @@ function getIconName(eventType) {
      return icons.RETAG;
    case 'bookImportIncomplete':
      return icons.DOWNLOADED;
-    case 'downloadImported':
-      return icons.DOWNLOADED;
    case 'downloadIgnored':
      return icons.IGNORE;
    default:
@@ -61,8 +59,6 @@ function getTooltip(eventType, data) {
      return 'Book file tags updated';
    case 'bookImportIncomplete':
      return 'Files downloaded but not all could be imported';
-    case 'downloadImported':
-      return 'Download completed and successfully imported';
    case 'downloadIgnored':
      return 'Book Download Ignored';
    default:
@@ -10,6 +10,12 @@
  width: 80px;
 }

+.customFormatScore {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 55px;
+}
+
 .releaseGroup {
  composes: cell from '~Components/Table/Cells/TableRowCell.css';

@@ -0,0 +1,11 @@
+// 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;
@@ -1,13 +1,16 @@
 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 { icons } from 'Helpers/Props';
+import Tooltip from 'Components/Tooltip/Tooltip';
+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';
@@ -40,11 +43,11 @@ class HistoryRow extends Component {

  onDetailsPress = () => {
    this.setState({ isDetailsModalOpen: true });
-  }
+  };

  onDetailsModalClose = () => {
    this.setState({ isDetailsModalOpen: false });
-  }
+  };

  //
  // Render
@@ -54,6 +57,8 @@ class HistoryRow extends Component {
      author,
      book,
      quality,
+      customFormats,
+      customFormatScore,
      qualityCutoffNotMet,
      eventType,
      sourceTitle,
@@ -127,6 +132,16 @@ class HistoryRow extends Component {
              );
            }

+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <BookFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
            if (name === 'date') {
              return (
                <RelativeDateCellConnector
@@ -158,6 +173,24 @@ 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
@@ -169,6 +202,16 @@ class HistoryRow extends Component {
              );
            }

+            if (name === 'sourceTitle') {
+              return (
+                <TableRowCell
+                  key={name}
+                >
+                  {sourceTitle}
+                </TableRowCell>
+              );
+            }
+
            if (name === 'details') {
              return (
                <TableRowCell
@@ -209,6 +252,8 @@ 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,
@@ -222,4 +267,8 @@ HistoryRow.propTypes = {
  onMarkAsFailedPress: PropTypes.func.isRequired
 };

+HistoryRow.defaultProps = {
+  customFormats: []
+};
+
 export default HistoryRow;
@@ -49,7 +49,7 @@ class HistoryRowConnector extends Component {

  onMarkAsFailedPress = () => {
    this.props.markAsFailed({ id: this.props.id });
-  }
+  };

  //
  // Render
@@ -1,13 +1,13 @@
 .torrent {
  composes: label from '~Components/Label.css';

-  border-color: $torrentColor;
-  background-color: $torrentColor;
+  border-color: var(--torrentColor);
+  background-color: var(--torrentColor);
 }

 .usenet {
  composes: label from '~Components/Label.css';

-  border-color: $usenetColor;
-  background-color: $usenetColor;
+  border-color: var(--usenetColor);
+  background-color: var(--usenetColor);
 }
@@ -0,0 +1,8 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'torrent': string;
+  'usenet': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -1,6 +1,7 @@
 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';
@@ -12,7 +13,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 } from 'Helpers/Props';
+import { align, icons, kinds } from 'Helpers/Props';
 import getRemovedItems from 'Utilities/Object/getRemovedItems';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
 import translate from 'Utilities/String/translate';
@@ -75,13 +76,23 @@ 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) {
-      this.setState({ isPendingSelected });
+      nextState.isPendingSelected = isPendingSelected;
+    }
+
+    if (!_.isEmpty(nextState)) {
+      this.setState(nextState);
    }
  }

@@ -90,45 +101,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
@@ -216,26 +227,29 @@ class Queue extends Component {

        <PageContentBody>
          {
-            isRefreshing && !isAllPopulated &&
-              <LoadingIndicator />
+            isRefreshing && !isAllPopulated ?
+              <LoadingIndicator /> :
+              null
          }

          {
-            !isRefreshing && hasError &&
-              <div>
-                Failed to load Queue
-              </div>
+            !isRefreshing && hasError ?
+              <Alert kind={kinds.DANGER}>
+                {translate('FailedToLoadQueue')}
+              </Alert> :
+              null
          }

          {
-            isAllPopulated && !hasError && !items.length &&
-              <div>
-                Queue is empty
-              </div>
+            isAllPopulated && !hasError && !items.length ?
+              <Alert kind={kinds.INFO}>
+                {translate('QueueIsEmpty')}
+              </Alert> :
+              null
          }

          {
-            isAllPopulated && !hasError && !!items.length &&
+            isAllPopulated && !hasError && !!items.length ?
              <div>
                <Table
                  columns={columns}
@@ -270,7 +284,8 @@ class Queue extends Component {
                  isFetching={isRefreshing}
                  {...otherProps}
                />
-              </div>
+              </div> :
+              null
          }
        </PageContentBody>

@@ -284,6 +299,17 @@ class Queue extends Component {
              return !!(item && item.authorId && item.bookId);
            })
          )}
+          allPending={isConfirmRemoveModalOpen && (
+            selectedIds.every((id) => {
+              const item = items.find((i) => i.id === id);
+
+              if (!item) {
+                return false;
+              }
+
+              return item.status === 'delay' || item.status === 'downloadClientUnavailable';
+            })
+          )}
          onRemovePress={this.onRemoveSelectedConfirmed}
          onModalClose={this.onConfirmRemoveModalClose}
        />
@@ -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
@@ -42,7 +42,7 @@ class QueueOptions extends Component {
        [name]: value
      });
    });
-  }
+  };

  //
  // Render
@@ -16,6 +16,12 @@
  width: 150px;
 }

+.customFormatScore {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 55px;
+}
+
 .actions {
  composes: cell from '~Components/Table/Cells/TableRowCell.css';

@@ -0,0 +1,11 @@
+// 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;
@@ -2,6 +2,7 @@ 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';
@@ -13,9 +14,11 @@ 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';
@@ -41,37 +44,37 @@ class QueueRow extends Component {

  onRemoveQueueItemPress = () => {
    this.setState({ isRemoveQueueItemModalOpen: true });
-  }
+  };

-  onRemoveQueueItemModalConfirmed = (blacklist, skipredownload) => {
+  onRemoveQueueItemModalConfirmed = (blocklist, skipRedownload) => {
    const {
      onRemoveQueueItemPress,
      onQueueRowModalOpenOrClose
    } = this.props;

    onQueueRowModalOpenOrClose(false);
-    onRemoveQueueItemPress(blacklist, 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
@@ -89,6 +92,8 @@ class QueueRow extends Component {
      author,
      book,
      quality,
+      customFormats,
+      customFormatScore,
      protocol,
      indexer,
      outputPath,
@@ -210,6 +215,34 @@ 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}>
@@ -357,6 +390,7 @@ class QueueRow extends Component {
          isOpen={isRemoveQueueItemModalOpen}
          sourceTitle={title}
          canIgnore={!!author}
+          isPending={isPending}
          onRemovePress={this.onRemoveQueueItemModalConfirmed}
          onModalClose={this.onRemoveQueueItemModalClose}
        />
@@ -378,6 +412,8 @@ 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,
@@ -402,6 +438,7 @@ QueueRow.propTypes = {
 };

 QueueRow.defaultProps = {
+  customFormats: [],
  isGrabbing: false,
  isRemoving: false
 };
@@ -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
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'status': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -22,8 +22,8 @@ class RemoveQueueItemModal extends Component {

    this.state = {
      remove: true,
-      blacklist: false,
-      skipredownload: false
+      blocklist: false,
+      skipRedownload: false
    };
  }

@@ -33,37 +33,37 @@ class RemoveQueueItemModal extends Component {
  resetState = function() {
    this.setState({
      remove: true,
-      blacklist: false,
-      skipredownload: false
+      blocklist: false,
+      skipRedownload: false
    });
-  }
+  };

  //
  // Listeners

  onRemoveChange = ({ value }) => {
    this.setState({ remove: value });
-  }
+  };

-  onBlacklistChange = ({ value }) => {
-    this.setState({ blacklist: value });
-  }
+  onBlocklistChange = ({ value }) => {
+    this.setState({ blocklist: value });
+  };

-  onSkipReDownloadChange = ({ value }) => {
-    this.setState({ skipredownload: 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
@@ -72,10 +72,11 @@ class RemoveQueueItemModal extends Component {
    const {
      isOpen,
      sourceTitle,
-      canIgnore
+      canIgnore,
+      isPending
    } = this.props;

-    const { remove, blacklist, skipredownload } = this.state;
+    const { remove, blocklist, skipRedownload } = this.state;

    return (
      <Modal
@@ -95,47 +96,51 @@ class RemoveQueueItemModal extends Component {
              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('RemoveFromDownloadClient')}
+                {translate('BlocklistRelease')}
              </FormLabel>

              <FormInputGroup
                type={inputTypes.CHECK}
-                name="remove"
-                value={remove}
-                helpTextWarning={translate('RemoveHelpTextWarning')}
-                isDisabled={!canIgnore}
-                onChange={this.onRemoveChange}
-              />
-            </FormGroup>
-
-            <FormGroup>
-              <FormLabel>
-                {translate('BlacklistRelease')}
-              </FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.CHECK}
-                name="blacklist"
-                value={blacklist}
-                helpText={translate('BlacklistHelpText')}
-                onChange={this.onBlacklistChange}
+                name="blocklist"
+                value={blocklist}
+                helpText={translate('BlocklistReleaseHelpText')}
+                onChange={this.onBlocklistChange}
              />
            </FormGroup>

            {
-              blacklist &&
+              blocklist &&
                <FormGroup>
                  <FormLabel>
                    {translate('SkipRedownload')}
                  </FormLabel>
                  <FormInputGroup
                    type={inputTypes.CHECK}
-                    name="skipredownload"
-                    value={skipredownload}
-                    helpText={translate('SkipredownloadHelpText')}
-                    onChange={this.onSkipReDownloadChange}
+                    name="skipRedownload"
+                    value={skipRedownload}
+                    helpText={translate('SkipRedownloadHelpText')}
+                    onChange={this.onSkipRedownloadChange}
                  />
                </FormGroup>
            }
@@ -164,6 +169,7 @@ 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
 };
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'message': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -23,48 +23,48 @@ class RemoveQueueItemsModal extends Component {

    this.state = {
      remove: true,
-      blacklist: false,
-      skipredownload: false
+      blocklist: false,
+      skipRedownload: false
    };
  }

  //
  // Control

-   resetState = function() {
-     this.setState({
-       remove: true,
-       blacklist: false,
-       skipredownload: false
-     });
-   }
+  resetState = function() {
+    this.setState({
+      remove: true,
+      blocklist: false,
+      skipRedownload: false
+    });
+  };

-   //
-   // Listeners
+  //
+  // Listeners

-   onRemoveChange = ({ value }) => {
-     this.setState({ remove: value });
-   }
+  onRemoveChange = ({ value }) => {
+    this.setState({ remove: value });
+  };

-  onBlacklistChange = ({ value }) => {
-    this.setState({ blacklist: value });
-  }
+  onBlocklistChange = ({ value }) => {
+    this.setState({ blocklist: value });
+  };

-  onSkipReDownloadChange = ({ value }) => {
-    this.setState({ skipredownload: 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
@@ -73,10 +73,11 @@ class RemoveQueueItemsModal extends Component {
    const {
      isOpen,
      selectedCount,
-      canIgnore
+      canIgnore,
+      allPending
    } = this.props;

-    const { remove, blacklist, skipredownload } = this.state;
+    const { remove, blocklist, skipRedownload } = this.state;

    return (
      <Modal
@@ -88,55 +89,59 @@ class RemoveQueueItemsModal extends Component {
          onModalClose={this.onModalClose}
        >
          <ModalHeader>
-            Remove Selected Item{selectedCount > 1 ? 's' : ''}
+            {selectedCount > 1 ? translate('RemoveSelectedItems') : translate('RemoveSelectedItem')}
          </ModalHeader>

          <ModalBody>
            <div className={styles.message}>
-              Are you sure you want to remove {selectedCount} item{selectedCount > 1 ? 's' : ''} from the queue?
+              {selectedCount > 1 ? translate('RemoveSelectedItemsQueueMessageText', selectedCount) : translate('RemoveSelectedItemQueueMessageText')}
            </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>
-                {translate('RemoveFromDownloadClient')}
+                {selectedCount > 1 ? translate('BlocklistReleases') : translate('BlocklistRelease')}
              </FormLabel>

              <FormInputGroup
                type={inputTypes.CHECK}
-                name="remove"
-                value={remove}
-                helpTextWarning={translate('RemoveHelpTextWarning')}
-                isDisabled={!canIgnore}
-                onChange={this.onRemoveChange}
-              />
-            </FormGroup>
-
-            <FormGroup>
-              <FormLabel>
-                Blacklist Release{selectedCount > 1 ? 's' : ''}
-              </FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.CHECK}
-                name="blacklist"
-                value={blacklist}
-                helpText={translate('BlacklistHelpText')}
-                onChange={this.onBlacklistChange}
+                name="blocklist"
+                value={blocklist}
+                helpText={translate('BlocklistReleaseHelpText')}
+                onChange={this.onBlocklistChange}
              />
            </FormGroup>

            {
-              blacklist &&
+              blocklist &&
                <FormGroup>
                  <FormLabel>
                    {translate('SkipRedownload')}
                  </FormLabel>
                  <FormInputGroup
                    type={inputTypes.CHECK}
-                    name="skipredownload"
-                    value={skipredownload}
-                    helpText={translate('SkipredownloadHelpText')}
-                    onChange={this.onSkipReDownloadChange}
+                    name="skipRedownload"
+                    value={skipRedownload}
+                    helpText={translate('SkipRedownloadHelpText')}
+                    onChange={this.onSkipRedownloadChange}
                  />
                </FormGroup>
            }
@@ -145,14 +150,14 @@ class RemoveQueueItemsModal extends Component {

          <ModalFooter>
            <Button onPress={this.onModalClose}>
-              Close
+              {translate('Close')}
            </Button>

            <Button
              kind={kinds.DANGER}
              onPress={this.onRemoveConfirmed}
            >
-              Remove
+              {translate('Remove')}
            </Button>
          </ModalFooter>
        </ModalContent>
@@ -165,6 +170,7 @@ 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
 };
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'timeleft': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -0,0 +1,27 @@
+import React from 'react';
+import DescriptionList from 'Components/DescriptionList/DescriptionList';
+import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
+import translate from 'Utilities/String/translate';
+
+function AuthorMonitorNewItemsOptionsPopoverContent() {
+  return (
+    <DescriptionList>
+      <DescriptionListItem
+        title={translate('AllBooks')}
+        data={translate('DataNewAllBooks')}
+      />
+
+      <DescriptionListItem
+        title={translate('NewBooks')}
+        data={translate('DataNewBooks')}
+      />
+
+      <DescriptionListItem
+        title={translate('None')}
+        data={translate('DataNewNone')}
+      />
+    </DescriptionList>
+  );
+}
+
+export default AuthorMonitorNewItemsOptionsPopoverContent;
@@ -1,46 +1,52 @@
 import React from 'react';
+import Alert from 'Components/Alert';
 import DescriptionList from 'Components/DescriptionList/DescriptionList';
 import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
 import translate from 'Utilities/String/translate';

 function AuthorMonitoringOptionsPopoverContent() {
  return (
-    <DescriptionList>
-      <DescriptionListItem
-        title={translate('AllBooks')}
-        data="Monitor all books"
-      />
+    <>
+      <Alert>
+        {translate('MonitoringOptionsHelpText')}
+      </Alert>
+      <DescriptionList>
+        <DescriptionListItem
+          title={translate('AllBooks')}
+          data={translate('DataAllBooks')}
+        />

-      <DescriptionListItem
-        title={translate('FutureBooks')}
-        data="Monitor books that have not released yet"
-      />
+        <DescriptionListItem
+          title={translate('FutureBooks')}
+          data={translate('DataFutureBooks')}
+        />

-      <DescriptionListItem
-        title={translate('MissingBooks')}
-        data="Monitor books that do not have files or have not released yet"
-      />
+        <DescriptionListItem
+          title={translate('MissingBooks')}
+          data={translate('DataMissingBooks')}
+        />

-      <DescriptionListItem
-        title={translate('ExistingBooks')}
-        data="Monitor books that have files or have not released yet"
-      />
+        <DescriptionListItem
+          title={translate('ExistingBooks')}
+          data={translate('DataExistingBooks')}
+        />

-      <DescriptionListItem
-        title={translate('FirstBook')}
-        data="Monitor the first book. All other books will be ignored"
-      />
+        <DescriptionListItem
+          title={translate('FirstBook')}
+          data={translate('DataFirstBook')}
+        />

-      <DescriptionListItem
-        title={translate('LatestBook')}
-        data="Monitor the latest book and future books"
-      />
+        <DescriptionListItem
+          title={translate('LatestBook')}
+          data={translate('DataLatestBook')}
+        />

-      <DescriptionListItem
-        title={translate('None')}
-        data="No books will be monitored"
-      />
-    </DescriptionList>
+        <DescriptionListItem
+          title={translate('None')}
+          data={translate('DataNone')}
+        />
+      </DescriptionList>
+    </>
  );
 }

@@ -4,16 +4,19 @@ 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 }) {
+function App({ store, history, hasTranslationsError }) {
  return (
-    <DocumentTitle title="Readarr">
+    <DocumentTitle title={window.Readarr.instanceName}>
      <Provider store={store}>
        <ConnectedRouter history={history}>
-          <PageConnector>
-            <AppRoutes app={App} />
-          </PageConnector>
+          <ApplyTheme>
+            <PageConnector hasTranslationsError={hasTranslationsError}>
+              <AppRoutes app={App} />
+            </PageConnector>
+          </ApplyTheme>
        </ConnectedRouter>
      </Provider>
    </DocumentTitle>
@@ -22,7 +25,8 @@ function App({ store, history }) {

 App.propTypes = {
  store: PropTypes.object.isRequired,
-  history: PropTypes.object.isRequired
+  history: PropTypes.object.isRequired,
+  hasTranslationsError: PropTypes.bool.isRequired
 };

 export default App;
@@ -1,11 +1,10 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { Redirect, Route } from 'react-router-dom';
-import BlacklistConnector from 'Activity/Blacklist/BlacklistConnector';
+import BlocklistConnector from 'Activity/Blocklist/BlocklistConnector';
 import HistoryConnector from 'Activity/History/HistoryConnector';
 import QueueConnector from 'Activity/Queue/QueueConnector';
 import AuthorDetailsPageConnector from 'Author/Details/AuthorDetailsPageConnector';
-import AuthorEditorConnector from 'Author/Editor/AuthorEditorConnector';
 import AuthorIndexConnector from 'Author/Index/AuthorIndexConnector';
 import BookDetailsPageConnector from 'Book/Details/BookDetailsPageConnector';
 import BookIndexConnector from 'Book/Index/BookIndexConnector';
@@ -14,6 +13,7 @@ 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 +23,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 Quality from 'Settings/Quality/Quality';
+import QualityConnector from 'Settings/Quality/QualityConnector';
 import Settings from 'Settings/Settings';
 import TagSettings from 'Settings/Tags/TagSettings';
 import UISettingsConnector from 'Settings/UI/UISettingsConnector';
@@ -82,11 +82,6 @@ function AppRoutes(props) {
        component={AddNewItemConnector}
      />

-      <Route
-        path="/authoreditor"
-        component={AuthorEditorConnector}
-      />
-
      <Route
        exact={true}
        path="/shelf"
@@ -138,8 +133,8 @@ function AppRoutes(props) {
      />

      <Route
-        path="/activity/blacklist"
-        component={BlacklistConnector}
+        path="/activity/blocklist"
+        component={BlocklistConnector}
      />

      {/*
@@ -178,7 +173,12 @@ function AppRoutes(props) {

      <Route
        path="/settings/quality"
-        component={Quality}
+        component={QualityConnector}
+      />
+
+      <Route
+        path="/settings/customformats"
+        component={CustomFormatSettingsConnector}
      />

      <Route
@@ -0,0 +1,9 @@
+// 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;
@@ -11,9 +11,47 @@ 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,
@@ -21,7 +59,7 @@ function AppUpdatedModalContent(props) {
    onModalClose
  } = props;

-  const update = items[0];
+  const update = mergeUpdates(items, version, prevVersion);

  return (
    <ModalContent onModalClose={onModalClose}>
@@ -39,7 +77,9 @@ function AppUpdatedModalContent(props) {
            <div>
              {
                !update.changes &&
-                  <div className={styles.maintenance}>Maintenance release</div>
+                  <div className={styles.maintenance}>
+                    {translate('MaintenanceRelease')}
+                  </div>
              }

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

      return {
        version,
+        prevVersion,
        isPopulated,
        error,
        items
@@ -0,0 +1,49 @@
+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);
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'automatic': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -0,0 +1,5 @@
+interface ModelBase {
+  id: number;
+}
+
+export default ModelBase;
@@ -0,0 +1,48 @@
+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;
@@ -0,0 +1,41 @@
+import SettingsAppState from './SettingsAppState';
+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[];
+}
+
+interface AppState {
+  settings: SettingsAppState;
+  tags: TagsAppState;
+}
+
+export default AppState;
@@ -0,0 +1,40 @@
+import AppSectionState, {
+  AppSectionDeleteState,
+  AppSectionSaveState,
+} from 'App/State/AppSectionState';
+import DownloadClient from 'typings/DownloadClient';
+import ImportList from 'typings/ImportList';
+import Indexer from 'typings/Indexer';
+import Notification from 'typings/Notification';
+import { UiSettings } from 'typings/UiSettings';
+
+export interface DownloadClientAppState
+  extends AppSectionState<DownloadClient>,
+    AppSectionDeleteState,
+    AppSectionSaveState {}
+
+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 UiSettingsAppState = AppSectionState<UiSettings>;
+
+interface SettingsAppState {
+  downloadClients: DownloadClientAppState;
+  importLists: ImportListAppState;
+  indexers: IndexerAppState;
+  notifications: NotificationAppState;
+  uiSettings: UiSettingsAppState;
+}
+
+export default SettingsAppState;
@@ -0,0 +1,12 @@
+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;
@@ -99,7 +99,7 @@ class AuthorImage extends Component {
    if (this.props.onError) {
      this.props.onError();
    }
-  }
+  };

  onLoad = () => {
    this.setState({
@@ -110,7 +110,7 @@ class AuthorImage extends Component {
    if (this.props.onLoad) {
      this.props.onLoad();
    }
-  }
+  };

  //
  // Render
@@ -8,5 +8,5 @@

 .deleteFilesMessage {
  margin-top: 20px;
-  color: $dangerColor;
+  color: var(--dangerColor);
 }
@@ -0,0 +1,9 @@
+// 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;
@@ -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
@@ -32,7 +32,7 @@ class DeleteAuthorModalContentConnector extends Component {
    });

    this.props.onModalClose(true);
-  }
+  };

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

 .metadataMessage {
-  color: $helpTextColor;
+  color: var(--helpTextColor);
  text-align: center;
  font-weight: 300;
  font-size: 20px;
@@ -22,7 +22,7 @@
 .tabList {
  margin: 0;
  padding: 0;
-  border-bottom: 1px solid $lightGray;
+  border-bottom: 1px solid var(--lightGray);
 }

 .tab {
@@ -37,7 +37,7 @@
 }

 .selectedTab {
-  border-bottom: 4px solid $linkColor;
+  border-bottom: 4px solid var(--linkColor);
 }

 .tabContent {
@@ -63,7 +63,7 @@
  white-space: nowrap;

  &:hover {
-    color: $iconButtonHoverLightColor;
+    color: var(--iconButtonHoverLightColor);
  }
 }

@@ -0,0 +1,17 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'authorNavigationButton': string;
+  'authorNavigationButtons': string;
+  'authorUpButton': string;
+  'contentContainer': string;
+  'errorMessage': string;
+  'innerContentBody': string;
+  'metadataMessage': string;
+  'selectedTab': string;
+  'tab': string;
+  'tabContent': string;
+  'tabList': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -5,6 +5,7 @@ import DeleteAuthorModal from 'Author/Delete/DeleteAuthorModal';
 import EditAuthorModalConnector from 'Author/Edit/EditAuthorModalConnector';
 import AuthorHistoryTable from 'Author/History/AuthorHistoryTable';
 import MonitoringOptionsModal from 'Author/MonitoringOptions/MonitoringOptionsModal';
+import BookEditorFooter from 'Book/Editor/BookEditorFooter';
 import BookFileEditorTable from 'BookFile/Editor/BookFileEditorTable';
 import IconButton from 'Components/Link/IconButton';
 import Link from 'Components/Link/Link';
@@ -22,6 +23,7 @@ import InteractiveSearchTable from 'InteractiveSearch/InteractiveSearchTable';
 import OrganizePreviewModalConnector from 'Organize/OrganizePreviewModalConnector';
 import RetagPreviewModalConnector from 'Retag/RetagPreviewModalConnector';
 import translate from 'Utilities/String/translate';
+import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
 import InteractiveImportModal from '../../InteractiveImport/InteractiveImportModal';
@@ -53,66 +55,113 @@ class AuthorDetails extends Component {
      isDeleteAuthorModalOpen: false,
      isInteractiveImportModalOpen: false,
      isMonitorOptionsModalOpen: false,
+      isEditorActive: false,
      allExpanded: false,
      allCollapsed: false,
      expandedState: {},
+      allSelected: false,
+      allUnselected: false,
+      lastToggled: null,
+      selectedState: {},
      selectedTabIndex: 0
    };
  }

+  //
+  // Control
+
+  setSelectedState = (items) => {
+    const {
+      selectedState
+    } = this.state;
+
+    const newSelectedState = {};
+
+    items.forEach((item) => {
+      const isItemSelected = selectedState[item.id];
+
+      if (isItemSelected) {
+        newSelectedState[item.id] = isItemSelected;
+      } else {
+        newSelectedState[item.id] = false;
+      }
+    });
+
+    const selectedCount = getSelectedIds(newSelectedState).length;
+    const newStateCount = Object.keys(newSelectedState).length;
+    let isAllSelected = false;
+    let isAllUnselected = false;
+
+    if (selectedCount === 0) {
+      isAllUnselected = true;
+    } else if (selectedCount === newStateCount) {
+      isAllSelected = true;
+    }
+
+    this.setState({ selectedState: newSelectedState, allSelected: isAllSelected, allUnselected: isAllUnselected });
+  };
+
+  getSelectedIds = () => {
+    return getSelectedIds(this.state.selectedState);
+  };
+
  //
  // Listeners

  onOrganizePress = () => {
    this.setState({ isOrganizeModalOpen: true });
-  }
+  };

  onOrganizeModalClose = () => {
    this.setState({ isOrganizeModalOpen: false });
-  }
+  };

  onRetagPress = () => {
    this.setState({ isRetagModalOpen: true });
-  }
+  };

  onRetagModalClose = () => {
    this.setState({ isRetagModalOpen: false });
-  }
+  };

  onInteractiveImportPress = () => {
    this.setState({ isInteractiveImportModalOpen: true });
-  }
+  };

  onInteractiveImportModalClose = () => {
    this.setState({ isInteractiveImportModalOpen: false });
-  }
+  };

  onEditAuthorPress = () => {
    this.setState({ isEditAuthorModalOpen: true });
-  }
+  };

  onEditAuthorModalClose = () => {
    this.setState({ isEditAuthorModalOpen: false });
-  }
+  };

  onDeleteAuthorPress = () => {
    this.setState({
      isEditAuthorModalOpen: false,
      isDeleteAuthorModalOpen: true
    });
-  }
+  };

  onDeleteAuthorModalClose = () => {
    this.setState({ isDeleteAuthorModalOpen: false });
-  }
+  };

  onMonitorOptionsPress = () => {
    this.setState({ isMonitorOptionsModalOpen: true });
-  }
+  };

  onMonitorOptionsClose = () => {
    this.setState({ isMonitorOptionsModalOpen: false });
-  }
+  };
+
+  onBookEditorTogglePress = () => {
+    this.setState({ isEditorActive: !this.state.isEditorActive });
+  };

  onExpandAllPress = () => {
    const {
@@ -121,7 +170,7 @@ class AuthorDetails extends Component {
    } = this.state;

    this.setState(getExpandedState(selectAll(expandedState, !allExpanded)));
-  }
+  };

  onExpandPress = (bookId, isExpanded) => {
    this.setState((state) => {
@@ -135,11 +184,32 @@ class AuthorDetails extends Component {

      return getExpandedState(newState);
    });
-  }
+  };
+
+  onSelectAllChange = ({ value }) => {
+    this.setState(selectAll(this.state.selectedState, value));
+  };
+
+  onSelectAllPress = () => {
+    this.onSelectAllChange({ value: !this.state.allSelected });
+  };
+
+  onSelectedChange = (items, id, value, shiftKey = false) => {
+    this.setState((state) => {
+      return toggleSelected(state, items, id, value, shiftKey);
+    });
+  };
+
+  onSaveSelected = (changes) => {
+    this.props.onSaveSelected({
+      bookIds: this.getSelectedIds(),
+      ...changes
+    });
+  };

  onTabSelect = (index, lastIndex) => {
    this.setState({ selectedTabIndex: index });
-  }
+  };

  //
  // Render
@@ -165,6 +235,10 @@ class AuthorDetails extends Component {
      nextAuthor,
      onRefreshPress,
      onSearchPress,
+      isSaving,
+      saveError,
+      isDeleting,
+      deleteError,
      statistics
    } = this.props;

@@ -175,6 +249,9 @@ class AuthorDetails extends Component {
      isDeleteAuthorModalOpen,
      isInteractiveImportModalOpen,
      isMonitorOptionsModalOpen,
+      isEditorActive,
+      allSelected,
+      selectedState,
      allExpanded,
      allCollapsed,
      expandedState,
@@ -189,12 +266,14 @@ class AuthorDetails extends Component {
      expandIcon = icons.EXPAND;
    }

+    const selectedBookIds = this.getSelectedIds();
+
    return (
      <PageContent title={authorName}>
        <PageToolbar>
          <PageToolbarSection>
            <PageToolbarButton
-              label={translate('RefreshScan')}
+              label={translate('RefreshAndScan')}
              iconName={icons.REFRESH}
              spinningName={icons.REFRESH}
              title={translate('RefreshInformationAndScanDisk')}
@@ -252,6 +331,33 @@ class AuthorDetails extends Component {
              iconName={icons.DELETE}
              onPress={this.onDeleteAuthorPress}
            />
+
+            <PageToolbarSeparator />
+
+            {
+              isEditorActive ?
+                <PageToolbarButton
+                  label={translate('BookList')}
+                  iconName={icons.AUTHOR_CONTINUING}
+                  onPress={this.onBookEditorTogglePress}
+                /> :
+                <PageToolbarButton
+                  label={translate('BookEditor')}
+                  iconName={icons.EDIT}
+                  onPress={this.onBookEditorTogglePress}
+                />
+            }
+
+            {
+              isEditorActive ?
+                <PageToolbarButton
+                  label={allSelected ? translate('UnselectAll') : translate('SelectAll')}
+                  iconName={icons.CHECK_SQUARE}
+                  onPress={this.onSelectAllPress}
+                /> :
+                null
+            }
+
          </PageToolbarSection>

          <PageToolbarSection alignContent={align.RIGHT}>
@@ -286,10 +392,7 @@ class AuthorDetails extends Component {
                name={icons.ARROW_UP}
                size={30}
                title={translate('GoToAuthorListing')}
-                to={{
-                  pathname: '/',
-                  state: { restoreScrollPosition: true }
-                }}
+                to={'/'}
              />

              <IconButton
@@ -377,7 +480,11 @@ class AuthorDetails extends Component {
                    <AuthorDetailsSeasonConnector
                      authorId={id}
                      isExpanded={true}
+                      selectedState={selectedState}
                      onExpandPress={this.onExpandPress}
+                      setSelectedState={this.setSelectedState}
+                      onSelectedChange={this.onSelectedChange}
+                      isEditorActive={isEditorActive}
                    />
                  </TabPanel>

@@ -422,7 +529,6 @@ class AuthorDetails extends Component {
                  </TabPanel>
                </Tabs>
            }
-
          </div>

          <div className={styles.metadataMessage}>
@@ -474,6 +580,19 @@ class AuthorDetails extends Component {
            onModalClose={this.onMonitorOptionsClose}
          />
        </PageContentBody>
+
+        {
+          isEditorActive &&
+            <BookEditorFooter
+              bookIds={selectedBookIds}
+              selectedCount={selectedBookIds.length}
+              isSaving={isSaving}
+              saveError={saveError}
+              isDeleting={isDeleting}
+              deleteError={deleteError}
+              onSaveSelected={this.onSaveSelected}
+            />
+        }
      </PageContent>
    );
  }
@@ -493,7 +612,6 @@ AuthorDetails.propTypes = {
  images: PropTypes.arrayOf(PropTypes.object).isRequired,
  alternateTitles: PropTypes.arrayOf(PropTypes.string).isRequired,
  tags: PropTypes.arrayOf(PropTypes.number).isRequired,
-  isSaving: PropTypes.bool.isRequired,
  isRefreshing: PropTypes.bool.isRequired,
  isSearching: PropTypes.bool.isRequired,
  isFetching: PropTypes.bool.isRequired,
@@ -510,13 +628,17 @@ AuthorDetails.propTypes = {
  isSmallScreen: PropTypes.bool.isRequired,
  onMonitorTogglePress: PropTypes.func.isRequired,
  onRefreshPress: PropTypes.func.isRequired,
-  onSearchPress: PropTypes.func.isRequired
+  onSearchPress: PropTypes.func.isRequired,
+  isSaving: PropTypes.bool.isRequired,
+  saveError: PropTypes.object,
+  isDeleting: PropTypes.bool.isRequired,
+  deleteError: PropTypes.object,
+  onSaveSelected: PropTypes.func.isRequired
 };

 AuthorDetails.defaultProps = {
  statistics: {},
-  tags: [],
-  isSaving: false
+  tags: []
 };

 export default AuthorDetails;
@@ -7,6 +7,7 @@ import { createSelector } from 'reselect';
 import * as commandNames from 'Commands/commandNames';
 import { toggleAuthorMonitored } from 'Store/Actions/authorActions';
 import { clearBookFiles, fetchBookFiles } from 'Store/Actions/bookFileActions';
+import { saveBookEditor } from 'Store/Actions/bookIndexActions';
 import { executeCommand } from 'Store/Actions/commandActions';
 import { clearQueueDetails, fetchQueueDetails } from 'Store/Actions/queueActions';
 import { cancelFetchReleases, clearReleases } from 'Store/Actions/releaseActions';
@@ -21,7 +22,8 @@ import AuthorDetails from './AuthorDetails';

 const selectBooks = createSelector(
  (state) => state.books,
-  (books) => {
+  (state) => state.bookIndex,
+  (books, index) => {
    const {
      items,
      isFetching,
@@ -29,6 +31,13 @@ const selectBooks = createSelector(
      error
    } = books;

+    const {
+      isSaving,
+      saveError,
+      isDeleting,
+      deleteError
+    } = index;
+
    const hasBooks = !!items.length;
    const hasMonitoredBooks = items.some((e) => e.monitored);

@@ -37,7 +46,11 @@ const selectBooks = createSelector(
      isBooksPopulated: isPopulated,
      booksError: error,
      hasBooks,
-      hasMonitoredBooks
+      hasMonitoredBooks,
+      isSaving,
+      saveError,
+      isDeleting,
+      deleteError
    };
  }
 );
@@ -109,7 +122,11 @@ function createMapStateToProps() {
        isBooksPopulated,
        booksError,
        hasBooks,
-        hasMonitoredBooks
+        hasMonitoredBooks,
+        isSaving,
+        saveError,
+        isDeleting,
+        deleteError
      } = books;

      const {
@@ -169,6 +186,10 @@ function createMapStateToProps() {
        isFetching,
        isPopulated,
        booksError,
+        isSaving,
+        saveError,
+        isDeleting,
+        deleteError,
        seriesError,
        bookFilesError,
        hasBooks,
@@ -187,6 +208,7 @@ function createMapStateToProps() {
 const mapDispatchToProps = {
  fetchSeries,
  clearSeries,
+  saveBookEditor,
  fetchBookFiles,
  clearBookFiles,
  toggleAuthorMonitored,
@@ -248,7 +270,7 @@ class AuthorDetailsConnector extends Component {
    this.props.fetchSeries({ authorId });
    this.props.fetchBookFiles({ authorId });
    this.props.fetchQueueDetails({ authorId });
-  }
+  };

  unpopulate = () => {
    this.props.cancelFetchReleases();
@@ -256,7 +278,7 @@ class AuthorDetailsConnector extends Component {
    this.props.clearBookFiles();
    this.props.clearQueueDetails();
    this.props.clearReleases();
-  }
+  };

  //
  // Listeners
@@ -266,21 +288,25 @@ class AuthorDetailsConnector extends Component {
      authorId: this.props.id,
      monitored
    });
-  }
+  };

  onRefreshPress = () => {
    this.props.executeCommand({
      name: commandNames.REFRESH_AUTHOR,
      authorId: this.props.id
    });
-  }
+  };

  onSearchPress = () => {
    this.props.executeCommand({
      name: commandNames.AUTHOR_SEARCH,
      authorId: this.props.id
    });
-  }
+  };
+
+  onSaveSelected = (payload) => {
+    this.props.saveBookEditor(payload);
+  };

  //
  // Render
@@ -292,6 +318,7 @@ class AuthorDetailsConnector extends Component {
        onMonitorTogglePress={this.onMonitorTogglePress}
        onRefreshPress={this.onRefreshPress}
        onSearchPress={this.onSearchPress}
+        onSaveSelected={this.onSaveSelected}
      />
    );
  }
@@ -307,6 +334,7 @@ AuthorDetailsConnector.propTypes = {
  isRenamingAuthor: PropTypes.bool.isRequired,
  fetchSeries: PropTypes.func.isRequired,
  clearSeries: PropTypes.func.isRequired,
+  saveBookEditor: PropTypes.func.isRequired,
  fetchBookFiles: PropTypes.func.isRequired,
  clearBookFiles: PropTypes.func.isRequired,
  toggleAuthorMonitored: PropTypes.func.isRequired,
@@ -16,7 +16,7 @@
  position: absolute;
  width: 100%;
  height: 100%;
-  background: $black;
+  background: var(--black);
  opacity: 0.7;
 }

@@ -25,7 +25,7 @@
  padding: 30px;
  width: 100%;
  height: 100%;
-  color: $white;
+  color: var(--white);
 }

 .poster {
@@ -69,7 +69,7 @@
  width: 40px;

  &:hover {
-    color: $iconButtonHoverLightColor;
+    color: var(--iconButtonHoverLightColor);
  }
 }

@@ -97,7 +97,7 @@
  white-space: nowrap;

  &:hover {
-    color: $iconButtonHoverLightColor;
+    color: var(--iconButtonHoverLightColor);
  }
 }

@@ -0,0 +1,29 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'alternateTitlesIconContainer': string;
+  'authorNavigationButton': string;
+  'authorNavigationButtons': string;
+  'authorUpButton': string;
+  'backdrop': string;
+  'backdropOverlay': string;
+  'details': string;
+  'detailsLabel': string;
+  'header': string;
+  'headerContent': string;
+  'info': string;
+  'links': string;
+  'monitorToggleButton': string;
+  'overview': string;
+  'path': string;
+  'poster': string;
+  'qualityProfileName': string;
+  'sizeOnDisk': string;
+  'tags': string;
+  'title': string;
+  'titleContainer': string;
+  'titleRow': string;
+  'toggleMonitoredContainer': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -52,11 +52,11 @@ class AuthorDetailsHeader extends Component {

  onOverviewMeasure = ({ height }) => {
    this.setState({ overviewHeight: height });
-  }
+  };

  onTitleMeasure = ({ width }) => {
    this.setState({ titleWidth: width });
-  }
+  };

  //
  // Render
@@ -92,6 +92,7 @@ class AuthorDetailsHeader extends Component {
      titleWidth
    } = this.state;

+    const fanartUrl = getFanartUrl(images);
    const marqueeWidth = titleWidth - (isSmallScreen ? 85 : 160);

    const continuing = status === 'continuing';
@@ -108,9 +109,11 @@ class AuthorDetailsHeader extends Component {
      <div className={styles.header} style={{ width }} >
        <div
          className={styles.backdrop}
-          style={{
-            backgroundImage: `url(${getFanartUrl(images)})`
-          }}
+          style={
+            fanartUrl ?
+              { backgroundImage: `url(${fanartUrl})` } :
+              null
+          }
        >
          <div className={styles.backdropOverlay} />
        </div>
@@ -48,7 +48,7 @@ class AuthorDetailsHeaderConnector extends Component {
      authorId: this.props.authorId,
      monitored
    });
-  }
+  };

  //
  // Render
@@ -0,0 +1,9 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'link': string;
+  'linkLabel': string;
+  'links': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
--- a/Show More
+++ b/Show More