Added Indexer Factory

request extension

start migration controller/resource

removed unneccesary using - probalby more to go still

more scaffolding

added more framework; contemplating using the importlists from other arrs as a base for this

Revert "jackett config"

This reverts commit 6523eaf55450ceed84b3667421595a9d9e34dc51.

added stuff from nit's radarr pr

neated code up a little bit, more to do on this though

get config sorted, api logic also added - migration todo and indexer config to do

.editorconfig

@@ -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:warning
+dotnet_style_qualification_for_field = false:refactoring
-dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_property = false:refactoring
-dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_method = false:refactoring
-dotnet_style_qualification_for_event = false:warning
+dotnet_style_qualification_for_event = false:refactoring
 
 # Indentation preferences
 csharp_indent_block_contents = true
@@ -32,6 +32,10 @@ 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 = _
 
@@ -256,7 +260,7 @@ dotnet_diagnostic.CA5392.severity = suggestion
 dotnet_diagnostic.CA5394.severity = suggestion
 dotnet_diagnostic.CA5397.severity = suggestion
 
-dotnet_diagnostic.SYSLIB0014.severity = none
+
 
 [*.{js,html,js,hbs,less,css}]
 charset = utf-8

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: Prowlarr # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: prowlarr
 ko_fi: # Replace with a single Ko-fi username

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: Bug Report
+about: Support Requests will be closed immediately, if you are not 100% certain this is a bug please go to our Reddit or Discord first. Exceptions do not mean you found a bug!
+title: ''
+labels: 'Type: Bug'
+assignees: ''
+
+---
+<!-- Support Requests will be closed immediately, if you are unsure go to our Reddit or Discord first. Exceptions do not mean you found a bug! -->
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+<!-- Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen.-->
+
+**Screenshots**
+<!-- If applicable, add screenshots to help explain your problem.-->
+
+**Platform Information (please complete the following information):**
+ - OS: <!-- [e.g. Windows 10 2004 / Ubuntu 20.04] -->
+ - Docker: <!-- [Yes/No] -->
+ - .NET Version (System -> Status): <!--[e.g. .NET 5.0.1] -->
+ - Browser and Version (Only needed for UI issues): <!--[e.g. chrome 86.0.4240.198] -->
+ - Prowlarr Version: <!--[e.g. 0.1.2.1854-->
+ - Prowlarr Branch: <!--[e.g. develop, nightly]-->
+
+Turn on Trace logs under Settings -> General and wait for the bug to occur again.
+**Upload the full log file here (or another site (e.g. pastebin) and link it). Issues will be closed, if they do not include this!**
+<!-- Trace logs are named Prowlarr.trace.txt or Prowlarr.trace.#.txt and will contain "trace" in them-->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,73 +0,0 @@
-name: Bug Report
-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.
-    options:
-    - label: I have searched the existing issues
-      required: true
-- type: textarea
-  attributes:
-    label: Current Behavior
-    description: A concise description of what you're experiencing.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Expected Behavior
-    description: A concise description of what you expected to happen.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Steps To Reproduce
-    description: Steps to reproduce the behavior.
-    placeholder: |
-      1. In this environment...
-      2. With this config...
-      3. Run '...'
-      4. See error...
-  validations:
-    required: false
-- type: textarea
-  attributes:
-    label: Environment
-    description: |
-      examples:
-        - **OS**: Ubuntu 20.04
-        - **Prowlarr**: Prowlarr 0.1.0.650
-        - **Docker Install**: Yes
-        - **Using Reverse Proxy**: No
-        - **Browser**: Firefox 90 (If UI related)
-    value: |
-        - OS: 
-        - Prowlarr:
-        - Docker Install:
-        - Using Reverse Proxy:
-        - Browser:
-    render: markdown
-  validations:
-    required: true
-- type: dropdown
-  attributes:
-    label: What branch are you running?
-    options:
-      - Master
-      - Develop
-      - Nightly
-      - Other (This issue will be closed)
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Trace Logs?
-    description: |
-      Trace Logs (https://wiki.servarr.com/prowlarr/troubleshooting#logging-and-log-files) 
-      ***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

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Indexer Requests
-    url: https://requests.prowlarr.com/
-    about: Request new indexers to be added. Vote on existing requests.
   - name: Support via Discord
     url: https://prowlarr.com/discord
     about: Chat with users and devs on support and setup related topics.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature Request
+about: Suggest an idea for Prowlarr
+title: ''
+labels: 'Type: Feature Request'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,38 +0,0 @@
-name: Feature Request
-description: 'Suggest an idea for Prowlarr'
-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.
-    options:
-    - label: I have searched the existing issues
-      required: true
-- type: textarea
-  attributes:
-    label: Is your feature request related to a problem? Please describe
-    description: A clear and concise description of what the problem is.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Describe the solution you'd like
-    description: A clear and concise description of what you want to happen.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Describe alternatives you've considered
-    description: A clear and concise description of any alternative solutions or features you've considered.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Anything else?
-    description: |
-      Links? References? Mockups? Anything that will give us more context about the feature you are encountering!
-      
-      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-  validations:
-    required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,14 @@
 #### Database Migration
-YES - XXXX | NO
+YES | NO
 
 #### Description
 A few sentences describing the overall goals of the pull request's commits.
 
 #### Screenshot (if UI related)
-
 #### Todos
 - [ ] Tests
-- [ ] Translation Keys (./src/NzbDrone.Core/Localization/Core/en.json)
+- [ ] Translation Keys
-- [ ] [Wiki Updates](https://wiki.servarr.com)
+- [ ] Wiki Updates
 
 #### Issues Fixed or Closed by this PR
 

.github/label-actions.yml

@@ -1,16 +0,0 @@
-# Configuration for Label Actions - https://github.com/dessant/label-actions
-
-'Type: Support':
-  comment: >
-    :wave: @{issue-author}, we use the issue tracker exclusively
-    for bug reports and feature requests. However, this issue appears
-    to be a support request. Please hop over onto our [Discord](https://prowlarr.com/discord) 
-    or [Subreddit](https://reddit.com/r/prowlarr)
-  close: true
-
-'Type: Indexer Request':
-  comment: >
-    :wave: @{issue-author}, we use the issue tracker exclusively
-    for bug reports and feature requests. However, this issue appears
-    to be a indexer request. Please use our Indexer request [site](https://requests.prowlarr.com/)
-  close: true

.github/workflows/azuresync.yml

@@ -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\\Prowlarr"
-          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\\Prowlarr"
-          ado_wit: "User Story"
-          ado_new_state: "New"
-          ado_active_state: "Active"
-          ado_close_state: "Closed"
-          ado_bypassrules: true
-          log_level: 100

.github/workflows/label-actions.yml

@@ -1,23 +0,0 @@
-name: 'Label Actions'
-
-on:
-  issues:
-    types: [labeled, unlabeled]
-  pull_request:
-    types: [labeled, unlabeled]
-  discussion:
-    types: [labeled, unlabeled]
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  action:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/label-actions@v2
-        with:
-          process-only: 'issues, prs'

.github/workflows/support.yml

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

.gitignore

@@ -188,10 +188,6 @@ packages.config.md5sum
 **/.idea/**/*.iml
 **/.idea/**/contentModel.xml
 **/.idea/**/modules.xml
-
 # ignore node_modules symlink
 node_modules
 node_modules.nosync
-
-# API doc generation
-.config/

CONTRIBUTING.md

@@ -1,13 +1,33 @@
-# How to Contribute
+# How to Contribute #
 
 We're always looking for people to help make Prowlarr even better, there are a number of ways to contribute.
 
-This file has been moved to the wiki for the latest details please see the [contributing wiki page](https://wiki.servarr.com/prowlarr/contributing).
+## Documentation ##
+Setup guides, FAQ, the more information we have on the wiki the better.
 
-## Documentation
+## Development ##
 
-Setup guides, [FAQ](https://wiki.servarr.com/prowlarr/faq), the more information we have on the [wiki](https://wiki.servarr.com/prowlarr) the better.
+See the readme for information on setting up your development environment.
 
-## Development
+### Contributing Code ###
+- If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/Prowlarr/Prowlarr/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 Prowlarr'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)
 
-See the [Wiki Page](https://wiki.servarr.com/prowlarr/contributing)
+### 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.

README.md

@@ -2,83 +2,66 @@
 
 [![Build Status](https://dev.azure.com/Prowlarr/Prowlarr/_apis/build/status/Prowlarr.Prowlarr?branchName=develop)](https://dev.azure.com/Prowlarr/Prowlarr/_build/latest?definitionId=1&branchName=develop)
 [![Translated](https://translate.servarr.com/widgets/servarr/-/prowlarr/svg-badge.svg)](https://translate.servarr.com/engage/prowlarr/?utm_source=widget)
-[![Docker Pulls](https://img.shields.io/docker/pulls/hotio/prowlarr.svg)](https://wiki.servarr.com/prowlarr/installation#docker)
+[![Docker Pulls](https://img.shields.io/docker/pulls/hotio/prowlarr.svg)](https://wiki.servarr.com/Prowlarr_Installation#Docker)
 ![Github Downloads](https://img.shields.io/github/downloads/Prowlarr/Prowlarr/total.svg)
-[![Backers on Open Collective](https://opencollective.com/Prowlarr/backers/badge.svg)](#backers)
+[![Backers on Open Collective](https://opencollective.com/Prowlarr/backers/badge.svg)](#backers) 
 [![Sponsors on Open Collective](https://opencollective.com/Prowlarr/sponsors/badge.svg)](#sponsors)
-[![Mega Sponsors on Open Collective](https://opencollective.com/Prowlarr/megasponsors/badge.svg)](#mega-sponsors)
 
-Prowlarr is an indexer manager/proxy built on the popular \*arr .net/reactjs base stack to integrate with your various PVR apps. Prowlarr supports management of both Torrent Trackers and Usenet Indexers. It integrates seamlessly with Lidarr, Mylar3, Radarr, Readarr, and Sonarr offering complete management of your indexers with no per app Indexer setup required (we do it all).
+Prowlarr is a indexer manager/proxy built on the popular arr .net/reactjs base stack to integrate with your various PVR apps. Prowlarr supports both Torrent Trackers and Usenet Indexers. It integrates seamlessly with Sonarr, Radarr, Lidarr, and Readarr offering complete management of your indexers with no per app Indexer setup required (we do it all).
 
-## Major Features Include
+## Major Features Include:
-
+- Usenet support for any Newznab compatible indexer, including Headphones VIP
-- Usenet support for 24 indexers natively, including Headphones VIP
+- Torrent support 400+ trackers & more coming soon
-- Usenet support for any Newznab compatible indexer via "Generic Newznab"
+- Indexer Sync to Sonarr/Radarr/Readarr/Lidarr, so no manual configuration of the other applications are required
-- Torrent support for over 500 trackers with more added all the time
+- Indexer History and Statistics
-- Torrent support for any Torznab compatible tracker via "Generic Torznab"
+- Manual Searching of Trackers & Indexers at a category level
-- Support for custom YML definitions via Cardigann that includes JSON and XML parsing
+- Support for pushing releases directly to your download clients from Prowlarr
-- Indexer Sync to Lidarr/Mylar3/Radarr/Readarr/Sonarr, so no manual configuration of the other applications are required
-- Indexer history and statistics
-- Manual searching of Trackers & Indexers at a category level
-- Parameter based manual searching
-- Support for pushing multiple releases at once directly to your download clients from Prowlarr
-- Indexer health and status notifications
-- Per Indexer proxy support (SOCKS4, SOCKS5, HTTP, Flaresolverr)
 
 ## Support
+Note: Prowlarr is currently early in life, thus bugs should be expected
 
-[![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/prowlarr)
 [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://prowlarr.com/discord)
 [![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60)](https://www.reddit.com/r/Prowlarr)
-
-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/Prowlarr/Prowlarr/issues)
+[![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/Prowlarr)
 
-## Indexers & Trackers
+## Feature Requests
 
-[![Supported Indexers](https://img.shields.io/badge/Supported%20Indexers-View%20all%20currently%20supported%20indexers%20%26%20trackers-important)](https://wiki.servarr.com/en/prowlarr/supported-indexers)
+[Feature Requests](https://github.com/Prowlarr/Prowlarr/issues/new?assignees=&template=feature_request.md&Type%3A%20Feature%20Request&title=)
-
-[![Indexer Requests](https://img.shields.io/badge/Indexer%20Requests-Create%20and%20view%20existing%20requests%20for%20trackers%20and%20indexers-informational)](https://requests.prowlarr.com)
 
 ## Contributors & Developers
+This project exists thanks to all the people who contribute. [Contribute](CONTRIBUTING.md).
+<a href="https://github.com/Prowlarr/Prowlarr/graphs/contributors"><img src="https://opencollective.com/Prowlarr/contributors.svg?width=890&button=false" /></a>
 
-[API Documentation](https://prowlarr.com/docs/api/)
-
-This project exists thanks to all the people who contribute.
-
-- [Contribute (GitHub)](CONTRIBUTING.md)
-- [Contribution (Wiki Article)](https://wiki.servarr.com/prowlarr/contributing)
-- [YML Indexer Definition (Wiki Article)](https://wiki.servarr.com/prowlarr/cardigann-yml-definition)
-
-[![Contributors List](https://opencollective.com/Prowlarr/contributors.svg?width=890&button=false)](https://github.com/Prowlarr/Prowlarr/graphs/contributors)
 
 ## Backers
 
 Thank you to all our backers! 🙏 [Become a backer](https://opencollective.com/Prowlarr#backer)
-![Backers List](https://opencollective.com/Prowlarr/backers.svg?width=890)
+
+<img src="https://opencollective.com/Prowlarr/backers.svg?width=890"></a>
 
 ## 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/Prowlarr#sponsor)
-![Sponsors List](https://opencollective.com/Prowlarr/sponsors.svg?width=890)
+
+<img src="https://opencollective.com/Prowlarr/sponsors.svg?width=890"></a>
 
 ## Mega Sponsors
 
-![Mega Sponsors List](https://opencollective.com/Prowlarr/tiers/mega-sponsor.svg?width=890)
+<img src="https://opencollective.com/Prowlarr/tiers/mega-sponsor.svg?width=890"></a>
 
 ## JetBrains
-
 Thank you to [<img src="/Logo/jetbrains.svg" alt="JetBrains" width="32"> JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools.
 
-- [<img src="/Logo/resharper.svg" alt="ReSharper" width="32"> ReSharper](http://www.jetbrains.com/resharper/)
+* [<img src="/Logo/resharper.svg" alt="ReSharper" width="32"> ReSharper](http://www.jetbrains.com/resharper/)
-- [<img src="/Logo/webstorm.svg" alt="WebStorm" width="32"> WebStorm](http://www.jetbrains.com/webstorm/)
+* [<img src="/Logo/webstorm.svg" alt="WebStorm" width="32"> WebStorm](http://www.jetbrains.com/webstorm/)	
-- [<img src="/Logo/rider.svg" alt="Rider" width="32"> Rider](http://www.jetbrains.com/rider/)
+* [<img src="/Logo/rider.svg" alt="Rider" width="32"> Rider](http://www.jetbrains.com/rider/)	
-- [<img src="/Logo/dottrace.svg" alt="dotTrace" width="32"> dotTrace](http://www.jetbrains.com/dottrace/)
+* [<img src="/Logo/dottrace.svg" alt="dotTrace" width="32"> dotTrace](http://www.jetbrains.com/dottrace/)
 
 ### License
 
-- [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
+* [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-- Copyright 2010-2022
+* Copyright 2010-2021
 
-Icon Credit - [Box vector created by freepik - www.freepik.com](https://www.freepik.com/vectors/box)
+Icon Credit:
+<a href="https://www.freepik.com/vectors/box">Box vector created by freepik - www.freepik.com</a>

azure-pipelines.yml

@@ -7,20 +7,14 @@ variables:
   outputFolder: './_output'
   artifactsFolder: './_artifacts'
   testsFolder: './_tests'
-  yarnCacheFolder: $(Pipeline.Workspace)/.yarn
+  majorVersion: '0.1.0'
-  nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '0.4.3'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.301'
+  dotnetVersion: '5.0.203'
-  innoVersion: '6.2.0'
+  yarnCacheFolder: $(Pipeline.Workspace)/.yarn
-  nodeVersion: '16.x'
-  windowsImage: 'windows-2022'
-  linuxImage: 'ubuntu-20.04'
-  macImage: 'macOS-11'
 
 trigger:
   branches:
@@ -35,7 +29,6 @@ pr:
   paths:
     exclude:
     - src/NzbDrone.Core/Localization/Core
-    - src/Prowlarr.API.*/openapi.json
 
 stages:
   - stage: Setup
@@ -44,7 +37,7 @@ stages:
     - job:
       displayName: Build Variables
       pool:
-        vmImage: ${{ variables.linuxImage }}
+        vmImage: 'ubuntu-18.04'
       steps:
       # Set the build name properly.  The 'name' property won't recursively expand so hack here:
       - bash: echo "##vso[build.updatebuildnumber]$PROWLARRVERSION"
@@ -70,15 +63,15 @@ stages:
         matrix:
           Linux:
             osName: 'Linux'
-            imageName: ${{ variables.linuxImage }}
+            imageName: 'ubuntu-18.04'
             enableAnalysis: 'true'
           Mac:
             osName: 'Mac'
-            imageName: ${{ variables.macImage }}
+            imageName: 'macos-10.14'
             enableAnalysis: 'false'
           Windows:
             osName: 'Windows'
-            imageName: ${{ variables.windowsImage }}
+            imageName: 'windows-2019'
             enableAnalysis: 'false'
 
       pool:
@@ -97,14 +90,15 @@ stages:
       - 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 "Extra platforms already enabled"
+            echo "BSD already enabled"
           else
-            echo "Enabling extra platform support"
+            echo "Enabling BSD support"
-            sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
+            sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64/' $BUNDLEDVERSIONS
           fi
-        displayName: Enable Extra Platform Support
+        displayName: Enable FreeBSD Support
-      - bash: ./build.sh --backend --enable-extra-platforms
+      - bash: ./build.sh --backend --enable-bsd
         displayName: Build Prowlarr Backend
       - bash: |
           find ${OUTPUTFOLDER} -type f ! -path "*/publish/*" -exec rm -rf {} \;
@@ -117,29 +111,25 @@ stages:
         artifact: '$(osName)Backend'
         displayName: Publish Backend
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/win-x64/publish'
+      - publish: '$(testsFolder)/net5.0/win-x64/publish'
-        artifact: win-x64-tests
+        artifact: WindowsCoreTests
-        displayName: Publish win-x64 Test Package
+        displayName: Publish Windows Test Package
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/linux-x64/publish'
+      - publish: '$(testsFolder)/net5.0/linux-x64/publish'
-        artifact: linux-x64-tests
+        artifact: LinuxCoreTests
-        displayName: Publish linux-x64 Test Package
+        displayName: Publish Linux Test Package
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/linux-x86/publish'
+      - publish: '$(testsFolder)/net5.0/linux-musl-x64/publish'
-        artifact: linux-x86-tests
+        artifact: LinuxMuslCoreTests
-        displayName: Publish linux-x86 Test Package
+        displayName: Publish Linux Musl Test Package
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/linux-musl-x64/publish'
+      - publish: '$(testsFolder)/net5.0/freebsd-x64/publish'
-        artifact: linux-musl-x64-tests
+        artifact: FreebsdCoreTests
-        displayName: Publish linux-musl-x64 Test Package
+        displayName: Publish FreeBSD Test Package
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/freebsd-x64/publish'
+      - publish: '$(testsFolder)/net5.0/osx-x64/publish'
-        artifact: freebsd-x64-tests
+        artifact: MacCoreTests
-        displayName: Publish freebsd-x64 Test Package
+        displayName: Publish MacOS Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/osx-x64/publish'
-        artifact: osx-x64-tests
-        displayName: Publish osx-x64 Test Package
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
 
   - stage: Build_Frontend
@@ -151,20 +141,20 @@ stages:
         matrix:
           Linux:
             osName: 'Linux'
-            imageName: ${{ variables.linuxImage }}
+            imageName: 'ubuntu-18.04'
           Mac:
             osName: 'Mac'
-            imageName: ${{ variables.macImage }}
+            imageName: 'macos-10.14'
           Windows:
             osName: 'Windows'
-            imageName: ${{ variables.windowsImage }}
+            imageName: 'windows-2019'
       pool:
         vmImage: $(imageName)
       steps:
       - task: NodeTool@0
         displayName: Set Node.js version
         inputs:
-          versionSpec: $(nodeVersion)
+          versionSpec: '12.x'
       - checkout: self
         submodules: true
         fetchDepth: 1
@@ -173,6 +163,7 @@ stages:
           key: 'yarn | "$(osName)" | yarn.lock'
           restoreKeys: |
              yarn | "$(osName)"
+             yarn
           path: $(yarnCacheFolder)
         displayName: Cache Yarn packages
       - bash: ./build.sh --frontend
@@ -193,7 +184,7 @@ stages:
     - job: Windows_Installer
       displayName: Create Installer
       pool:
-        vmImage: ${{ variables.windowsImage }}
+        vmImage: 'windows-2019'
       steps:
       - checkout: self
         fetchDepth: 1
@@ -209,11 +200,16 @@ stages:
           artifactName: WindowsFrontend
           targetPath: _output
         displayName: Fetch Frontend
+      - bash: ./build.sh --packages
+        displayName: Create Packages
       - bash: |
-          ./build.sh --packages --installer
+          distribution/windows/setup/inno/ISCC.exe distribution/windows/setup/prowlarr.iss //DFramework=net5.0 //DRuntime=win-x86
-          cp distribution/windows/setup/output/Prowlarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x64-installer.exe
+          cp distribution/windows/setup/output/Prowlarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x86-installer.exe
-          cp distribution/windows/setup/output/Prowlarr.*win-x86.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x86-installer.exe
+        displayName: Create x86 .NET Core Windows installer
-        displayName: Create Installers
+      - bash: |
+          distribution/windows/setup/inno/ISCC.exe distribution/windows/setup/prowlarr.iss //DFramework=net5.0 //DRuntime=win-x64
+          cp distribution/windows/setup/output/Prowlarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x64-installer.exe
+        displayName: Create x64 .NET Core Windows installer
       - publish: $(Build.ArtifactStagingDirectory)
         artifact: 'WindowsInstaller'
         displayName: Publish Installer
@@ -226,7 +222,7 @@ stages:
     - job: Other_Packages
       displayName: Create Standard Packages
       pool:
-        vmImage: ${{ variables.linuxImage }}
+        vmImage: 'ubuntu-18.04'
       steps:
       - checkout: self
         fetchDepth: 1
@@ -242,112 +238,81 @@ stages:
           artifactName: WindowsFrontend
           targetPath: _output
         displayName: Fetch Frontend
-      - bash: ./build.sh --packages --enable-extra-platforms
+      - bash: ./build.sh --packages --enable-bsd
         displayName: Create Packages
       - bash: |
           find . -name "Prowlarr" -exec chmod a+x {} \;
           find . -name "Prowlarr.Update" -exec chmod a+x {} \;
         displayName: Set executable bits
       - task: ArchiveFiles@2
-        displayName: Create win-x64 zip
+        displayName: Create Windows Core zip
         inputs:
           archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).windows-core-x64.zip'
           archiveType: 'zip'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/win-x64/net6.0
+          rootFolderOrFile: $(artifactsFolder)/win-x64/net5.0
       - task: ArchiveFiles@2
-        displayName: Create win-x86 zip
+        displayName: Create Windows x86 Core zip
         inputs:
           archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).windows-core-x86.zip'
           archiveType: 'zip'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/win-x86/net6.0
+          rootFolderOrFile: $(artifactsFolder)/win-x86/net5.0
       - task: ArchiveFiles@2
-        displayName: Create osx-x64 app
+        displayName: Create MacOS Core app
         inputs:
           archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).osx-app-core-x64.zip'
           archiveType: 'zip'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/osx-x64-app/net6.0
+          rootFolderOrFile: $(artifactsFolder)/macos-app/net5.0
       - task: ArchiveFiles@2
-        displayName: Create osx-x64 tar
+        displayName: Create MacOS Core tar
         inputs:
           archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).osx-core-x64.tar.gz'
           archiveType: 'tar'
           tarCompression: 'gz'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/osx-x64/net6.0
+          rootFolderOrFile: $(artifactsFolder)/macos/net5.0
       - task: ArchiveFiles@2
-        displayName: Create osx-arm64 app
+        displayName: Create Linux Core tar
-        inputs:
-          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(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)/Prowlarr.$(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)/Prowlarr.$(buildName).linux-core-x64.tar.gz'
           archiveType: 'tar'
           tarCompression: 'gz'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-x64/net6.0
+          rootFolderOrFile: $(artifactsFolder)/linux-x64/net5.0
       - task: ArchiveFiles@2
-        displayName: Create linux-musl-x64 tar
+        displayName: Create Linux Musl Core tar
         inputs:
           archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).linux-musl-core-x64.tar.gz'
           archiveType: 'tar'
           tarCompression: 'gz'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/net6.0
+          rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/net5.0
       - task: ArchiveFiles@2
-        displayName: Create linux-x86 tar
+        displayName: Create ARM32 Linux Core tar
-        inputs:
-          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(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)/Prowlarr.$(buildName).linux-core-arm.tar.gz'
           archiveType: 'tar'
           tarCompression: 'gz'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-arm/net6.0
+          rootFolderOrFile: $(artifactsFolder)/linux-arm/net5.0
       - task: ArchiveFiles@2
-        displayName: Create linux-musl-arm tar
+        displayName: Create ARM64 Linux Core tar
-        inputs:
-          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(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)/Prowlarr.$(buildName).linux-core-arm64.tar.gz'
           archiveType: 'tar'
           tarCompression: 'gz'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-arm64/net6.0
+          rootFolderOrFile: $(artifactsFolder)/linux-arm64/net5.0
       - task: ArchiveFiles@2
-        displayName: Create linux-musl-arm64 tar
+        displayName: Create ARM64 Linux Musl Core tar
         inputs:
           archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).linux-musl-core-arm64.tar.gz'
           archiveType: 'tar'
           tarCompression: 'gz'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/net6.0
+          rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/net5.0
       - task: ArchiveFiles@2
         displayName: Create FreeBSD Core Core tar
         inputs:
@@ -355,7 +320,7 @@ stages:
           archiveType: 'tar'
           tarCompression: 'gz'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/freebsd-x64/net6.0
+          rootFolderOrFile: $(artifactsFolder)/freebsd-x64/net5.0
       - publish: $(Build.ArtifactStagingDirectory)
         artifact: 'Packages'
         displayName: Publish Packages
@@ -394,7 +359,7 @@ stages:
     jobs:
     - job: Prepare
       pool:
-        vmImage: ${{ variables.linuxImage }}
+        vmImage: 'ubuntu-18.04'
       steps:
       - checkout: none
       - task: DownloadPipelineArtifact@2
@@ -416,22 +381,22 @@ stages:
         matrix:
           MacCore:
             osName: 'Mac'
-            testName: 'osx-x64'
+            testName: 'MacCore'
             poolName: 'Azure Pipelines'
-            imageName: ${{ variables.macImage }}
+            imageName: 'macos-10.14'
           WindowsCore:
             osName: 'Windows'
-            testName: 'win-x64'
+            testName: 'WindowsCore'
             poolName: 'Azure Pipelines'
-            imageName: ${{ variables.windowsImage }}
+            imageName: 'windows-2019'
           LinuxCore:
             osName: 'Linux'
-            testName: 'linux-x64'
+            testName: 'LinuxCore'
             poolName: 'Azure Pipelines'
-            imageName: ${{ variables.linuxImage }}
+            imageName: 'ubuntu-18.04'
           FreebsdCore:
             osName: 'Linux'
-            testName: 'freebsd-x64'
+            testName: 'FreebsdCore'
             poolName: 'FreeBSD'
             imageName:
 
@@ -450,7 +415,7 @@ 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
@@ -480,15 +445,11 @@ stages:
         matrix:
           alpine:
             testName: 'Musl Net Core'
-            artifactName: linux-musl-x64-tests
+            artifactName: LinuxMuslCoreTests
             containerImage: ghcr.io/servarr/testimages:alpine
-          linux-x86:
-            testName: 'linux-x86'
-            artifactName: linux-x86-tests
-            containerImage: ghcr.io/servarr/testimages:linux-x86
 
       pool:
-        vmImage: ${{ variables.linuxImage }}
+        vmImage: 'ubuntu-18.04'
       
       container: $[ variables['containerImage'] ]
 
@@ -496,15 +457,9 @@ stages:
         
       steps:
       - task: UseDotNet@2
-        displayName: 'Install .NET'
+        displayName: 'Install .net core'
         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
@@ -527,58 +482,6 @@ stages:
           testResultsFiles: '**/TestResult.xml'
           testRunTitle: '$(testName) Unit Tests'
           failTaskOnFailedTests: true
-          
-    - job: Unit_LinuxCore_Postgres
-      displayName: Unit Native LinuxCore with Postgres Database
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-      variables:
-        pattern: 'Prowlarr.*.linux-core-x64.tar.gz'
-        artifactName: linux-x64-tests
-        Prowlarr__Postgres__Host: 'localhost'
-        Prowlarr__Postgres__Port: '5432'
-        Prowlarr__Postgres__User: 'prowlarr'
-        Prowlarr__Postgres__Password: 'prowlarr'
-
-      pool:
-        vmImage: 'ubuntu-18.04'
-
-      timeoutInMinutes: 10
-        
-      steps:
-      - task: UseDotNet@2
-        displayName: 'Install .net core'
-        inputs:
-          version: $(dotnetVersion)
-      - checkout: none
-      - task: DownloadPipelineArtifact@2
-        displayName: Download Test Artifact
-        inputs:
-          buildType: 'current'
-          artifactName: $(artifactName)
-          targetPath: $(testsFolder)
-      - bash: find ${TESTSFOLDER} -name "Prowlarr.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=prowlarr \
-          -e POSTGRES_USER=prowlarr \
-          -p 5432:5432/tcp \
-          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
@@ -587,7 +490,7 @@ stages:
     jobs:
     - job: Prepare
       pool:
-        vmImage: ${{ variables.linuxImage }}
+        vmImage: 'ubuntu-18.04'
       steps:
       - checkout: none
       - task: DownloadPipelineArtifact@2
@@ -606,18 +509,18 @@ stages:
         matrix:
           MacCore:
             osName: 'Mac'
-            testName: 'osx-x64'
+            testName: 'MacCore'
-            imageName: ${{ variables.macImage }}
+            imageName: 'macos-10.14'
             pattern: 'Prowlarr.*.osx-core-x64.tar.gz'
           WindowsCore:
             osName: 'Windows'
-            testName: 'win-x64'
+            testName: 'WindowsCore'
-            imageName: ${{ variables.windowsImage }}
+            imageName: 'windows-2019'
             pattern: 'Prowlarr.*.windows-core-x64.zip'
           LinuxCore:
             osName: 'Linux'
-            testName: 'linux-x64'
+            testName: 'LinuxCore'
-            imageName: ${{ variables.linuxImage }}
+            imageName: 'ubuntu-18.04'
             pattern: 'Prowlarr.*.linux-core-x64.tar.gz'
 
       pool:
@@ -633,7 +536,7 @@ stages:
         displayName: Download Test Artifact
         inputs:
           buildType: 'current'
-          artifactName: '$(testName)-tests'
+          artifactName: '$(testName)Tests'
           targetPath: $(testsFolder)
       - task: DownloadPipelineArtifact@2
         displayName: Download Build Artifact
@@ -663,67 +566,6 @@ stages:
           failTaskOnFailedTests: true
         displayName: Publish Test Results
 
-    - job: Integration_LinuxCore_Postgres
-      displayName: Integration Native LinuxCore with Postgres Database
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-      variables:
-        pattern: 'Prowlarr.*.linux-core-x64.tar.gz'
-        Prowlarr__Postgres__Host: 'localhost'
-        Prowlarr__Postgres__Port: '5432'
-        Prowlarr__Postgres__User: 'prowlarr'
-        Prowlarr__Postgres__Password: 'prowlarr'
-
-      pool:
-        vmImage: 'ubuntu-18.04'
-
-      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/Prowlarr/. ./bin/
-          displayName: Move Package Contents
-        - bash: |
-            docker run -d --name=postgres14 \
-            -e POSTGRES_PASSWORD=prowlarr \
-            -e POSTGRES_USER=prowlarr \
-            -p 5432:5432/tcp \
-            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
       dependsOn: Prepare
@@ -741,7 +583,7 @@ stages:
         displayName: Download Test Artifact
         inputs:
           buildType: 'current'
-          artifactName: 'freebsd-x64-tests'
+          artifactName: 'FreebsdCoreTests'
           targetPath: $(testsFolder)
       - task: DownloadPipelineArtifact@2
         displayName: Download Build Artifact
@@ -777,17 +619,13 @@ stages:
       strategy:
         matrix:
           alpine:
-            testName: 'linux-musl-x64'
+            testName: 'Musl Net Core'
-            artifactName: linux-musl-x64-tests
+            artifactName: LinuxMuslCoreTests
             containerImage: ghcr.io/servarr/testimages:alpine
             pattern: 'Prowlarr.*.linux-musl-core-x64.tar.gz'
-          linux-x86:
+
-            testName: 'linux-x86'
-            artifactName: linux-x86-tests
-            containerImage: ghcr.io/servarr/testimages:linux-x86
-            pattern: 'Prowlarr.*.linux-core-x86.tar.gz'
       pool:
-        vmImage: ${{ variables.linuxImage }}
+        vmImage: 'ubuntu-18.04'
 
       container: $[ variables['containerImage'] ]
 
@@ -795,15 +633,9 @@ stages:
         
       steps:
       - task: UseDotNet@2
-        displayName: 'Install .NET'
+        displayName: 'Install .net core'
         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
@@ -849,22 +681,19 @@ stages:
         matrix:
           Linux:
             osName: 'Linux'
-            artifactName: 'linux-x64'
+            imageName: 'ubuntu-18.04'
-            imageName: ${{ variables.linuxImage }}
             pattern: 'Prowlarr.*.linux-core-x64.tar.gz'
-            failBuild: true
+            failBuild: false
           Mac:
             osName: 'Mac'
-            artifactName: 'osx-x64'
+            imageName: 'macos-10.14'
-            imageName: ${{ variables.macImage }}
             pattern: 'Prowlarr.*.osx-core-x64.tar.gz'
-            failBuild: true
+            failBuild: false
           Windows:
             osName: 'Windows'
-            artifactName: 'win-x64'
+            imageName: 'windows-2019'
-            imageName: ${{ variables.windowsImage }}
             pattern: 'Prowlarr.*.windows-core-x64.zip'
-            failBuild: true
+            failBuild: false
 
       pool:
         vmImage: $(imageName)
@@ -879,7 +708,7 @@ stages:
         displayName: Download Test Artifact
         inputs:
           buildType: 'current'
-          artifactName: '$(artifactName)-tests'
+          artifactName: '$(osName)CoreTests'
           targetPath: $(testsFolder)
       - task: DownloadPipelineArtifact@2
         displayName: Download Build Artifact
@@ -928,7 +757,7 @@ stages:
     jobs:
     - job: Prepare
       pool:
-        vmImage: ${{ variables.linuxImage }}
+        vmImage: 'ubuntu-18.04'
       steps:
       - checkout: none
       - task: DownloadPipelineArtifact@2
@@ -945,17 +774,17 @@ stages:
         matrix:
           Linux:
             osName: 'Linux'
-            imageName: ${{ variables.linuxImage }}
+            imageName: 'ubuntu-18.04'
           Windows:
             osName: 'Windows'
-            imageName: ${{ variables.windowsImage }}
+            imageName: 'windows-2019'
       pool:
         vmImage: $(imageName)
       steps:
       - task: NodeTool@0
         displayName: Set Node.js version
         inputs:
-          versionSpec: $(nodeVersion)
+          versionSpec: '12.x'
       - checkout: self
         submodules: true
         fetchDepth: 1
@@ -964,6 +793,7 @@ stages:
           key: 'yarn | "$(osName)" | yarn.lock'
           restoreKeys: |
              yarn | "$(osName)"
+             yarn
           path: $(yarnCacheFolder)
         displayName: Cache Yarn packages
       - bash: ./build.sh --lint
@@ -972,59 +802,6 @@ stages:
           FORCE_COLOR: 0
           YARN_CACHE_FOLDER: $(yarnCacheFolder)
 
-    - job: Api_Docs
-      displayName: API Docs
-      dependsOn: Prepare
-      condition: |
-        and
-        (
-          and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')),
-          and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-        )
-
-      pool:
-        vmImage: ${{ variables.windowsImage }}
-
-      steps:
-      - task: UseDotNet@2
-        displayName: 'Install .net core'
-        inputs:
-          version: $(dotnetVersion)
-      - checkout: self
-        submodules: true
-        persistCredentials: true
-        fetchDepth: 1    
-      - bash: ./docs.sh Windows
-        displayName: Create openapi.json
-      - bash: |
-          git config --global user.email "development@lidarr.audio"
-          git config --global user.name "Servarr"
-          git checkout -b api-docs
-          git add .
-          if git status | grep -q modified
-          then
-            git commit -am 'Automated API Docs update'
-            git push -f --set-upstream origin api-docs
-            curl -X POST -H "Authorization: token ${GITHUBTOKEN}" -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/prowlarr/prowlarr/pulls -d '{"head":"api-docs","base":"develop","title":"Update API docs"}'
-          else
-            echo "No changes since last run"
-          fi
-        displayName: Commit API Doc Change
-        continueOnError: true
-        env:
-          GITHUBTOKEN: $(githubToken)
-      - task: CopyFiles@2
-        displayName: 'Copy openapi.json to: $(Build.ArtifactStagingDirectory)'
-        inputs:
-          SourceFolder: '$(Build.SourcesDirectory)'
-          Contents: |
-            **/*openapi.json
-          TargetFolder: '$(Build.ArtifactStagingDirectory)/api_docs'
-      - publish: $(Build.ArtifactStagingDirectory)/api_docs
-        artifact: 'APIDocs'
-        displayName: Publish API Docs Bundle
-        condition: and(succeeded(), eq(variables['System.JobAttempt'], '1'))
-
     - job: Analyze_Backend
       displayName: Backend
       dependsOn: Prepare
@@ -1035,7 +812,7 @@ stages:
         EnableAnalyzers: 'false'
 
       pool:
-        vmImage: ${{ variables.windowsImage }}
+        vmImage: windows-2019
 
       steps:
       - task: UseDotNet@2
@@ -1061,8 +838,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 net6.0 -r win-x64
+          ./build.sh --backend -f net5.0 -r win-x64
-          TEST_DIR=_tests/net6.0/win-x64/publish/ ./test.sh Windows Unit Coverage
+          TEST_DIR=_tests/net5.0/win-x64/publish/ ./test.sh Windows Unit Coverage
         displayName: Coverage Unit Tests
       - task: SonarCloudAnalyze@1
         condition: eq(variables['System.PullRequest.IsFork'], 'False')
@@ -1092,7 +869,7 @@ stages:
     - job:
       displayName: Discord Notification
       pool:
-        vmImage: ${{ variables.linuxImage }}
+        vmImage: 'windows-2019'
       steps:
         - task: DownloadPipelineArtifact@2
           continueOnError: true
@@ -1102,7 +879,7 @@ stages:
             artifactName: 'WindowsAutomationScreenshots'
             targetPath: $(Build.SourcesDirectory)
         - checkout: none
-        - pwsh: |
+        - powershell: |
             iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/Servarr/AzureDiscordNotify/master/DiscordNotify.ps1'))
           env:
             SYSTEM_ACCESSTOKEN: $(System.AccessToken)

build.sh

@@ -25,22 +25,15 @@ UpdateVersionNumber()
     fi
 }
 
-EnableExtraPlatformsInSDK()
+EnableBsdSupport()
 {
-    SDK_PATH=$(dotnet --list-sdks | grep -P '6\.\d\.\d+' | head -1 | sed 's/\(6\.[0-9]*\.[0-9]*\).*\[\(.*\)\]/\2\/\1/g')
+    #todo enable sdk with
-    BUNDLEDVERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
+    #SDK_PATH=$(dotnet --list-sdks | grep -P '5\.\d\.\d+' | head -1 | sed 's/\(5\.[0-9]*\.[0-9]*\).*\[\(.*\)\]/\2\/\1/g')
-    if grep -q freebsd-x64 $BUNDLEDVERSIONS; then
+    # BUNDLED_VERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
-        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;linux-x86</RuntimeIdentifiers>^g" src/Directory.Build.props
+        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
     fi
 }
 
@@ -137,7 +130,7 @@ PackageLinux()
 
     echo "Adding Prowlarr.Mono to UpdatePackage"
     cp $folder/Prowlarr.Mono.* $folder/Prowlarr.Update
-    if [ "$framework" = "net6.0" ]; then
+    if [ "$framework" = "net5.0" ]; then
         cp $folder/Mono.Posix.NETStandard.* $folder/Prowlarr.Update
         cp $folder/libMonoPosixHelper.* $folder/Prowlarr.Update
     fi
@@ -148,13 +141,12 @@ PackageLinux()
 PackageMacOS()
 {
     local framework="$1"
-    local runtime="$2"
     
-    ProgressStart "Creating MacOS Package for $framework $runtime"
+    ProgressStart "Creating MacOS Package for $framework"
 
-    local folder=$artifactsFolder/$runtime/$framework/Prowlarr
+    local folder=$artifactsFolder/macos/$framework/Prowlarr
 
-    PackageFiles "$folder" "$framework" "$runtime"
+    PackageFiles "$folder" "$framework" "osx-x64"
 
     echo "Removing Service helpers"
     rm -f $folder/ServiceUninstall.*
@@ -165,7 +157,7 @@ PackageMacOS()
 
     echo "Adding Prowlarr.Mono to UpdatePackage"
     cp $folder/Prowlarr.Mono.* $folder/Prowlarr.Update
-    if [ "$framework" = "net6.0" ]; then
+    if [ "$framework" = "net5.0" ]; then
         cp $folder/Mono.Posix.NETStandard.* $folder/Prowlarr.Update
         cp $folder/libMonoPosixHelper.* $folder/Prowlarr.Update
     fi
@@ -176,11 +168,10 @@ PackageMacOS()
 PackageMacOSApp()
 {
     local framework="$1"
-    local runtime="$2"
     
-    ProgressStart "Creating macOS App Package for $framework $runtime"
+    ProgressStart "Creating macOS App Package for $framework"
 
-    local folder="$artifactsFolder/$runtime-app/$framework"
+    local folder=$artifactsFolder/macos-app/$framework
 
     rm -rf $folder
     mkdir -p $folder
@@ -188,7 +179,7 @@ PackageMacOSApp()
     mkdir -p $folder/Prowlarr.app/Contents/MacOS
 
     echo "Copying Binaries"
-    cp -r $artifactsFolder/$runtime/$framework/Prowlarr/* $folder/Prowlarr.app/Contents/MacOS
+    cp -r $artifactsFolder/macos/$framework/Prowlarr/* $folder/Prowlarr.app/Contents/MacOS
 
     echo "Removing Update Folder"
     rm -r $folder/Prowlarr.app/Contents/MacOS/Prowlarr.Update
@@ -235,38 +226,12 @@ Package()
             PackageWindows "$framework" "$runtime"
             ;;
         osx)
-            PackageMacOS "$framework" "$runtime"
+            PackageMacOS "$framework"
-            PackageMacOSApp "$framework" "$runtime"
+            PackageMacOSApp "$framework"
             ;;
     esac
 }
 
-BuildInstaller()
-{
-    local framework="$1"
-    local runtime="$2"
-    
-    ./_inno/ISCC.exe distribution/windows/setup/prowlarr.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"
@@ -298,10 +263,8 @@ if [ $# -eq 0 ]; then
     BACKEND=YES
     FRONTEND=YES
     PACKAGES=YES
-    INSTALLER=NO
     LINT=YES
-    ENABLE_EXTRA_PLATFORMS=NO
+    ENABLE_BSD=NO
-    ENABLE_EXTRA_PLATFORMS_IN_SDK=NO
 fi
 
 while [[ $# -gt 0 ]]
@@ -313,12 +276,8 @@ case $key in
         BACKEND=YES
         shift # past argument
         ;;
-    --enable-bsd|--enable-extra-platforms)
+    --enable-bsd)
-        ENABLE_EXTRA_PLATFORMS=YES
+        ENABLE_BSD=YES
-        shift # past argument
-        ;;
-    --enable-extra-platforms-in-sdk)
-        ENABLE_EXTRA_PLATFORMS_IN_SDK=YES
         shift # past argument
         ;;
     -r|--runtime)
@@ -339,10 +298,6 @@ case $key in
         PACKAGES=YES
         shift # past argument
         ;;
-    --installer)
-        INSTALLER=YES
-        shift # past argument
-        ;;
     --lint)
         LINT=YES
         shift # past argument
@@ -362,30 +317,24 @@ esac
 done
 set -- "${POSITIONAL[@]}" # restore positional parameters
 
-if [ "$ENABLE_EXTRA_PLATFORMS_IN_SDK" = "YES" ];
-then
-    EnableExtraPlatformsInSDK
-fi
-
 if [ "$BACKEND" = "YES" ];
 then
     UpdateVersionNumber
-    if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
+    if [ "$ENABLE_BSD" = "YES" ];
     then
-        EnableExtraPlatforms
+        EnableBsdSupport
     fi
     Build
     if [[ -z "$RID" || -z "$FRAMEWORK" ]];
     then
-        PackageTests "net6.0" "win-x64"
+        PackageTests "net5.0" "win-x64"
-        PackageTests "net6.0" "win-x86"
+        PackageTests "net5.0" "win-x86"
-        PackageTests "net6.0" "linux-x64"
+        PackageTests "net5.0" "linux-x64"
-        PackageTests "net6.0" "linux-musl-x64"
+        PackageTests "net5.0" "linux-musl-x64"
-        PackageTests "net6.0" "osx-x64"
+        PackageTests "net5.0" "osx-x64"
-        if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
+        if [ "$ENABLE_BSD" = "YES" ];
         then
-            PackageTests "net6.0" "freebsd-x64"
+            PackageTests "net5.0" "freebsd-x64"
-            PackageTests "net6.0" "linux-x86"
         fi
     else
         PackageTests "$FRAMEWORK" "$RID"
@@ -414,30 +363,19 @@ then
 
     if [[ -z "$RID" || -z "$FRAMEWORK" ]];
     then
-        Package "net6.0" "win-x64"
+        Package "net5.0" "win-x64"
-        Package "net6.0" "win-x86"
+        Package "net5.0" "win-x86"
-        Package "net6.0" "linux-x64"
+        Package "net5.0" "linux-x64"
-        Package "net6.0" "linux-musl-x64"
+        Package "net5.0" "linux-musl-x64"
-        Package "net6.0" "linux-arm64"
+        Package "net5.0" "linux-arm64"
-        Package "net6.0" "linux-musl-arm64"
+        Package "net5.0" "linux-musl-arm64"
-        Package "net6.0" "linux-arm"
+        Package "net5.0" "linux-arm"
-        Package "net6.0" "linux-musl-arm"
+        Package "net5.0" "osx-x64"
-        Package "net6.0" "osx-x64"
+        if [ "$ENABLE_BSD" = "YES" ];
-        Package "net6.0" "osx-arm64"
-        if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
         then
-            Package "net6.0" "freebsd-x64"
+            Package "net5.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

distribution/osx/Prowlarr.app/Contents/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundleIconFile</key>
 	<string>prowlarr.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.osx.prowlarr.com</string>
+	<string>com.osx.prowlarr.video</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

distribution/windows/setup/build.bat

@@ -0,0 +1,3 @@
+#SET BUILD_NUMBER=1
+#SET branch=develop
+inno\ISCC.exe prowlarr.iss

distribution/windows/setup/inno/Default.isl

@@ -0,0 +1,336 @@
+; *** Inno Setup version 5.5.3+ English messages ***
+;
+; To download user-contributed translations of this file, go to:
+;   http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and 
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=English
+LanguageID=$0409
+LanguageCodePage=0
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Setup
+SetupWindowTitle=Setup - %1
+UninstallAppTitle=Uninstall
+UninstallAppFullTitle=%1 Uninstall
+
+; *** Misc. common
+InformationTitle=Information
+ConfirmTitle=Confirm
+ErrorTitle=Error
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=This will install %1. Do you wish to continue?
+LdrCannotCreateTemp=Unable to create a temporary file. Setup aborted
+LdrCannotExecTemp=Unable to execute file in the temporary directory. Setup aborted
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nError %2: %3
+SetupFileMissing=The file %1 is missing from the installation directory. Please correct the problem or obtain a new copy of the program.
+SetupFileCorrupt=The setup files are corrupted. Please obtain a new copy of the program.
+SetupFileCorruptOrWrongVer=The setup files are corrupted, or are incompatible with this version of Setup. Please correct the problem or obtain a new copy of the program.
+InvalidParameter=An invalid parameter was passed on the command line:%n%n%1
+SetupAlreadyRunning=Setup is already running.
+WindowsVersionNotSupported=This program does not support the version of Windows your computer is running.
+WindowsServicePackRequired=This program requires %1 Service Pack %2 or later.
+NotOnThisPlatform=This program will not run on %1.
+OnlyOnThisPlatform=This program must be run on %1.
+OnlyOnTheseArchitectures=This program can only be installed on versions of Windows designed for the following processor architectures:%n%n%1
+MissingWOW64APIs=The version of Windows you are running does not include functionality required by Setup to perform a 64-bit installation. To correct this problem, please install Service Pack %1.
+WinVersionTooLowError=This program requires %1 version %2 or later.
+WinVersionTooHighError=This program cannot be installed on %1 version %2 or later.
+AdminPrivilegesRequired=You must be logged in as an administrator when installing this program.
+PowerUserPrivilegesRequired=You must be logged in as an administrator or as a member of the Power Users group when installing this program.
+SetupAppRunningError=Setup has detected that %1 is currently running.%n%nPlease close all instances of it now, then click OK to continue, or Cancel to exit.
+UninstallAppRunningError=Uninstall has detected that %1 is currently running.%n%nPlease close all instances of it now, then click OK to continue, or Cancel to exit.
+
+; *** Misc. errors
+ErrorCreatingDir=Setup was unable to create the directory "%1"
+ErrorTooManyFilesInDir=Unable to create a file in the directory "%1" because it contains too many files
+
+; *** Setup common messages
+ExitSetupTitle=Exit Setup
+ExitSetupMessage=Setup is not complete. If you exit now, the program will not be installed.%n%nYou may run Setup again at another time to complete the installation.%n%nExit Setup?
+AboutSetupMenuItem=&About Setup...
+AboutSetupTitle=About Setup
+AboutSetupMessage=%1 version %2%n%3%n%n%1 home page:%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< &Back
+ButtonNext=&Next >
+ButtonInstall=&Install
+ButtonOK=OK
+ButtonCancel=Cancel
+ButtonYes=&Yes
+ButtonYesToAll=Yes to &All
+ButtonNo=&No
+ButtonNoToAll=N&o to All
+ButtonFinish=&Finish
+ButtonBrowse=&Browse...
+ButtonWizardBrowse=B&rowse...
+ButtonNewFolder=&Make New Folder
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Select Setup Language
+SelectLanguageLabel=Select the language to use during the installation:
+
+; *** Common wizard text
+ClickNext=Click Next to continue, or Cancel to exit Setup.
+BeveledLabel=
+BrowseDialogTitle=Browse For Folder
+BrowseDialogLabel=Select a folder in the list below, then click OK.
+NewFolderName=New Folder
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Welcome to the [name] Setup Wizard
+WelcomeLabel2=This will install [name/ver] on your computer.%n%nIt is recommended that you close all other applications before continuing.
+
+; *** "Password" wizard page
+WizardPassword=Password
+PasswordLabel1=This installation is password protected.
+PasswordLabel3=Please provide the password, then click Next to continue. Passwords are case-sensitive.
+PasswordEditLabel=&Password:
+IncorrectPassword=The password you entered is not correct. Please try again.
+
+; *** "License Agreement" wizard page
+WizardLicense=License Agreement
+LicenseLabel=Please read the following important information before continuing.
+LicenseLabel3=Please read the following License Agreement. You must accept the terms of this agreement before continuing with the installation.
+LicenseAccepted=I &accept the agreement
+LicenseNotAccepted=I &do not accept the agreement
+
+; *** "Information" wizard pages
+WizardInfoBefore=Information
+InfoBeforeLabel=Please read the following important information before continuing.
+InfoBeforeClickLabel=When you are ready to continue with Setup, click Next.
+WizardInfoAfter=Information
+InfoAfterLabel=Please read the following important information before continuing.
+InfoAfterClickLabel=When you are ready to continue with Setup, click Next.
+
+; *** "User Information" wizard page
+WizardUserInfo=User Information
+UserInfoDesc=Please enter your information.
+UserInfoName=&User Name:
+UserInfoOrg=&Organization:
+UserInfoSerial=&Serial Number:
+UserInfoNameRequired=You must enter a name.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Select Destination Location
+SelectDirDesc=Where should [name] be installed?
+SelectDirLabel3=Setup will install [name] into the following folder.
+SelectDirBrowseLabel=To continue, click Next. If you would like to select a different folder, click Browse.
+DiskSpaceMBLabel=At least [mb] MB of free disk space is required.
+CannotInstallToNetworkDrive=Setup cannot install to a network drive.
+CannotInstallToUNCPath=Setup cannot install to a UNC path.
+InvalidPath=You must enter a full path with drive letter; for example:%n%nC:\APP%n%nor a UNC path in the form:%n%n\\server\share
+InvalidDrive=The drive or UNC share you selected does not exist or is not accessible. Please select another.
+DiskSpaceWarningTitle=Not Enough Disk Space
+DiskSpaceWarning=Setup requires at least %1 KB of free space to install, but the selected drive only has %2 KB available.%n%nDo you want to continue anyway?
+DirNameTooLong=The folder name or path is too long.
+InvalidDirName=The folder name is not valid.
+BadDirName32=Folder names cannot include any of the following characters:%n%n%1
+DirExistsTitle=Folder Exists
+DirExists=The folder:%n%n%1%n%nalready exists. Would you like to install to that folder anyway?
+DirDoesntExistTitle=Folder Does Not Exist
+DirDoesntExist=The folder:%n%n%1%n%ndoes not exist. Would you like the folder to be created?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Select Components
+SelectComponentsDesc=Which components should be installed?
+SelectComponentsLabel2=Select the components you want to install; clear the components you do not want to install. Click Next when you are ready to continue.
+FullInstallation=Full installation
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Compact installation
+CustomInstallation=Custom installation
+NoUninstallWarningTitle=Components Exist
+NoUninstallWarning=Setup has detected that the following components are already installed on your computer:%n%n%1%n%nDeselecting these components will not uninstall them.%n%nWould you like to continue anyway?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Current selection requires at least [mb] MB of disk space.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Select Additional Tasks
+SelectTasksDesc=Which additional tasks should be performed?
+SelectTasksLabel2=Select the additional tasks you would like Setup to perform while installing [name], then click Next.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Select Start Menu Folder
+SelectStartMenuFolderDesc=Where should Setup place the program's shortcuts?
+SelectStartMenuFolderLabel3=Setup will create the program's shortcuts in the following Start Menu folder.
+SelectStartMenuFolderBrowseLabel=To continue, click Next. If you would like to select a different folder, click Browse.
+MustEnterGroupName=You must enter a folder name.
+GroupNameTooLong=The folder name or path is too long.
+InvalidGroupName=The folder name is not valid.
+BadGroupName=The folder name cannot include any of the following characters:%n%n%1
+NoProgramGroupCheck2=&Don't create a Start Menu folder
+
+; *** "Ready to Install" wizard page
+WizardReady=Ready to Install
+ReadyLabel1=Setup is now ready to begin installing [name] on your computer.
+ReadyLabel2a=Click Install to continue with the installation, or click Back if you want to review or change any settings.
+ReadyLabel2b=Click Install to continue with the installation.
+ReadyMemoUserInfo=User information:
+ReadyMemoDir=Destination location:
+ReadyMemoType=Setup type:
+ReadyMemoComponents=Selected components:
+ReadyMemoGroup=Start Menu folder:
+ReadyMemoTasks=Additional tasks:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Preparing to Install
+PreparingDesc=Setup is preparing to install [name] on your computer.
+PreviousInstallNotCompleted=The installation/removal of a previous program was not completed. You will need to restart your computer to complete that installation.%n%nAfter restarting your computer, run Setup again to complete the installation of [name].
+CannotContinue=Setup cannot continue. Please click Cancel to exit.
+ApplicationsFound=The following applications are using files that need to be updated by Setup. It is recommended that you allow Setup to automatically close these applications.
+ApplicationsFound2=The following applications are using files that need to be updated by Setup. It is recommended that you allow Setup to automatically close these applications. After the installation has completed, Setup will attempt to restart the applications.
+CloseApplications=&Automatically close the applications
+DontCloseApplications=&Do not close the applications
+ErrorCloseApplications=Setup was unable to automatically close all applications. It is recommended that you close all applications using files that need to be updated by Setup before continuing.
+
+; *** "Installing" wizard page
+WizardInstalling=Installing
+InstallingLabel=Please wait while Setup installs [name] on your computer.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Completing the [name] Setup Wizard
+FinishedLabelNoIcons=Setup has finished installing [name] on your computer.
+FinishedLabel=Setup has finished installing [name] on your computer. The application may be launched by selecting the installed icons.
+ClickFinish=Click Finish to exit Setup.
+FinishedRestartLabel=To complete the installation of [name], Setup must restart your computer. Would you like to restart now?
+FinishedRestartMessage=To complete the installation of [name], Setup must restart your computer.%n%nWould you like to restart now?
+ShowReadmeCheck=Yes, I would like to view the README file
+YesRadio=&Yes, restart the computer now
+NoRadio=&No, I will restart the computer later
+; used for example as 'Run MyProg.exe'
+RunEntryExec=Run %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=View %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=Setup Needs the Next Disk
+SelectDiskLabel2=Please insert Disk %1 and click OK.%n%nIf the files on this disk can be found in a folder other than the one displayed below, enter the correct path or click Browse.
+PathLabel=&Path:
+FileNotInDir2=The file "%1" could not be located in "%2". Please insert the correct disk or select another folder.
+SelectDirectoryLabel=Please specify the location of the next disk.
+
+; *** Installation phase messages
+SetupAborted=Setup was not completed.%n%nPlease correct the problem and run Setup again.
+EntryAbortRetryIgnore=Click Retry to try again, Ignore to proceed anyway, or Abort to cancel installation.
+
+; *** Installation status messages
+StatusClosingApplications=Closing applications...
+StatusCreateDirs=Creating directories...
+StatusExtractFiles=Extracting files...
+StatusCreateIcons=Creating shortcuts...
+StatusCreateIniEntries=Creating INI entries...
+StatusCreateRegistryEntries=Creating registry entries...
+StatusRegisterFiles=Registering files...
+StatusSavingUninstall=Saving uninstall information...
+StatusRunProgram=Finishing installation...
+StatusRestartingApplications=Restarting applications...
+StatusRollback=Rolling back changes...
+
+; *** Misc. errors
+ErrorInternal2=Internal error: %1
+ErrorFunctionFailedNoCode=%1 failed
+ErrorFunctionFailed=%1 failed; code %2
+ErrorFunctionFailedWithMessage=%1 failed; code %2.%n%3
+ErrorExecutingProgram=Unable to execute file:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Error opening registry key:%n%1\%2
+ErrorRegCreateKey=Error creating registry key:%n%1\%2
+ErrorRegWriteKey=Error writing to registry key:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Error creating INI entry in file "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=Click Retry to try again, Ignore to skip this file (not recommended), or Abort to cancel installation.
+FileAbortRetryIgnore2=Click Retry to try again, Ignore to proceed anyway (not recommended), or Abort to cancel installation.
+SourceIsCorrupted=The source file is corrupted
+SourceDoesntExist=The source file "%1" does not exist
+ExistingFileReadOnly=The existing file is marked as read-only.%n%nClick Retry to remove the read-only attribute and try again, Ignore to skip this file, or Abort to cancel installation.
+ErrorReadingExistingDest=An error occurred while trying to read the existing file:
+FileExists=The file already exists.%n%nWould you like Setup to overwrite it?
+ExistingFileNewer=The existing file is newer than the one Setup is trying to install. It is recommended that you keep the existing file.%n%nDo you want to keep the existing file?
+ErrorChangingAttr=An error occurred while trying to change the attributes of the existing file:
+ErrorCreatingTemp=An error occurred while trying to create a file in the destination directory:
+ErrorReadingSource=An error occurred while trying to read the source file:
+ErrorCopying=An error occurred while trying to copy a file:
+ErrorReplacingExistingFile=An error occurred while trying to replace the existing file:
+ErrorRestartReplace=RestartReplace failed:
+ErrorRenamingTemp=An error occurred while trying to rename a file in the destination directory:
+ErrorRegisterServer=Unable to register the DLL/OCX: %1
+ErrorRegSvr32Failed=RegSvr32 failed with exit code %1
+ErrorRegisterTypeLib=Unable to register the type library: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=An error occurred while trying to open the README file.
+ErrorRestartingComputer=Setup was unable to restart the computer. Please do this manually.
+
+; *** Uninstaller messages
+UninstallNotFound=File "%1" does not exist. Cannot uninstall.
+UninstallOpenError=File "%1" could not be opened. Cannot uninstall
+UninstallUnsupportedVer=The uninstall log file "%1" is in a format not recognized by this version of the uninstaller. Cannot uninstall
+UninstallUnknownEntry=An unknown entry (%1) was encountered in the uninstall log
+ConfirmUninstall=Are you sure you want to completely remove %1 and all of its components?
+UninstallOnlyOnWin64=This installation can only be uninstalled on 64-bit Windows.
+OnlyAdminCanUninstall=This installation can only be uninstalled by a user with administrative privileges.
+UninstallStatusLabel=Please wait while %1 is removed from your computer.
+UninstalledAll=%1 was successfully removed from your computer.
+UninstalledMost=%1 uninstall complete.%n%nSome elements could not be removed. These can be removed manually.
+UninstalledAndNeedsRestart=To complete the uninstallation of %1, your computer must be restarted.%n%nWould you like to restart now?
+UninstallDataCorrupted="%1" file is corrupted. Cannot uninstall
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Remove Shared File?
+ConfirmDeleteSharedFile2=The system indicates that the following shared file is no longer in use by any programs. Would you like for Uninstall to remove this shared file?%n%nIf any programs are still using this file and it is removed, those programs may not function properly. If you are unsure, choose No. Leaving the file on your system will not cause any harm.
+SharedFileNameLabel=File name:
+SharedFileLocationLabel=Location:
+WizardUninstalling=Uninstall Status
+StatusUninstalling=Uninstalling %1...
+
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=Installing %1.
+ShutdownBlockReasonUninstallingApp=Uninstalling %1.
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 version %2
+AdditionalIcons=Additional icons:
+CreateDesktopIcon=Create a &desktop icon
+CreateQuickLaunchIcon=Create a &Quick Launch icon
+ProgramOnTheWeb=%1 on the Web
+UninstallProgram=Uninstall %1
+LaunchProgram=Launch %1
+AssocFileExtension=&Associate %1 with the %2 file extension
+AssocingFileExtension=Associating %1 with the %2 file extension...
+AutoStartProgramGroupDescription=Startup:
+AutoStartProgram=Automatically start %1
+AddonHostProgramNotFound=%1 could not be located in the folder you selected.%n%nDo you want to continue anyway?

distribution/windows/setup/prowlarr.iss

@@ -3,12 +3,13 @@
 
 #define AppName "Prowlarr"
 #define AppPublisher "Team Prowlarr"
-#define AppURL "https://prowlarr.com/"
+#define AppURL "https://prowlarr.video/"
-#define ForumsURL "https://prowlarr.com/discord/"
+#define ForumsURL "https://forums.prowlarr.video/"
 #define AppExeName "Prowlarr.exe"
 #define BaseVersion GetEnv('MAJORVERSION')
 #define BuildNumber GetEnv('MINORVERSION')
 #define BuildVersion GetEnv('PROWLARRVERSION')
+#define BranchName GetEnv('BUILD_SOURCEBRANCHNAME')
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -21,15 +22,15 @@ AppPublisher={#AppPublisher}
 AppPublisherURL={#AppURL}
 AppSupportURL={#ForumsURL}
 AppUpdatesURL={#AppURL}
-DefaultDirName={commonappdata}\Prowlarr
+DefaultDirName={commonappdata}\Prowlarr\bin
 DisableDirPage=yes
 DefaultGroupName={#AppName}
 DisableProgramGroupPage=yes
-OutputBaseFilename=Prowlarr.{#BuildVersion}.{#Runtime}
+OutputBaseFilename=Prowlarr.{#BranchName}.{#BuildVersion}.windows.{#Framework}
 SolidCompression=yes
 AppCopyright=Creative Commons 3.0 License
 AllowUNCPath=False
-UninstallDisplayIcon={app}\bin\Prowlarr.exe
+UninstallDisplayIcon={app}\Prowlarr.exe
 DisableReadyPage=True
 CompressionThreads=2
 Compression=lzma2/normal
@@ -37,7 +38,6 @@ AppContact={#ForumsURL}
 VersionInfoVersion={#BaseVersion}.{#BuildNumber}
 SetupLogging=yes
 OutputDir=output
-WizardStyle=modern
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -48,31 +48,28 @@ Name: "windowsService"; Description: "Install Windows Service (Starts when the c
 Name: "startupShortcut"; Description: "Create shortcut in Startup folder (Starts when you log into Windows)"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
 Name: "none"; Description: "Do not start automatically"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
 
-[Dirs]
-Name: "{app}"; Permissions: users-modify
-
 [Files]
-Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Prowlarr\Prowlarr.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Prowlarr\Prowlarr.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Prowlarr\*"; Excludes: "Prowlarr.Update"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Prowlarr\*"; Excludes: "Prowlarr.Update"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{group}\{#AppName}"; Filename: "{app}\bin\{#AppExeName}"; Parameters: "/icon"
+Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
-Name: "{commondesktop}\{#AppName}"; Filename: "{app}\bin\{#AppExeName}"; Parameters: "/icon"; Tasks: desktopIcon
+Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"; Tasks: desktopIcon
-Name: "{userstartup}\{#AppName}"; Filename: "{app}\bin\Prowlarr.exe"; WorkingDir: "{app}\bin"; Tasks: startupShortcut
+Name: "{userstartup}\{#AppName}"; Filename: "{app}\Prowlarr.exe"; WorkingDir: "{app}"; Tasks: startupShortcut
 
 [InstallDelete]
-Name: "{app}\bin"; Type: filesandordirs
+Name: "{app}"; Type: filesandordirs
 
 [Run]
-Filename: "{app}\bin\Prowlarr.Console.exe"; StatusMsg: "Removing previous Windows Service"; Parameters: "/u /exitimmediately"; Flags: runhidden waituntilterminated;
+Filename: "{app}\Prowlarr.Console.exe"; StatusMsg: "Removing previous Windows Service"; Parameters: "/u /exitimmediately"; Flags: runhidden waituntilterminated;
-Filename: "{app}\bin\Prowlarr.Console.exe"; Description: "Enable Access from Other Devices"; StatusMsg: "Enabling Remote access"; Parameters: "/registerurl /exitimmediately"; Flags: postinstall runascurrentuser runhidden waituntilterminated; Tasks: startupShortcut none;
+Filename: "{app}\Prowlarr.Console.exe"; Description: "Enable Access from Other Devices"; StatusMsg: "Enabling Remote access"; Parameters: "/registerurl /exitimmediately"; Flags: postinstall runascurrentuser runhidden waituntilterminated; Tasks: startupShortcut none;
-Filename: "{app}\bin\Prowlarr.Console.exe"; StatusMsg: "Installing Windows Service"; Parameters: "/i /exitimmediately"; Flags: runhidden waituntilterminated; Tasks: windowsService
+Filename: "{app}\Prowlarr.Console.exe"; StatusMsg: "Installing Windows Service"; Parameters: "/i /exitimmediately"; Flags: runhidden waituntilterminated; Tasks: windowsService
-Filename: "{app}\bin\Prowlarr.exe"; Description: "Open Prowlarr Web UI"; Flags: postinstall skipifsilent nowait; Tasks: windowsService;
+Filename: "{app}\Prowlarr.exe"; Description: "Open Prowlarr Web UI"; Flags: postinstall skipifsilent nowait; Tasks: windowsService;
-Filename: "{app}\bin\Prowlarr.exe"; Description: "Start Prowlarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none;
+Filename: "{app}\Prowlarr.exe"; Description: "Start Prowlarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none;
 
 [UninstallRun]
-Filename: "{app}\bin\prowlarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist
+Filename: "{app}\prowlarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist
 
 [Code]
 function PrepareToInstall(var NeedsRestart: Boolean): String;

docs.sh

@@ -1,38 +0,0 @@
-PLATFORM=$1
-
-if [ "$PLATFORM" = "Windows" ]; then
-  RUNTIME="win-x64"
-elif [ "$PLATFORM" = "Linux" ]; then
-  WHERE="linux-x64"
-elif [ "$PLATFORM" = "Mac" ]; then
-  WHERE="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/Prowlarr.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.3.0 Swashbuckle.AspNetCore.Cli
-
-dotnet tool run swagger tofile --output ./src/Prowlarr.Api.V1/openapi.json "$outputFolder/net6.0/$RUNTIME/prowlarr.console.dll" v1 &
-
-sleep 30
-
-kill %1
-
-exit 0

frontend/postcss.config.js

@@ -1,6 +1,7 @@
 const reload = require('require-nocache')(module);
 
 const cssVarsFiles = [
+  './src/Styles/Variables/colors',
   './src/Styles/Variables/dimensions',
   './src/Styles/Variables/fonts',
   './src/Styles/Variables/animations',
@@ -28,4 +29,4 @@ module.exports = {
     'postcss-color-function',
     'postcss-nested'
   ]
-};
+};

frontend/src/App/App.js

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

frontend/src/App/AppRoutes.js

@@ -11,7 +11,6 @@ import ApplicationSettingsConnector from 'Settings/Applications/ApplicationSetti
 import DevelopmentSettingsConnector from 'Settings/Development/DevelopmentSettingsConnector';
 import DownloadClientSettingsConnector from 'Settings/DownloadClients/DownloadClientSettingsConnector';
 import GeneralSettingsConnector from 'Settings/General/GeneralSettingsConnector';
-import IndexerSettings from 'Settings/Indexers/IndexerSettings';
 import NotificationSettings from 'Settings/Notifications/NotificationSettings';
 import Settings from 'Settings/Settings';
 import TagSettings from 'Settings/Tags/TagSettings';
@@ -91,11 +90,6 @@ function AppRoutes(props) {
         component={Settings}
       />
 
-      <Route
-        path="/settings/indexers"
-        component={IndexerSettings}
-      />
-
       <Route
         path="/settings/applications"
         component={ApplicationSettingsConnector}

frontend/src/App/AppUpdatedModalContent.js

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

frontend/src/App/ApplyTheme.js

@@ -1,49 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Fragment, 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.Prowlarr.theme,
-    (
-      theme
-    ) => {
-      return {
-        theme
-      };
-    }
-  );
-}
-
-function ApplyTheme({ theme, children }) {
-  // Update the CSS Variables
-  function updateCSSVariables() {
-    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]
-      );
-    });
-  }
-
-  // On Component Mount and Component Update
-  useEffect(() => {
-    updateCSSVariables(theme);
-  }, [theme]);
-
-  return <Fragment>{children}</Fragment>;
-}
-
-ApplyTheme.propTypes = {
-  theme: PropTypes.string.isRequired,
-  children: PropTypes.object.isRequired
-};
-
-export default connect(createMapStateToProps)(ApplyTheme);

frontend/src/Commands/commandNames.js

@@ -4,5 +4,7 @@ export const CLEAR_HISTORY = 'ClearHistory';
 export const CLEAR_LOGS = 'ClearLog';
 export const DELETE_LOG_FILES = 'DeleteLogFiles';
 export const DELETE_UPDATE_LOG_FILES = 'DeleteUpdateLogFiles';
+export const INTERACTIVE_IMPORT = 'ManualImport';
 export const RESET_API_KEY = 'ResetApiKey';
+export const RSS_SYNC = 'RssSync';
 export const APP_INDEXER_SYNC = 'ApplicationIndexerSync';

frontend/src/Components/Alert.css

@@ -7,25 +7,25 @@
 }
 
 .danger {
-  border-color: var(--alertDangerBorderColor);
+  border-color: $alertDangerBorderColor;
-  background-color: var(--alertDangerBackgroundColor);
+  background-color: $alertDangerBackgroundColor;
-  color: var(--alertDangerColor);
+  color: $alertDangerColor;
 }
 
 .info {
-  border-color: var(--alertInfoBorderColor);
+  border-color: $alertInfoBorderColor;
-  background-color: var(--alertInfoBackgroundColor);
+  background-color: $alertInfoBackgroundColor;
-  color: var(--alertInfoColor);
+  color: $alertInfoColor;
 }
 
 .success {
-  border-color: var(--alertSuccessBorderColor);
+  border-color: $alertSuccessBorderColor;
-  background-color: var(--alertSuccessBackgroundColor);
+  background-color: $alertSuccessBackgroundColor;
-  color: var(--alertSuccessColor);
+  color: $alertSuccessColor;
 }
 
 .warning {
-  border-color: var(--alertWarningBorderColor);
+  border-color: $alertWarningBorderColor;
-  background-color: var(--alertWarningBackgroundColor);
+  background-color: $alertWarningBackgroundColor;
-  color: var(--alertWarningColor);
+  color: $alertWarningColor;
 }

frontend/src/Components/Card.css

@@ -3,9 +3,9 @@
   margin: 10px;
   padding: 10px;
   border-radius: 3px;
-  background-color: var(--cardBackgroundColor);
+  background-color: $white;
-  box-shadow: 0 0 10px 1px var(--cardShadowColor);
+  box-shadow: 0 0 10px 1px $cardShadowColor;
-  color: var(--defaultColor);
+  color: $defaultColor;
 }
 
 .underlay {

frontend/src/Components/Chart/BarChart.js

@@ -2,16 +2,15 @@ import Chart from 'chart.js/auto';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { kinds } from 'Helpers/Props';
+import colors from 'Styles/Variables/colors';
 
 function getColors(kind) {
 
-  const style = getComputedStyle(document.body);
-
   if (kind === kinds.WARNING) {
-    return style.getPropertyValue('--failedColors').split(',');
+    return colors.failedColors.reverse();
   }
 
-  return style.getPropertyValue('--chartColors').split(',');
+  return colors.chartColors;
 }
 
 class BarChart extends Component {
@@ -24,16 +23,6 @@ class BarChart extends Component {
     this.myChart = new Chart(this.canvasRef.current, {
       type: 'bar',
       options: {
-        x: {
-          ticks: {
-            stepSize: this.props.stepSize
-          }
-        },
-        y: {
-          ticks: {
-            stepSize: this.props.stepSize
-          }
-        },
         indexAxis: this.props.horizontal ? 'y' : 'x',
         maintainAspectRatio: false,
         plugins: {
@@ -75,8 +64,7 @@ BarChart.propTypes = {
   horizontal: PropTypes.bool,
   legend: PropTypes.bool,
   title: PropTypes.string.isRequired,
-  kind: PropTypes.oneOf(kinds.all).isRequired,
+  kind: PropTypes.oneOf(kinds.all).isRequired
-  stepSize: PropTypes.number
 };
 
 BarChart.defaultProps = {
@@ -84,8 +72,7 @@ BarChart.defaultProps = {
   horizontal: false,
   legend: false,
   title: '',
-  kind: kinds.INFO,
+  kind: kinds.INFO
-  stepSize: 1
 };
 
 export default BarChart;

frontend/src/Components/Chart/DoughnutChart.js

@@ -1,12 +1,7 @@
 import Chart from 'chart.js/auto';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-
+import colors from 'Styles/Variables/colors';
-function getColors(kind) {
-
-  const style = getComputedStyle(document.body);
-  return style.getPropertyValue('--chartColorsDiversified').split(',');
-}
 
 class DoughnutChart extends Component {
   constructor(props) {
@@ -34,7 +29,7 @@ class DoughnutChart extends Component {
         datasets: [{
           label: this.props.title,
           data: this.props.data.map((d) => d.value),
-          backgroundColor: getColors()
+          backgroundColor: colors.chartColors
         }]
       }
     });

frontend/src/Components/Chart/StackedBarChart.js

@@ -1,12 +1,7 @@
 import Chart from 'chart.js/auto';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-
+import colors from 'Styles/Variables/colors';
-function getColors(index) {
-
-  const style = getComputedStyle(document.body);
-  return style.getPropertyValue('--chartColorsDiversified').split(',')[index];
-}
 
 class StackedBarChart extends Component {
   constructor(props) {
@@ -21,16 +16,10 @@ class StackedBarChart extends Component {
         maintainAspectRatio: false,
         scales: {
           x: {
-            stacked: true,
+            stacked: true
-            ticks: {
-              stepSize: this.props.stepSize
-            }
           },
           y: {
-            stacked: true,
+            stacked: true
-            ticks: {
-              stepSize: this.props.stepSize
-            }
           }
         },
         plugins: {
@@ -46,7 +35,7 @@ class StackedBarChart extends Component {
           return {
             label: d.label,
             data: d.data,
-            backgroundColor: getColors(index)
+            backgroundColor: colors.chartColors[index]
           };
         })
       }
@@ -59,7 +48,7 @@ class StackedBarChart extends Component {
       return {
         label: d.label,
         data: d.data,
-        backgroundColor: getColors(index)
+        backgroundColor: colors.chartColors[index]
       };
     });
     this.myChart.update();
@@ -74,13 +63,11 @@ class StackedBarChart extends Component {
 
 StackedBarChart.propTypes = {
   data: PropTypes.object.isRequired,
-  title: PropTypes.string.isRequired,
+  title: PropTypes.string.isRequired
-  stepSize: PropTypes.number
 };
 
 StackedBarChart.defaultProps = {
-  title: '',
+  title: ''
-  stepSize: 1
 };
 
 export default StackedBarChart;

frontend/src/Components/FieldSet.css

@@ -13,7 +13,7 @@
   width: 100%;
   border: 0;
   border-bottom: 1px solid #e5e5e5;
-  color: var(--textColor);
+  color: #3a3f51;
   font-size: 21px;
   line-height: inherit;
 }

frontend/src/Components/FileBrowser/FileBrowserModalContent.css

@@ -13,7 +13,7 @@
 }
 
 .faqLink {
-  color: var(--alertWarningColor);
+  color: $alertWarningColor;
   font-weight: bold;
 }
 

frontend/src/Components/FileBrowser/FileBrowserModalContent.js

@@ -70,18 +70,18 @@ class FileBrowserModalContent extends Component {
     } else {
       this._scrollerNode = null;
     }
-  };
+  }
 
   //
   // Listeners
 
   onPathInputChange = ({ value }) => {
     this.setState({ currentPath: value });
-  };
+  }
 
   onRowPress = (path) => {
     this.props.onFetchPaths(path);
-  };
+  }
 
   onOkPress = () => {
     this.props.onChange({
@@ -91,7 +91,7 @@ class FileBrowserModalContent extends Component {
 
     this.props.onClearPaths();
     this.props.onModalClose();
-  };
+  }
 
   //
   // Render
@@ -129,7 +129,7 @@ class FileBrowserModalContent extends Component {
                 className={styles.mappedDrivesWarning}
                 kind={kinds.WARNING}
               >
-                <Link to="https://wiki.servarr.com/prowlarr/faq#why-cant-prowlarr-see-my-files-on-a-remote-server">
+                <Link to="https://wiki.servarr.com/Prowlarr_FAQ#Why_cant_Prowlarr_see_my_files_on_a_remote_server">
                   {translate('MappedDrivesRunningAsService')}
                 </Link>
               </Alert>

frontend/src/Components/FileBrowser/FileBrowserModalContentConnector.js

@@ -78,16 +78,16 @@ class FileBrowserModalContentConnector extends Component {
       allowFoldersWithoutTrailingSlashes: true,
       includeFiles
     });
-  };
+  }
 
   onClearPaths = () => {
     // this.props.dispatchClearPaths();
-  };
+  }
 
   onModalClose = () => {
     this.props.dispatchClearPaths();
     this.props.onModalClose();
-  };
+  }
 
   //
   // Render

frontend/src/Components/FileBrowser/FileBrowserRow.js

@@ -28,7 +28,7 @@ class FileBrowserRow extends Component {
 
   onPress = () => {
     this.props.onPress(this.props.path);
-  };
+  }
 
   //
   // Render

frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.js

@@ -102,7 +102,7 @@ class DateFilterBuilderRowValue extends Component {
       name: NAME,
       value: newValue
     });
-  };
+  }
 
   onTimeChange = ({ value }) => {
     const {
@@ -117,7 +117,7 @@ class DateFilterBuilderRowValue extends Component {
         value: filterValue.value
       }
     });
-  };
+  }
 
   //
   // Render
@@ -160,7 +160,6 @@ class DateFilterBuilderRowValue extends Component {
       <TextInput
         name={NAME}
         value={filterValue}
-        type="date"
         placeholder="yyyy-mm-dd"
         onChange={this.onValueChange}
       />

frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js

@@ -63,7 +63,7 @@ class FilterBuilderModalContent extends Component {
 
   onLabelChange = ({ value }) => {
     this.setState({ label: value });
-  };
+  }
 
   onFilterChange = (index, filter) => {
     const filters = [...this.state.filters];
@@ -72,7 +72,7 @@ class FilterBuilderModalContent extends Component {
     this.setState({
       filters
     });
-  };
+  }
 
   onAddFilterPress = () => {
     const filters = [...this.state.filters];
@@ -81,7 +81,7 @@ class FilterBuilderModalContent extends Component {
     this.setState({
       filters
     });
-  };
+  }
 
   onRemoveFilterPress = (index) => {
     const filters = [...this.state.filters];
@@ -90,7 +90,7 @@ class FilterBuilderModalContent extends Component {
     this.setState({
       filters
     });
-  };
+  }
 
   onSaveFilterPress = () => {
     const {
@@ -122,7 +122,7 @@ class FilterBuilderModalContent extends Component {
       label,
       filters
     });
-  };
+  }
 
   //
   // Render
@@ -166,9 +166,7 @@ class FilterBuilderModalContent extends Component {
             </div>
           </div>
 
-          <div className={styles.label}>
+          <div className={styles.label}>Filters</div>
-            {translate('Filters')}
-          </div>
 
           <div className={styles.rows}>
             {

frontend/src/Components/Filter/Builder/FilterBuilderRow.css

@@ -3,7 +3,7 @@
   margin-bottom: 5px;
 
   &:hover {
-    background-color: var(--tableRowHoverBackgroundColor);
+    background-color: $tableRowHoverBackgroundColor;
   }
 }
 

frontend/src/Components/Filter/Builder/FilterBuilderRow.js

@@ -8,7 +8,6 @@ import BoolFilterBuilderRowValue from './BoolFilterBuilderRowValue';
 import DateFilterBuilderRowValue from './DateFilterBuilderRowValue';
 import FilterBuilderRowValueConnector from './FilterBuilderRowValueConnector';
 import IndexerFilterBuilderRowValueConnector from './IndexerFilterBuilderRowValueConnector';
-import PrivacyFilterBuilderRowValue from './PrivacyFilterBuilderRowValue';
 import ProtocolFilterBuilderRowValue from './ProtocolFilterBuilderRowValue';
 import TagFilterBuilderRowValueConnector from './TagFilterBuilderRowValueConnector';
 import styles from './FilterBuilderRow.css';
@@ -64,9 +63,6 @@ function getRowValueConnector(selectedFilterBuilderProp) {
     case filterBuilderValueTypes.PROTOCOL:
       return ProtocolFilterBuilderRowValue;
 
-    case filterBuilderValueTypes.PRIVACY:
-      return PrivacyFilterBuilderRowValue;
-
     case filterBuilderValueTypes.TAG:
       return TagFilterBuilderRowValueConnector;
 
@@ -142,7 +138,7 @@ class FilterBuilderRow extends Component {
 
     this.selectedFilterBuilderProp = selectedFilterBuilderProp;
     onFilterChange(index, filter);
-  };
+  }
 
   onFilterChange = ({ name, value }) => {
     const {
@@ -162,7 +158,7 @@ class FilterBuilderRow extends Component {
     filter[name] = value;
 
     onFilterChange(index, filter);
-  };
+  }
 
   onAddPress = () => {
     const {
@@ -171,7 +167,7 @@ class FilterBuilderRow extends Component {
     } = this.props;
 
     onAddPress(index);
-  };
+  }
 
   onRemovePress = () => {
     const {
@@ -180,7 +176,7 @@ class FilterBuilderRow extends Component {
     } = this.props;
 
     onRemovePress(index);
-  };
+  }
 
   //
   // Render

frontend/src/Components/Filter/Builder/FilterBuilderRowValue.js

@@ -84,7 +84,7 @@ class FilterBuilderRowValue extends Component {
       name: NAME,
       value: [...filterValue, value]
     });
-  };
+  }
 
   onTagDelete = ({ index }) => {
     const {
@@ -98,7 +98,7 @@ class FilterBuilderRowValue extends Component {
       name: NAME,
       value
     });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.css

@@ -17,5 +17,5 @@
 
 .or {
   margin: 0 3px;
-  color: var(--themeDarkColor);
+  color: $themeDarkColor;
 }

frontend/src/Components/Filter/Builder/IndexerFilterBuilderRowValueConnector.js

@@ -47,7 +47,7 @@ class IndexerFilterBuilderRowValueConnector extends Component {
     if (!this.props.isPopulated) {
       this.props.dispatchFetchIndexers();
     }
-  };
+  }
 
   //
   // Render

frontend/src/Components/Filter/Builder/PrivacyFilterBuilderRowValue.js

@@ -1,20 +0,0 @@
-import React from 'react';
-import translate from 'Utilities/String/translate';
-import FilterBuilderRowValue from './FilterBuilderRowValue';
-
-const privacyTypes = [
-  { id: 'public', name: translate('Public') },
-  { id: 'private', name: translate('Private') },
-  { id: 'semiPrivate', name: translate('SemiPrivate') }
-];
-
-function PrivacyFilterBuilderRowValue(props) {
-  return (
-    <FilterBuilderRowValue
-      tagList={privacyTypes}
-      {...props}
-    />
-  );
-}
-
-export default PrivacyFilterBuilderRowValue;

frontend/src/Components/Filter/CustomFilters/CustomFilter.css

@@ -4,7 +4,7 @@
   padding: 5px;
 
   &:hover {
-    background-color: var(--tableRowHoverBackgroundColor);
+    background-color: $tableRowHoverBackgroundColor;
   }
 }
 

frontend/src/Components/Filter/CustomFilters/CustomFilter.js

@@ -55,7 +55,7 @@ class CustomFilter extends Component {
     } = this.props;
 
     onEditPress(id);
-  };
+  }
 
   onRemovePress = () => {
     const {
@@ -67,7 +67,7 @@ class CustomFilter extends Component {
       dispatchDeleteCustomFilter({ id });
     });
 
-  };
+  }
 
   //
   // Render

frontend/src/Components/Filter/FilterModal.js

@@ -25,14 +25,14 @@ class FilterModal extends Component {
     this.setState({
       filterBuilder: true
     });
-  };
+  }
 
   onEditCustomFilter = (id) => {
     this.setState({
       filterBuilder: true,
       id
     });
-  };
+  }
 
   onCancelPress = () => {
     if (this.state.filterBuilder) {
@@ -43,7 +43,7 @@ class FilterModal extends Component {
     } else {
       this.onModalClose();
     }
-  };
+  }
 
   onModalClose = () => {
     this.setState({
@@ -52,7 +52,7 @@ class FilterModal extends Component {
     }, () => {
       this.props.onModalClose();
     });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/AppProfileSelectInputConnector.js

@@ -69,7 +69,7 @@ class AppProfileSelectInputConnector extends Component {
 
   onChange = ({ name, value }) => {
     this.props.onChange({ name, value: parseInt(value) });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/AutoCompleteInput.js

@@ -35,11 +35,11 @@ class AutoCompleteInput extends Component {
       name: this.props.name,
       value: newValue
     });
-  };
+  }
 
   onInputBlur = () => {
     this.setState({ suggestions: [] });
-  };
+  }
 
   onSuggestionsFetchRequested = ({ value }) => {
     const { values } = this.props;
@@ -50,11 +50,11 @@ class AutoCompleteInput extends Component {
     });
 
     this.setState({ suggestions: filteredValues });
-  };
+  }
 
   onSuggestionsClearRequested = () => {
     this.setState({ suggestions: [] });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/AutoSuggestInput.css

@@ -27,10 +27,10 @@
     overflow-y: auto;
     max-height: 200px;
     width: 100%;
-    border: 1px solid var(--inputBorderColor);
+    border: 1px solid $inputBorderColor;
     border-radius: 4px;
-    background-color: var(--inputBackgroundColor);
+    background-color: $white;
-    box-shadow: inset 0 1px 1px var(--inputBoxShadowColor);
+    box-shadow: inset 0 1px 1px $inputBoxShadowColor;
   }
 }
 
@@ -46,5 +46,5 @@
 }
 
 .suggestionHighlighted {
-  background-color: var(--menuItemHoverBackgroundColor);
+  background-color: $menuItemHoverBackgroundColor;
 }

frontend/src/Components/Form/AutoSuggestInput.js

@@ -49,7 +49,7 @@ class AutoSuggestInput extends Component {
         }}
       </Reference>
     );
-  };
+  }
 
   renderSuggestionsContainer = ({ containerProps, children }) => {
     return (
@@ -90,7 +90,7 @@ class AutoSuggestInput extends Component {
         </Popper>
       </Portal>
     );
-  };
+  }
 
   //
   // Listeners
@@ -113,14 +113,14 @@ class AutoSuggestInput extends Component {
     data.styles.width = width;
 
     return data;
-  };
+  }
 
   onInputChange = (event, { newValue }) => {
     this.props.onChange({
       name: this.props.name,
       value: newValue
     });
-  };
+  }
 
   onInputKeyDown = (event) => {
     const {
@@ -144,7 +144,7 @@ class AutoSuggestInput extends Component {
         });
       }
     }
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/CaptchaInputConnector.js

@@ -39,7 +39,7 @@ class CaptchaInputConnector extends Component {
 
   componentWillUnmount = () => {
     this.props.resetCaptcha();
-  };
+  }
 
   //
   // Listeners
@@ -51,7 +51,7 @@ class CaptchaInputConnector extends Component {
     } = this.props;
 
     this.props.refreshCaptcha({ provider, providerData });
-  };
+  }
 
   onCaptchaChange = (captchaResponse) => {
     // If the captcha has expired `captchaResponse` will be null.
@@ -68,7 +68,7 @@ class CaptchaInputConnector extends Component {
     } = this.props;
 
     this.props.getCaptchaCookie({ provider, providerData, captchaResponse });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/CardigannCaptchaInputConnector.js

@@ -31,7 +31,7 @@ class CardigannCaptchaInputConnector extends Component {
 
   componentWillUnmount = () => {
     this.props.resetCaptcha();
-  };
+  }
 
   //
   // Listeners
@@ -48,7 +48,7 @@ class CardigannCaptchaInputConnector extends Component {
     this.props.resetCaptcha();
     this.props.refreshCaptcha({ provider, providerData });
 
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/CheckInput.css

@@ -32,21 +32,21 @@
   height: 20px;
   border: 1px solid #ccc;
   border-radius: 2px;
-  background-color: var(--white);
+  background-color: $white;
-  color: var(--white);
+  color: $white;
   text-align: center;
   line-height: 20px;
 }
 
 .checkbox:focus + .input {
   outline: 0;
-  border-color: var(--inputFocusBorderColor);
+  border-color: $inputFocusBorderColor;
-  box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputFocusBoxShadowColor);
+  box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputFocusBoxShadowColor;
 }
 
 .dangerIsChecked {
-  border-color: var(--dangerColor);
+  border-color: $dangerColor;
-  background-color: var(--dangerColor);
+  background-color: $dangerColor;
 
   &.isDisabled {
     opacity: 0.7;
@@ -54,8 +54,8 @@
 }
 
 .primaryIsChecked {
-  border-color: var(--primaryColor);
+  border-color: $primaryColor;
-  background-color: var(--primaryColor);
+  background-color: $primaryColor;
 
   &.isDisabled {
     opacity: 0.7;
@@ -63,8 +63,8 @@
 }
 
 .successIsChecked {
-  border-color: var(--successColor);
+  border-color: $successColor;
-  background-color: var(--successColor);
+  background-color: $successColor;
 
   &.isDisabled {
     opacity: 0.7;
@@ -72,8 +72,8 @@
 }
 
 .warningIsChecked {
-  border-color: var(--warningColor);
+  border-color: $warningColor;
-  background-color: var(--warningColor);
+  background-color: $warningColor;
 
   &.isDisabled {
     opacity: 0.7;
@@ -82,15 +82,15 @@
 
 .isNotChecked {
   &.isDisabled {
-    border-color: var(--disabledCheckInputColor);
+    border-color: $disabledCheckInputColor;
-    background-color: var(--disabledCheckInputColor);
+    background-color: $disabledCheckInputColor;
     opacity: 0.7;
   }
 }
 
 .isIndeterminate {
-  border-color: var(--gray);
+  border-color: $gray;
-  background-color: var(--gray);
+  background-color: $gray;
 }
 
 .helpText {

frontend/src/Components/Form/CheckInput.js

@@ -59,14 +59,14 @@ class CheckInput extends Component {
         shiftKey
       });
     }
-  };
+  }
 
   //
   // Listeners
 
   setRef = (ref) => {
     this._checkbox = ref;
-  };
+  }
 
   onClick = (event) => {
     if (this.props.isDisabled) {
@@ -78,14 +78,14 @@ class CheckInput extends Component {
 
     event.preventDefault();
     this.toggleChecked(checked, shiftKey);
-  };
+  }
 
   onChange = (event) => {
     const checked = event.target.checked;
     const shiftKey = event.nativeEvent.shiftKey;
 
     this.toggleChecked(checked, shiftKey);
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/DeviceInput.js

@@ -23,7 +23,7 @@ class DeviceInput extends Component {
       name,
       value: [...value, deviceId]
     });
-  };
+  }
 
   onTagDelete = ({ index }) => {
     const {
@@ -39,7 +39,7 @@ class DeviceInput extends Component {
       name,
       value: newValue
     });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/DeviceInputConnector.js

@@ -48,11 +48,11 @@ class DeviceInputConnector extends Component {
 
   componentDidMount = () => {
     this._populate();
-  };
+  }
 
   componentWillUnmount = () => {
     this.props.dispatchClearOptions({ section: 'devices' });
-  };
+  }
 
   //
   // Control
@@ -77,7 +77,7 @@ class DeviceInputConnector extends Component {
 
   onRefreshPress = () => {
     this._populate();
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/EnhancedSelectInput.css

@@ -39,7 +39,7 @@
 .dropdownArrowContainerDisabled {
   composes: dropdownArrowContainer;
 
-  color: var(--disabledInputColor);
+  color: $disabledInputColor;
 }
 
 .optionsContainer {
@@ -50,9 +50,9 @@
 .options {
   composes: scroller from '~Components/Scroller/Scroller.css';
 
-  border: 1px solid var(--inputBorderColor);
+  border: 1px solid $inputBorderColor;
   border-radius: 4px;
-  background-color: var(--inputBackgroundColor);
+  background-color: $white;
 }
 
 .optionsModal {
@@ -76,9 +76,9 @@
 .optionsModalScroller {
   composes: scroller from '~Components/Scroller/Scroller.css';
 
-  border: 1px solid var(--inputBorderColor);
+  border: 1px solid $inputBorderColor;
   border-radius: 4px;
-  background-color: var(--inputBackgroundColor);
+  background-color: $white;
 }
 
 .loading {
@@ -90,7 +90,7 @@
   display: flex;
   justify-content: flex-end;
   height: 40px;
-  border-bottom: 1px solid var(--borderColor);
+  border-bottom: 1px solid $borderColor;
 }
 
 .mobileCloseButton {
@@ -100,6 +100,6 @@
   line-height: 40px;
 
   &:hover {
-    color: var(--modalCloseButtonHoverColor);
+    color: $modalCloseButtonHoverColor;
   }
 }

frontend/src/Components/Form/EnhancedSelectInput.js

@@ -149,7 +149,7 @@ class EnhancedSelectInput extends Component {
     }
 
     return data;
-  };
+  }
 
   onWindowClick = (event) => {
     const button = document.getElementById(this._buttonId);
@@ -168,14 +168,14 @@ class EnhancedSelectInput extends Component {
       this.setState({ isOpen: false });
       this._removeListener();
     }
-  };
+  }
 
   onFocus = () => {
     if (this.state.isOpen) {
       this._removeListener();
       this.setState({ isOpen: false });
     }
-  };
+  }
 
   onBlur = () => {
     if (!this.props.isEditable) {
@@ -186,7 +186,7 @@ class EnhancedSelectInput extends Component {
         this.setState({ selectedIndex: origIndex });
       }
     }
-  };
+  }
 
   onKeyDown = (event) => {
     const {
@@ -253,7 +253,7 @@ class EnhancedSelectInput extends Component {
     if (!_.isEmpty(newState)) {
       this.setState(newState);
     }
-  };
+  }
 
   onPress = () => {
     if (this.state.isOpen) {
@@ -267,7 +267,7 @@ class EnhancedSelectInput extends Component {
     }
 
     this.setState({ isOpen: !this.state.isOpen });
-  };
+  }
 
   onSelect = (value) => {
     if (Array.isArray(this.props.value)) {
@@ -291,15 +291,15 @@ class EnhancedSelectInput extends Component {
         value
       });
     }
-  };
+  }
 
   onMeasure = ({ width }) => {
     this.setState({ width });
-  };
+  }
 
   onOptionsModalClose = () => {
     this.setState({ isOpen: false });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/EnhancedSelectInputConnector.js

@@ -73,7 +73,7 @@ class EnhancedSelectInputConnector extends Component {
 
   componentDidMount = () => {
     this._populate();
-  };
+  }
 
   componentDidUpdate = (prevProps) => {
     const prevKey = getProviderDataKey(prevProps.providerData);
@@ -82,11 +82,11 @@ class EnhancedSelectInputConnector extends Component {
     if (!_.isEqual(prevKey, nextKey)) {
       this.setState({ refetchRequired: true });
     }
-  };
+  }
 
   componentWillUnmount = () => {
     this._cleanup();
-  };
+  }
 
   //
   // Listeners
@@ -95,7 +95,7 @@ class EnhancedSelectInputConnector extends Component {
     if (this.state.refetchRequired) {
       this._populate();
     }
-  };
+  }
 
   //
   // Control

frontend/src/Components/Form/EnhancedSelectInputOption.css

@@ -7,7 +7,7 @@
   cursor: default;
 
   &:hover {
-    background-color: var(--inputHoverBackgroundColor);
+    background-color: #f8f8f8;
   }
 }
 
@@ -24,17 +24,17 @@
 }
 
 .isSelected {
-  background-color: var(--inputSelectedBackgroundColor);
+  background-color: #e2e2e2;
 
   &:hover {
-    background-color: var(--inputSelectedBackgroundColor);
+    background-color: #e2e2e2;
   }
 
   &.isMobile {
     background-color: inherit;
 
     .iconContainer {
-      color: var(--primaryColor);
+      color: $primaryColor;
     }
   }
 }
@@ -49,7 +49,7 @@
 
 .isMobile {
   height: 50px;
-  border-bottom: 1px solid var(--borderColor);
+  border-bottom: 1px solid $borderColor;
 
   &:last-child {
     border: none;

frontend/src/Components/Form/EnhancedSelectInputOption.js

@@ -21,11 +21,11 @@ class EnhancedSelectInputOption extends Component {
     } = this.props;
 
     onSelect(id);
-  };
+  }
 
   onCheckPress = () => {
     // CheckInput requires a handler. Swallow the change event because onPress will already handle it via event propagation.
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/EnhancedSelectInputSelectedValue.css

@@ -3,5 +3,5 @@
 }
 
 .isDisabled {
-  color: var(--disabledInputColor);
+  color: $disabledInputColor;
 }

frontend/src/Components/Form/FormInputGroup.css

@@ -40,7 +40,7 @@
 }
 
 .pendingChangesIcon {
-  color: var(--warningColor);
+  color: $warningColor;
   font-size: 20px;
   line-height: 35px;
 }

frontend/src/Components/Form/FormInputGroup.js

@@ -16,6 +16,7 @@ import FormInputHelpText from './FormInputHelpText';
 import IndexerFlagsSelectInputConnector from './IndexerFlagsSelectInputConnector';
 import InfoInput from './InfoInput';
 import KeyValueListInput from './KeyValueListInput';
+import MovieMonitoredSelectInput from './MovieMonitoredSelectInput';
 import NumberInput from './NumberInput';
 import OAuthInputConnector from './OAuthInputConnector';
 import PasswordInput from './PasswordInput';
@@ -68,6 +69,9 @@ function getComponent(type) {
     case inputTypes.PATH:
       return PathInputConnector;
 
+    case inputTypes.MOVIE_MONITORED_SELECT:
+      return MovieMonitoredSelectInput;
+
     case inputTypes.INDEXER_FLAGS_SELECT:
       return IndexerFlagsSelectInputConnector;
 

frontend/src/Components/Form/FormInputHelpText.css

@@ -1,14 +1,14 @@
 .helpText {
   margin-top: 5px;
-  color: var(--helpTextColor);
+  color: $helpTextColor;
   line-height: 20px;
 }
 
 .isError {
-  color: var(--dangerColor);
+  color: $dangerColor;
 
   .link {
-    color: var(--dangerColor);
+    color: $dangerColor;
 
     &:hover {
       color: #e01313;
@@ -17,10 +17,10 @@
 }
 
 .isWarning {
-  color: var(--warningColor);
+  color: $warningColor;
 
   .link {
-    color: var(--warningColor);
+    color: $warningColor;
 
     &:hover {
       color: #e36c00;

frontend/src/Components/Form/FormInputHelpText.js

@@ -25,7 +25,7 @@ function FormInputHelpText(props) {
       isCheckInput && styles.isCheckInput
     )}
     >
-      <div dangerouslySetInnerHTML={{ __html: text }} />
+      {text}
 
       {
         link ?

frontend/src/Components/Form/FormLabel.css

@@ -7,11 +7,11 @@
 }
 
 .hasError {
-  color: var(--dangerColor);
+  color: $dangerColor;
 }
 
 .isAdvanced {
-  color: var(--advancedFormLabelColor);
+  color: $advancedFormLabelColor;
 }
 
 @media only screen and (max-width: $breakpointLarge) {

frontend/src/Components/Form/HintedSelectInputOption.css

@@ -18,6 +18,6 @@
   @add-mixin truncate;
 
   margin-left: 15px;
-  color: var(--darkGray);
+  color: $darkGray;
   font-size: $smallFontSize;
 }

frontend/src/Components/Form/HintedSelectInputSelectedValue.css

@@ -18,7 +18,7 @@
 
   flex: 1 10 0;
   margin-left: 15px;
-  color: var(--gray);
+  color: $gray;
   text-align: right;
   font-size: $smallFontSize;
 }

frontend/src/Components/Form/IndexerFlagsSelectInputConnector.js

@@ -43,7 +43,7 @@ class IndexerFlagsSelectInputConnector extends Component {
     });
 
     this.props.onChange({ name, value: indexerFlags });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/IndexersSelectInputConnector.js

@@ -43,7 +43,7 @@ class IndexersSelectInputConnector extends Component {
 
   onChange = ({ name, value }) => {
     this.props.onChange({ name, value });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/InfoInput.js

@@ -11,6 +11,8 @@ class InfoInput extends Component {
       value
     } = this.props;
 
+    console.log(this.props);
+
     return (
       <span dangerouslySetInnerHTML={{ __html: value }} />
     );

frontend/src/Components/Form/Input.css

@@ -2,27 +2,26 @@
   padding: 6px 16px;
   width: 100%;
   height: 35px;
-  border: 1px solid var(--inputBorderColor);
+  border: 1px solid $inputBorderColor;
   border-radius: 4px;
-  background-color: var(--inputBackgroundColor);
+  background-color: $white;
-  box-shadow: inset 0 1px 1px var(--inputBoxShadowColor);
+  box-shadow: inset 0 1px 1px $inputBoxShadowColor;
-  color: var(--textColor);
 
   &:focus {
     outline: 0;
-    border-color: var(--inputFocusBorderColor);
+    border-color: $inputFocusBorderColor;
-    box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputFocusBoxShadowColor);
+    box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputFocusBoxShadowColor;
   }
 }
 
 .hasError {
-  border-color: var(--inputErrorBorderColor);
+  border-color: $inputErrorBorderColor;
-  box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputErrorBoxShadowColor);
+  box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputErrorBoxShadowColor;
 }
 
 .hasWarning {
-  border-color: var(--inputWarningBorderColor);
+  border-color: $inputWarningBorderColor;
-  box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputWarningBoxShadowColor);
+  box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputWarningBoxShadowColor;
 }
 
 .hasButton {

frontend/src/Components/Form/KeyValueListInput.css

@@ -7,8 +7,8 @@
 
   &.isFocused {
     outline: 0;
-    border-color: var(--inputFocusBorderColor);
+    border-color: $inputFocusBorderColor;
-    box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputFocusBoxShadowColor);
+    box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputFocusBoxShadowColor;
   }
 }
 

frontend/src/Components/Form/KeyValueListInput.js

@@ -39,7 +39,7 @@ class KeyValueListInput extends Component {
       name,
       value: newValue
     });
-  };
+  }
 
   onRemoveItem = (index) => {
     const {
@@ -55,13 +55,13 @@ class KeyValueListInput extends Component {
       name,
       value: newValue
     });
-  };
+  }
 
   onFocus = () => {
     this.setState({
       isFocused: true
     });
-  };
+  }
 
   onBlur = () => {
     this.setState({
@@ -88,7 +88,7 @@ class KeyValueListInput extends Component {
         value: newValue
       });
     }
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/KeyValueListInputItem.css

@@ -1,7 +1,7 @@
 .itemContainer {
   display: flex;
   margin-bottom: 3px;
-  border-bottom: 1px solid var(--inputBorderColor);
+  border-bottom: 1px solid $inputBorderColor;
 
   &:last-child {
     margin-bottom: 0;

frontend/src/Components/Form/KeyValueListInputItem.js

@@ -18,7 +18,7 @@ class KeyValueListInputItem extends Component {
     } = this.props;
 
     onChange(index, { key: keyValue, value });
-  };
+  }
 
   onValueChange = ({ value }) => {
     // TODO: Validate here or validate at a lower level component
@@ -30,7 +30,7 @@ class KeyValueListInputItem extends Component {
     } = this.props;
 
     onChange(index, { key: keyValue, value });
-  };
+  }
 
   onRemovePress = () => {
     const {
@@ -39,15 +39,15 @@ class KeyValueListInputItem extends Component {
     } = this.props;
 
     onRemove(index);
-  };
+  }
 
   onFocus = () => {
     this.props.onFocus();
-  };
+  }
 
   onBlur = () => {
     this.props.onBlur();
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/MovieMonitoredSelectInput.js

@@ -0,0 +1,52 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import SelectInput from './SelectInput';
+
+const monitorTypesOptions = [
+  { key: 'true', value: 'True' },
+  { key: 'false', value: 'False' }
+];
+
+function MovieMonitoredSelectInput(props) {
+  const values = [...monitorTypesOptions];
+
+  const {
+    includeNoChange,
+    includeMixed
+  } = props;
+
+  if (includeNoChange) {
+    values.unshift({
+      key: 'noChange',
+      value: 'No Change',
+      disabled: true
+    });
+  }
+
+  if (includeMixed) {
+    values.unshift({
+      key: 'mixed',
+      value: '(Mixed)',
+      disabled: true
+    });
+  }
+
+  return (
+    <SelectInput
+      {...props}
+      values={values}
+    />
+  );
+}
+
+MovieMonitoredSelectInput.propTypes = {
+  includeNoChange: PropTypes.bool.isRequired,
+  includeMixed: PropTypes.bool.isRequired
+};
+
+MovieMonitoredSelectInput.defaultProps = {
+  includeNoChange: false,
+  includeMixed: false
+};
+
+export default MovieMonitoredSelectInput;

frontend/src/Components/Form/NewznabCategorySelectInputConnector.js

@@ -42,7 +42,7 @@ class IndexersSelectInputConnector extends Component {
 
   onChange = ({ name, value }) => {
     this.props.onChange({ name, value });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/NumberInput.js

@@ -59,11 +59,11 @@ class NumberInput extends Component {
       value: parseValue(this.props, value)
     });
 
-  };
+  }
 
   onFocus = () => {
     this.setState({ isFocused: true });
-  };
+  }
 
   onBlur = () => {
     const {
@@ -88,7 +88,7 @@ class NumberInput extends Component {
       name,
       value: parsedValue
     });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/OAuthInputConnector.js

@@ -41,7 +41,7 @@ class OAuthInputConnector extends Component {
 
   componentWillUnmount = () => {
     this.props.resetOAuth();
-  };
+  }
 
   //
   // Listeners
@@ -60,7 +60,7 @@ class OAuthInputConnector extends Component {
       providerData,
       section
     });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/PathInput.js

@@ -62,7 +62,7 @@ class PathInput extends Component {
 
   onInputChange = ({ value }) => {
     this.setState({ value });
-  };
+  }
 
   onInputKeyDown = (event) => {
     if (event.key === 'Tab') {
@@ -80,7 +80,7 @@ class PathInput extends Component {
         }
       }
     }
-  };
+  }
 
   onInputBlur = () => {
     this.props.onChange({
@@ -89,28 +89,28 @@ class PathInput extends Component {
     });
 
     this.props.onClearPaths();
-  };
+  }
 
   onSuggestionsFetchRequested = ({ value }) => {
     this.props.onFetchPaths(value);
-  };
+  }
 
   onSuggestionsClearRequested = () => {
     // Required because props aren't always rendered, but no-op
     // because we don't want to reset the paths after a path is selected.
-  };
+  }
 
   onSuggestionSelected = (event, { suggestionValue }) => {
     this.props.onFetchPaths(suggestionValue);
-  };
+  }
 
   onFileBrowserOpenPress = () => {
     this.setState({ isFileBrowserModalOpen: true });
-  };
+  }
 
   onFileBrowserModalClose = () => {
     this.setState({ isFileBrowserModalOpen: false });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/PathInputConnector.js

@@ -47,11 +47,11 @@ class PathInputConnector extends Component {
       path,
       includeFiles
     });
-  };
+  }
 
   onClearPaths = () => {
     this.props.dispatchClearPaths();
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/ProviderFieldFormGroup.js

@@ -53,8 +53,7 @@ function getSelectValues(selectOptions) {
     result.push({
       key: option.value,
       value: option.name,
-      hint: option.hint,
+      hint: option.hint
-      parentKey: option.parentValue
     });
 
     return result;
@@ -68,7 +67,6 @@ function ProviderFieldFormGroup(props) {
     label,
     helpText,
     helpLink,
-    placeholder,
     value,
     type,
     advanced,
@@ -101,7 +99,6 @@ function ProviderFieldFormGroup(props) {
         label={label}
         helpText={helpText}
         helpLink={helpLink}
-        placeholder={placeholder}
         value={value}
         values={getSelectValues(selectOptions)}
         errors={errors}
@@ -127,7 +124,6 @@ ProviderFieldFormGroup.propTypes = {
   label: PropTypes.string,
   helpText: PropTypes.string,
   helpLink: PropTypes.string,
-  placeholder: PropTypes.string,
   value: PropTypes.any,
   type: PropTypes.string.isRequired,
   advanced: PropTypes.bool.isRequired,

frontend/src/Components/Form/SelectInput.js

@@ -13,7 +13,7 @@ class SelectInput extends Component {
       name: this.props.name,
       value: event.target.value
     });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/TagInput.css

@@ -7,8 +7,8 @@
 
   &.isFocused {
     outline: 0;
-    border-color: var(--inputFocusBorderColor);
+    border-color: $inputFocusBorderColor;
-    box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputFocusBoxShadowColor);
+    box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputFocusBoxShadowColor;
   }
 }
 
@@ -20,6 +20,4 @@
   width: 0%;
   height: 31px;
   border: none;
-  background-color: var(--inputBackground);
-  color: var(--textColor);
 }

frontend/src/Components/Form/TagInput.js

@@ -49,7 +49,7 @@ class TagInput extends Component {
 
   _setAutosuggestRef = (ref) => {
     this._autosuggestRef = ref;
-  };
+  }
 
   getSuggestionValue({ name }) {
     return name;
@@ -57,7 +57,7 @@ class TagInput extends Component {
 
   shouldRenderSuggestions = (value) => {
     return value.length >= this.props.minQueryLength;
-  };
+  }
 
   renderSuggestion({ name }) {
     return name;
@@ -70,14 +70,14 @@ class TagInput extends Component {
       value: '',
       suggestions: []
     });
-  }, 250, { leading: true, trailing: false });
+  }, 250, { leading: true, trailing: false })
 
   //
   // Listeners
 
   onInputContainerPress = () => {
     this._autosuggestRef.input.focus();
-  };
+  }
 
   onInputChange = (event, { newValue, method }) => {
     const value = _.isObject(newValue) ? newValue.name : newValue;
@@ -85,7 +85,7 @@ class TagInput extends Component {
     if (method === 'type') {
       this.setState({ value });
     }
-  };
+  }
 
   onInputKeyDown = (event) => {
     const {
@@ -125,11 +125,11 @@ class TagInput extends Component {
         event.preventDefault();
       }
     }
-  };
+  }
 
   onInputFocus = () => {
     this.setState({ isFocused: true });
-  };
+  }
 
   onInputBlur = () => {
     this.setState({ isFocused: false });
@@ -153,7 +153,7 @@ class TagInput extends Component {
     if (tag) {
       this.addTag(tag);
     }
-  };
+  }
 
   onSuggestionsFetchRequested = ({ value }) => {
     const lowerCaseValue = value.toLowerCase();
@@ -170,16 +170,16 @@ class TagInput extends Component {
     });
 
     this.setState({ suggestions });
-  };
+  }
 
   onSuggestionsClearRequested = () => {
     // Required because props aren't always rendered, but no-op
     // because we don't want to reset the paths after a path is selected.
-  };
+  }
 
   onSuggestionSelected = (event, { suggestion }) => {
     this.addTag(suggestion);
-  };
+  }
 
   //
   // Render
@@ -204,7 +204,7 @@ class TagInput extends Component {
         onInputContainerPress={this.onInputContainerPress}
       />
     );
-  };
+  }
 
   render() {
     const {

frontend/src/Components/Form/TagInputConnector.js

@@ -101,7 +101,7 @@ class TagInputConnector extends Component {
     newValue.push(tag.id);
 
     this.props.onChange({ name, value: newValue });
-  };
+  }
 
   onTagDelete = ({ index }) => {
     const {
@@ -116,7 +116,7 @@ class TagInputConnector extends Component {
       name,
       value: newValue
     });
-  };
+  }
 
   onTagCreated = (tag) => {
     const {
@@ -128,7 +128,7 @@ class TagInputConnector extends Component {
     newValue.push(tag.id);
 
     this.props.onChange({ name, value: newValue });
-  };
+  }
 
   //
   // Render

frontend/src/Components/Form/TagInputInput.js

@@ -19,7 +19,7 @@ class TagInputInput extends Component {
     }
 
     onInputContainerPress();
-  };
+  }
 
   render() {
     const {