Improve Custom Format compare logging

Co-authored-by: Stevie Robinson <stevie.robinson@gmail.com>

.editorconfig

@@ -2,14 +2,273 @@
 # editorconfig.org
 root = true
 
-[*.{cs}]
+# NOTE: Requires **VS2019 16.3** or later
+
+# Stylecop.ruleset
+# Description: Rules for Sonarr
+
+# Code files
+[*.cs]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.{js,html,js,hbs,less,css}]
+# Sort using and Import directives with System.* appearing first
+dotnet_sort_system_directives_first = true
+
+# Avoid "this." and "Me." if not necessary
+dotnet_style_qualification_for_field = false:refactoring
+dotnet_style_qualification_for_property = false:refactoring
+dotnet_style_qualification_for_method = false:refactoring
+dotnet_style_qualification_for_event = false:refactoring
+
+# Indentation preferences
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = flush_left
+
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+dotnet_naming_style.instance_field_style.capitalization = camel_case
+dotnet_naming_style.instance_field_style.required_prefix = _
+
+# Prefer "var" everywhere
+csharp_style_var_for_built_in_types = true
+csharp_style_var_when_type_is_apparent = true
+csharp_style_var_elsewhere = true
+# Prefer "out" variables to be declared inline
+csharp_style_inlined_variable_declaration = true
+
+# Using directive is unnecessary.
+dotnet_diagnostic.IDE0005.severity = error
+# Use var instead of explicit type
+dotnet_diagnostic.IDE0007.severity = error
+# Inline variable declaration
+dotnet_diagnostic.IDE0018.severity = error
+
+# Stylecop Rules
+dotnet_diagnostic.SA0001.severity = none
+dotnet_diagnostic.SA1025.severity = none
+dotnet_diagnostic.SA1101.severity = none
+dotnet_diagnostic.SA1116.severity = none
+dotnet_diagnostic.SA1118.severity = none
+dotnet_diagnostic.SA1122.severity = none
+dotnet_diagnostic.SA1201.severity = suggestion
+dotnet_diagnostic.SA1202.severity = suggestion
+dotnet_diagnostic.SA1204.severity = suggestion
+dotnet_diagnostic.SA1300.severity = none
+dotnet_diagnostic.SA1303.severity = none
+dotnet_diagnostic.SA1304.severity = none
+dotnet_diagnostic.SA1306.severity = none
+dotnet_diagnostic.SA1309.severity = none
+dotnet_diagnostic.SA1310.severity = none
+dotnet_diagnostic.SA1401.severity = none
+dotnet_diagnostic.SA1402.severity = none
+dotnet_diagnostic.SA1404.severity = suggestion
+dotnet_diagnostic.SA1405.severity = suggestion
+dotnet_diagnostic.SA1406.severity = suggestion
+dotnet_diagnostic.SA1410.severity = suggestion
+dotnet_diagnostic.SA1411.severity = suggestion
+dotnet_diagnostic.SA1413.severity = none
+dotnet_diagnostic.SA1512.severity = none
+dotnet_diagnostic.SA1516.severity = none
+dotnet_diagnostic.SA1600.severity = none
+dotnet_diagnostic.SA1601.severity = none
+dotnet_diagnostic.SA1602.severity = none
+dotnet_diagnostic.SA1604.severity = none
+dotnet_diagnostic.SA1605.severity = none
+dotnet_diagnostic.SA1606.severity = none
+dotnet_diagnostic.SA1607.severity = none
+dotnet_diagnostic.SA1608.severity = none
+dotnet_diagnostic.SA1610.severity = none
+dotnet_diagnostic.SA1611.severity = none
+dotnet_diagnostic.SA1612.severity = none
+dotnet_diagnostic.SA1613.severity = none
+dotnet_diagnostic.SA1614.severity = none
+dotnet_diagnostic.SA1615.severity = none
+dotnet_diagnostic.SA1616.severity = none
+dotnet_diagnostic.SA1617.severity = none
+dotnet_diagnostic.SA1618.severity = none
+dotnet_diagnostic.SA1619.severity = none
+dotnet_diagnostic.SA1620.severity = none
+dotnet_diagnostic.SA1621.severity = none
+dotnet_diagnostic.SA1622.severity = none
+dotnet_diagnostic.SA1623.severity = none
+dotnet_diagnostic.SA1624.severity = none
+dotnet_diagnostic.SA1625.severity = none
+dotnet_diagnostic.SA1626.severity = none
+dotnet_diagnostic.SA1627.severity = none
+dotnet_diagnostic.SA1629.severity = none
+dotnet_diagnostic.SA1633.severity = none
+dotnet_diagnostic.SA1634.severity = none
+dotnet_diagnostic.SA1635.severity = none
+dotnet_diagnostic.SA1636.severity = none
+dotnet_diagnostic.SA1637.severity = none
+dotnet_diagnostic.SA1638.severity = none
+dotnet_diagnostic.SA1640.severity = none
+dotnet_diagnostic.SA1641.severity = none
+dotnet_diagnostic.SA1642.severity = none
+dotnet_diagnostic.SA1643.severity = none
+dotnet_diagnostic.SA1648.severity = none
+dotnet_diagnostic.SA1649.severity = none
+dotnet_diagnostic.SA1651.severity = none
+dotnet_diagnostic.SX1309.severity = warning
+
+# Microsoft Analyzers that fail and need to be sorted thru
+dotnet_diagnostic.ASP0000.severity = suggestion
+dotnet_diagnostic.CA1000.severity = suggestion
+dotnet_diagnostic.CA1001.severity = suggestion
+dotnet_diagnostic.CA1002.severity = suggestion
+dotnet_diagnostic.CA1003.severity = suggestion
+dotnet_diagnostic.CA1008.severity = suggestion
+dotnet_diagnostic.CA1010.severity = suggestion
+dotnet_diagnostic.CA1012.severity = suggestion
+dotnet_diagnostic.CA1014.severity = suggestion
+dotnet_diagnostic.CA1016.severity = suggestion
+dotnet_diagnostic.CA1017.severity = suggestion
+dotnet_diagnostic.CA1018.severity = suggestion
+dotnet_diagnostic.CA1019.severity = suggestion
+dotnet_diagnostic.CA1021.severity = suggestion
+dotnet_diagnostic.CA1024.severity = suggestion
+dotnet_diagnostic.CA1027.severity = suggestion
+dotnet_diagnostic.CA1028.severity = suggestion
+dotnet_diagnostic.CA1030.severity = suggestion
+dotnet_diagnostic.CA1031.severity = suggestion
+dotnet_diagnostic.CA1032.severity = suggestion
+dotnet_diagnostic.CA1033.severity = suggestion
+dotnet_diagnostic.CA1034.severity = suggestion
+dotnet_diagnostic.CA1036.severity = suggestion
+dotnet_diagnostic.CA1040.severity = suggestion
+dotnet_diagnostic.CA1041.severity = suggestion
+dotnet_diagnostic.CA1043.severity = suggestion
+dotnet_diagnostic.CA1044.severity = suggestion
+dotnet_diagnostic.CA1050.severity = suggestion
+dotnet_diagnostic.CA1051.severity = suggestion
+dotnet_diagnostic.CA1052.severity = suggestion
+dotnet_diagnostic.CA1054.severity = suggestion
+dotnet_diagnostic.CA1055.severity = suggestion
+dotnet_diagnostic.CA1056.severity = suggestion
+dotnet_diagnostic.CA1058.severity = suggestion
+dotnet_diagnostic.CA1060.severity = suggestion
+dotnet_diagnostic.CA1061.severity = suggestion
+dotnet_diagnostic.CA1062.severity = suggestion
+dotnet_diagnostic.CA1063.severity = suggestion
+dotnet_diagnostic.CA1064.severity = suggestion
+dotnet_diagnostic.CA1065.severity = suggestion
+dotnet_diagnostic.CA1066.severity = suggestion
+dotnet_diagnostic.CA1067.severity = suggestion
+dotnet_diagnostic.CA1068.severity = suggestion
+dotnet_diagnostic.CA1069.severity = suggestion
+dotnet_diagnostic.CA1200.severity = suggestion
+dotnet_diagnostic.CA1303.severity = suggestion
+dotnet_diagnostic.CA1304.severity = suggestion
+dotnet_diagnostic.CA1305.severity = suggestion
+dotnet_diagnostic.CA1307.severity = suggestion
+dotnet_diagnostic.CA1308.severity = suggestion
+dotnet_diagnostic.CA1309.severity = suggestion
+dotnet_diagnostic.CA1310.severity = suggestion
+dotnet_diagnostic.CA1401.severity = suggestion
+dotnet_diagnostic.CA1416.severity = suggestion
+dotnet_diagnostic.CA1419.severity = suggestion
+dotnet_diagnostic.CA1507.severity = suggestion
+dotnet_diagnostic.CA1508.severity = suggestion
+dotnet_diagnostic.CA1707.severity = suggestion
+dotnet_diagnostic.CA1708.severity = suggestion
+dotnet_diagnostic.CA1710.severity = suggestion
+dotnet_diagnostic.CA1711.severity = suggestion
+dotnet_diagnostic.CA1712.severity = suggestion
+dotnet_diagnostic.CA1714.severity = suggestion
+dotnet_diagnostic.CA1715.severity = suggestion
+dotnet_diagnostic.CA1716.severity = suggestion
+dotnet_diagnostic.CA1717.severity = suggestion
+dotnet_diagnostic.CA1720.severity = suggestion
+dotnet_diagnostic.CA1721.severity = suggestion
+dotnet_diagnostic.CA1724.severity = suggestion
+dotnet_diagnostic.CA1725.severity = suggestion
+dotnet_diagnostic.CA1806.severity = suggestion
+dotnet_diagnostic.CA1810.severity = suggestion
+dotnet_diagnostic.CA1812.severity = suggestion
+dotnet_diagnostic.CA1813.severity = suggestion
+dotnet_diagnostic.CA1814.severity = suggestion
+dotnet_diagnostic.CA1815.severity = suggestion
+dotnet_diagnostic.CA1816.severity = suggestion
+dotnet_diagnostic.CA1819.severity = suggestion
+dotnet_diagnostic.CA1822.severity = suggestion
+dotnet_diagnostic.CA1823.severity = suggestion
+dotnet_diagnostic.CA1824.severity = suggestion
+dotnet_diagnostic.CA2000.severity = suggestion
+dotnet_diagnostic.CA2002.severity = suggestion
+dotnet_diagnostic.CA2007.severity = suggestion
+dotnet_diagnostic.CA2008.severity = suggestion
+dotnet_diagnostic.CA2012.severity = suggestion
+dotnet_diagnostic.CA2013.severity = suggestion
+dotnet_diagnostic.CA2100.severity = suggestion
+dotnet_diagnostic.CA2101.severity = suggestion
+dotnet_diagnostic.CA2119.severity = suggestion
+dotnet_diagnostic.CA2153.severity = suggestion
+dotnet_diagnostic.CA2200.severity = suggestion
+dotnet_diagnostic.CA2201.severity = suggestion
+dotnet_diagnostic.CA2207.severity = suggestion
+dotnet_diagnostic.CA2208.severity = suggestion
+dotnet_diagnostic.CA2211.severity = suggestion
+dotnet_diagnostic.CA2213.severity = suggestion
+dotnet_diagnostic.CA2214.severity = suggestion
+dotnet_diagnostic.CA2215.severity = suggestion
+dotnet_diagnostic.CA2216.severity = suggestion
+dotnet_diagnostic.CA2219.severity = suggestion
+dotnet_diagnostic.CA2225.severity = suggestion
+dotnet_diagnostic.CA2226.severity = suggestion
+dotnet_diagnostic.CA2227.severity = suggestion
+dotnet_diagnostic.CA2229.severity = suggestion
+dotnet_diagnostic.CA2231.severity = suggestion
+dotnet_diagnostic.CA2234.severity = suggestion
+dotnet_diagnostic.CA2235.severity = suggestion
+dotnet_diagnostic.CA2237.severity = suggestion
+dotnet_diagnostic.CA2241.severity = suggestion
+dotnet_diagnostic.CA2242.severity = suggestion
+dotnet_diagnostic.CA2243.severity = suggestion
+dotnet_diagnostic.CA2244.severity = suggestion
+dotnet_diagnostic.CA2245.severity = suggestion
+dotnet_diagnostic.CA2246.severity = suggestion
+dotnet_diagnostic.CA2249.severity = suggestion
+dotnet_diagnostic.CA2251.severity = suggestion
+dotnet_diagnostic.CA3061.severity = suggestion
+dotnet_diagnostic.CA3075.severity = suggestion
+dotnet_diagnostic.CA3076.severity = suggestion
+dotnet_diagnostic.CA3077.severity = suggestion
+dotnet_diagnostic.CA3147.severity = suggestion
+dotnet_diagnostic.CA5350.severity = suggestion
+dotnet_diagnostic.CA5351.severity = suggestion
+dotnet_diagnostic.CA5359.severity = suggestion
+dotnet_diagnostic.CA5360.severity = suggestion
+dotnet_diagnostic.CA5363.severity = suggestion
+dotnet_diagnostic.CA5364.severity = suggestion
+dotnet_diagnostic.CA5365.severity = suggestion
+dotnet_diagnostic.CA5366.severity = suggestion
+dotnet_diagnostic.CA5368.severity = suggestion
+dotnet_diagnostic.CA5369.severity = suggestion
+dotnet_diagnostic.CA5370.severity = suggestion
+dotnet_diagnostic.CA5371.severity = suggestion
+dotnet_diagnostic.CA5372.severity = suggestion
+dotnet_diagnostic.CA5373.severity = suggestion
+dotnet_diagnostic.CA5374.severity = suggestion
+dotnet_diagnostic.CA5379.severity = suggestion
+dotnet_diagnostic.CA5384.severity = suggestion
+dotnet_diagnostic.CA5385.severity = suggestion
+dotnet_diagnostic.CA5392.severity = suggestion
+dotnet_diagnostic.CA5394.severity = suggestion
+dotnet_diagnostic.CA5397.severity = suggestion
+
+dotnet_diagnostic.SYSLIB0006.severity = none
+
+[*.{js,html,hbs,less,css,ts,tsx}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true

.esprintrc

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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,13 +1,13 @@
 name: Bug Report
-description: 'Support Requests will be closed immediately, if you are not 100% certain this is a bug please go to our Reddit, Discord, Forums, or IRC first. Exceptions do not mean you found a bug!'
+description: 'Support Requests will be closed immediately, if you are not 100% certain this is a bug please go to our Reddit, Discord, Forums, or IRC first. Sonarr v2 is EOL & unsupported.'
 labels: ['needs-triage']
 body:
 - type: checkboxes
   attributes:
     label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the bug you encountered.
+    description: Please search to see if an open or closed issue already exists for the bug you encountered. If a bug exists and it is closed as complete it may not yet be in a stable release.
     options:
-    - label: I have searched the existing issues
+    - label: I have searched the existing open and closed issues
       required: true
 - type: textarea
   attributes:
@@ -42,12 +42,14 @@ body:
         - **Docker Install**: Yes
         - **Using Reverse Proxy**: No
         - **Browser**: Firefox 90 (If UI related)
+        - **Database**: Sqlite 3.41.2
     value: |
         - OS: 
-        - Sonarr:
-        - Docker Install:
-        - Using Reverse Proxy:
-        - Browser:
+        - Sonarr: 
+        - Docker Install: 
+        - Using Reverse Proxy: 
+        - Browser: 
+        - Database: 
     render: markdown
   validations:
     required: true
@@ -74,9 +76,6 @@ body:
     label: Anything else?
     description: |
       Links? Screenshots? References? Anything that will give us more context about the issue you are encountering!
-      ***Generally speaking, all bug reports must have trace logs provided.***
-
       Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
   validations:
-    required: true
-    required: true
+    required: false

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -5,9 +5,9 @@ body:
 - type: checkboxes
   attributes:
     label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the feature you are requesting.
+    description: Please search to see if an open or closed issue already exists for the feature you are requesting. If a feature request exists and it is closed as complete it may not yet be in a stable release.
     options:
-    - label: I have searched the existing issues
+    - label: I have searched the existing open and closed issues
       required: true
 - type: textarea
   attributes:
@@ -32,7 +32,6 @@ body:
     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
+    required: false

.github/SUPPORT.md

@@ -1,7 +0,0 @@
-## Support
-
-There are a number of frequently asked questions that have been answered in our [FAQ](https://wiki.servarr.com/sonarr/faq)
-
-The [wiki](https://wiki.servarr.com/sonarr) contains other information and guides
-
-Please use one of the support channels: [forums](https://forums.sonarr.tv/), [subreddit](https://www.reddit.com/r/sonarr/), [discord ](https://discord.gg/M6BvZn5), or [IRC](https://web.libera.chat/?channels=#sonarr)for support/questions.

.github/labeler.yml

@@ -0,0 +1,17 @@
+'connection':
+  - src/NzbDrone.Core/Notifications/**/*
+
+'db-migration':
+  - src/NzbDrone.Core/Datastore/Migration/*
+
+'download-client':
+  - src/NzbDrone.Core/Download/Clients/**/*
+
+'indexer':
+  - src/NzbDrone.Core/Indexers/**/*
+
+'parsing':
+  - src/NzbDrone.Core/Parser/**/*
+
+'ui-only':
+  - all: ['frontend/**/*']

.github/workflows/api_docs.yml

@@ -0,0 +1,58 @@
+name: 'API Docs'
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 1'
+  push:
+    branches:
+      - develop
+    paths:
+      - ".github/workflows/api_docs.yml"
+      - "docs.sh"
+      - "src/Sonarr.Api.*/**"
+      - "src/Sonarr.Http/**"
+      - "src/**/*.csproj"
+      - "src/*"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  api_docs:
+    runs-on: ubuntu-latest
+    if: github.repository == 'Sonarr/Sonarr'
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        id: setup-dotnet
+        with:
+          dotnet-version: '6.0.x'
+
+      - name: Create temporary global.json
+        run: |
+          echo '{"sdk":{"version": "${{ steps.setup-dotnet.outputs.dotnet-version }}" } }' > ./global.json
+
+      - name: Create openapi.json
+        run: ./docs.sh Linux
+
+      - name: Commit API Docs Change
+        continue-on-error: true
+        run: |
+          git config --global user.email "development@sonarr.tv"
+          git config --global user.name "Sonarr"
+          git checkout -b api-docs
+          git add src
+          if git status | grep -q modified
+          then
+            git commit -am 'Automated API Docs update' -m "ignore-downstream"
+            git push -f --set-upstream origin api-docs
+            curl -X POST -H "Authorization: Bearer ${{ secrets.OPENAPI_PAT }}" -H "Accept: application/vnd.github+json" https://api.github.com/repos/sonarr/sonarr/pulls -d '{"head":"api-docs","base":"develop","title":"Update API docs"}'
+          else
+            echo "No changes since last run"
+          fi

.github/workflows/labeler.yml

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

.gitignore

@@ -84,7 +84,6 @@ TestResults
 [Tt]est[Rr]esult*
 *.Cache
 ClientBin
-[Ss]tyle[Cc]op.*
 ~$*
 *.dbmdl
 Generated_Code #added for RIA/Silverlight projects
@@ -117,28 +116,48 @@ src/UI/.idea/*
 *log.txt
 node_modules/
 _output*
+_artifacts
 _rawPackage/
 _dotTrace*
 _tests*
 _publish*
 _temp*
 *.Result.xml
+coverage*.xml
+coverage*.json
 setup/Output/
 *.~is
 
-UI/
-
 #VS outout folders
 bin
 obj
 output/*
 
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+# Packages
+Sonarr_*/
+Sonarr_*.zip
+Sonarr_*.gz
+gecko.zip
+geckodriver.exe
 
 #OS X metadata files
 ._*
 .DS_Store
 
 _start
+_temp_*/**/*
+
+# Windows thumbnail cache files
+Thumbs.db
 
 src/.idea/
 /distribution/windows/setup/output/*
+
+# API doc generation
+.config/

README.md

@@ -1,5 +1,10 @@
 # <img width="24px" src="./Logo/256.png" alt="Sonarr"></img> Sonarr 
 
+[![Translated](https://translate.servarr.com/widgets/servarr/-/sonarr/svg-badge.svg)](https://translate.servarr.com/engage/servarr/)
+[![Backers on Open Collective](https://opencollective.com/Sonarr/backers/badge.svg)](#backers)
+[![Sponsors on Open Collective](https://opencollective.com/Sonarr/sponsors/badge.svg)](#sponsors)
+[![Mega Sponsors on Open Collective](https://opencollective.com/Sonarr/megasponsors/badge.svg)](#mega-sponsors)
+
 Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
 
 ## Getting Started
@@ -7,10 +12,11 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee
 - [Download/Installation](https://sonarr.tv/#downloads-v3)
 - [FAQ](https://wiki.servarr.com/sonarr/faq)
 - [Wiki](https://wiki.servarr.com/Sonarr)
-- [(WIP) API Documentation](https://github.com/Sonarr/Sonarr/wiki/API)
+- [v4 Beta API Documentation](https://sonarr.tv/docs/api)
 - [Donate](https://sonarr.tv/donate)
 
 ## Support
+
 Note: GitHub Issues are for Bugs and Feature Requests Only
 
 - [Forums](https://forums.sonarr.tv/)
@@ -20,8 +26,6 @@ Note: GitHub Issues are for Bugs and Feature Requests Only
 - [Reddit](https://www.reddit.com/r/sonarr)
 - [Wiki](https://wiki.servarr.com/sonarr)
 
-
-
 ## Features
 
 ### Current Features
@@ -41,6 +45,7 @@ Note: GitHub Issues are for Bugs and Feature Requests Only
 ## Contributing
 
 ### Development
+
 This project exists thanks to all the people who contribute. [Contribute](CONTRIBUTING.md).
 
 <a href="https://github.com/Sonarr/Sonarr/graphs/contributors"><img src="https://opencollective.com/Sonarr/contributors.svg?width=890&button=false" /></a>
@@ -73,4 +78,4 @@ Thank you to [<img src="/Logo/Jetbrains/jetbrains.svg" alt="JetBrains" width="32
 ### Licenses
 
 - [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)	
-- Copyright 2010-2021
+- Copyright 2010-2023

SECURITY.md

@@ -0,0 +1,9 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report (suspected) security vulnerabilities on Discord (preferred) to
+either markus101
+#2148 or Taloth#7357 or via email: security@sonarr.tv. You will receive a response from
+us within 72 hours. If the issue is confirmed, we will release a patch as soon
+as possible depending on complexity/severity.

build.sh

@@ -1,125 +1,60 @@
-#! /bin/bash
-msBuildVersion='15.0'
-outputFolder='./_output'
-outputFolderWindows='./_output_windows'
-outputFolderLinux='./_output_linux'
-outputFolderMacOS='./_output_macos'
-outputFolderMacOSApp='./_output_macos_app'
-testPackageFolder='./_tests'
-testPackageFolderWindows='./_tests_windows'
-testPackageFolderLinux='./_tests_linux'
-sourceFolder='./src'
-slnFile=$sourceFolder/Sonarr.sln
-updateSubFolder=Sonarr.Update
+#! /usr/bin/env bash
+set -e
 
-sqlitePackageDir="$HOME/.nuget/packages/system.data.sqlite.core.servarr/1.0.115.5-18"
-
-nuget='tools/nuget/nuget.exe';
-vswhere='tools/vswhere/vswhere.exe';
-macho='tools/macho/MachOConverter.exe';
-
-. ./version.sh
-
-CheckExitCode()
-{
-    "$@"
-    local status=$?
-    if [ $status -ne 0 ]; then
-        echo "error with $1" >&2
-        exit 1
-    fi
-    return $status
-}
+outputFolder='_output'
+testPackageFolder='_tests'
+artifactsFolder="_artifacts";
 
 ProgressStart()
 {
     echo "##teamcity[blockOpened name='$1']"
     echo "##teamcity[progressStart '$1']"
+    echo "Start '$1'"
 }
 
 ProgressEnd()
 {
+    echo "Finish '$1'"
     echo "##teamcity[progressFinish '$1']"
     echo "##teamcity[blockClosed name='$1']"
 }
 
 UpdateVersionNumber()
 {
-    if [ "$BUILD_NUMBER" != "" ]; then
-        echo "Updating Version Info"
-        verMajorMinorRevision=`echo "$buildVersion" | cut -d. -f1,2,3`
-        verBuild=`echo "${BUILD_NUMBER}" | cut -d. -f4`
-        BUILD_NUMBER=$verMajorMinorRevision.$verBuild
-        echo "##teamcity[buildNumber '$BUILD_NUMBER']"
-        sed -i "s/<AssemblyVersion>[0-9.*]\+<\/AssemblyVersion>/<AssemblyVersion>$BUILD_NUMBER<\/AssemblyVersion>/g" ./src/Directory.Build.props
-        sed -i "s/<AssemblyConfiguration>[\$()A-Za-z-]\+<\/AssemblyConfiguration>/<AssemblyConfiguration>${BRANCH:-dev}<\/AssemblyConfiguration>/g" ./src/Directory.Build.props
+    if [ "$SONARR_VERSION" != "" ]; then
+        echo "Updating version info to: $SONARR_VERSION"
+        sed -i'' -e "s/<AssemblyVersion>[0-9.*]\+<\/AssemblyVersion>/<AssemblyVersion>$SONARR_VERSION<\/AssemblyVersion>/g" src/Directory.Build.props
+        sed -i'' -e "s/<AssemblyConfiguration>[\$()A-Za-z-]\+<\/AssemblyConfiguration>/<AssemblyConfiguration>${BRANCH}<\/AssemblyConfiguration>/g" src/Directory.Build.props
+        sed -i'' -e "s/<string>10.0.0.0<\/string>/<string>$SONARR_VERSION<\/string>/g" distribution/macOS/Sonarr.app/Contents/Info.plist
     fi
 }
 
-CreateReleaseInfo()
+EnableExtraPlatformsInSDK()
 {
-    if [ "$BUILD_NUMBER" != "" ]; then
-        echo "Create Release Info"
-        echo -e "# Do Not Edit\nReleaseVersion=$BUILD_NUMBER\nBranch=${BRANCH:-dev}" > $outputFolder/release_info
+    BUNDLEDVERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
+    if grep -q freebsd-x64 "$BUNDLEDVERSIONS"; then
+        echo "Extra platforms already enabled"
+    else
+        echo "Enabling extra platform support"
+        sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64/' "$BUNDLEDVERSIONS"
     fi
 }
 
-CleanFolder()
+EnableExtraPlatforms()
 {
-    local path=$1
-    local keepConfigFiles=$2
-
-    find $path -name "*.transform" -exec rm "{}" \;
-
-    if [ $keepConfigFiles != true ] ; then
-        find $path -name "*.dll.config" -exec rm "{}" \;
+    if grep -qv freebsd-x64 src/Directory.Build.props; then
+        sed -i'' -e "s^<RuntimeIdentifiers>\(.*\)</RuntimeIdentifiers>^<RuntimeIdentifiers>\1;freebsd-x64</RuntimeIdentifiers>^g" src/Directory.Build.props
     fi
-
-    echo "Removing FluentValidation.Resources files"
-    find $path -name "FluentValidation.resources.dll" -exec rm "{}" \;
-    find $path -name "App.config" -exec rm "{}" \;
-
-    echo "Removing vshost files"
-    find $path -name "*.vshost.exe" -exec rm "{}" \;
-
-    echo "Removing dylib files"
-    find $path -name "*.dylib" -exec rm "{}" \;
-
-    echo "Removing Empty folders"
-    find $path -depth -empty -type d -exec rm -r "{}" \;
-}
-
-BuildWithMSBuild()
-{
-    msBuildPath=`$vswhere -latest -products \* -requires Microsoft.Component.MSBuild -find MSBuild\\\\\*\*\\\\Bin\\\\MSBuild.exe`
-    msBuildPath=${msBuildPath/C:\\/\/c\/}
-    msBuildPath=${msBuildPath//\\/\/}
-    msBuildDir=$(dirname "$msBuildPath")
-
-    echo $msBuildDir
-
-    export PATH=$msBuildDir:$PATH
-    CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Clean //m
-    $nuget restore $slnFile
-    CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Build //m //p:AllowedReferenceRelatedFileExtensions=.pdb
-}
-
-BuildWithXbuild()
-{
-    export MONO_IOMAP=case
-    CheckExitCode msbuild /t:Clean $slnFile
-    mono $nuget restore $slnFile
-    CheckExitCode msbuild /p:Configuration=Release /p:Platform=x86 /t:Build /p:AllowedReferenceRelatedFileExtensions=.pdb $slnFile
 }
 
 LintUI()
 {
     ProgressStart 'ESLint'
-    CheckExitCode yarn lint
+    yarn lint
     ProgressEnd 'ESLint'
 
     ProgressStart 'Stylelint'
-    CheckExitCode yarn stylelint
+    yarn stylelint
     ProgressEnd 'Stylelint'
 }
 
@@ -130,348 +65,392 @@ Build()
     rm -rf $outputFolder
     rm -rf $testPackageFolder
 
-    if [ $runtime = "dotnet" ] ; then
-        BuildWithMSBuild
+    slnFile=src/Sonarr.sln
+
+    if [ $os = "windows" ]; then
+        platform=Windows
     else
-        BuildWithXbuild
+        platform=Posix
     fi
 
-    CleanFolder $outputFolder false
+    dotnet clean $slnFile -c Debug
+    dotnet clean $slnFile -c Release
 
-    echo "Removing Sonarr.Update/sqlite3.dll"
-    rm $outputFolder/Sonarr.Update/sqlite3.dll
-
-    echo "Removing Mono.Posix.dll"
-    rm $outputFolder/Mono.Posix.dll
+    if [[ -z "$RID" || -z "$FRAMEWORK" ]];
+    then
+        dotnet msbuild -restore $slnFile -p:Configuration=Release -p:Platform=$platform -t:PublishAllRids
+    else
+        dotnet msbuild -restore $slnFile -p:Configuration=Release -p:Platform=$platform -p:RuntimeIdentifiers=$RID -t:PublishAllRids
+    fi
 
     ProgressEnd 'Build'
 }
 
-RunWebpack()
+YarnInstall()
 {
     ProgressStart 'yarn install'
-    yarn install
+    yarn install --frozen-lockfile --network-timeout 120000
     ProgressEnd 'yarn install'
+}
 
-    LintUI
-
+RunWebpack()
+{
     ProgressStart 'Running webpack'
-    CheckExitCode yarn run build --env production
+    yarn run build --env production
     ProgressEnd 'Running webpack'
 }
 
-CreateMdbs()
+PackageFiles()
 {
-    local path=$1
-    if [ $runtime = "dotnet" ] ; then
-        local pdbFiles=( $(find $path -name "*.pdb") )
-        for filename in "${pdbFiles[@]}"
-        do
-          if [ -e ${filename%.pdb}.dll ]  ; then
-            tools/pdb2mdb/pdb2mdb.exe ${filename%.pdb}.dll
-          fi
-          if [ -e ${filename%.pdb}.exe ]  ; then
-            tools/pdb2mdb/pdb2mdb.exe ${filename%.pdb}.exe
-          fi
-        done
+    local folder="$1"
+    local framework="$2"
+    local runtime="$3"
+
+    rm -rf $folder
+    mkdir -p $folder
+    cp -r $outputFolder/$framework/$runtime/publish/* $folder
+    cp -r $outputFolder/Sonarr.Update/$framework/$runtime/publish $folder/Sonarr.Update
+    
+    if [ "$FRONTEND" = "YES" ];
+    then
+        cp -r $outputFolder/UI $folder
     fi
+
+    echo "Adding LICENSE"
+    cp LICENSE.md $folder
 }
 
-PatchMono()
+PackageLinux()
 {
-    local path=$1
+    local framework="$1"
+    local runtime="$2"
 
-    # Below we deal with some mono incompatibilities with windows-only dotnet core/standard libs    
-    # See: https://github.com/mono/mono/blob/master/tools/nuget-hash-extractor/download.sh
-    # That list defines assemblies that are prohibited from being loaded from the appdir, instead loading from mono GAC.
+    ProgressStart "Creating $runtime Package for $framework"
 
-    # We have debian dependencies to get these installed or facades from mono 5.10+
-    for assembly in System.IO.Compression System.Runtime.InteropServices.RuntimeInformation System.Net.Http System.Globalization.Extensions System.Text.Encoding.CodePages System.Threading.Overlapped
-    do
-        if [ -e $path/$assembly.dll ]; then
-            if [ -e $sourceFolder/Libraries/Mono/$assembly.dll ]; then
-                echo "Copy Mono-specific facade $assembly.dll (uses win32 interop)"
-                cp $sourceFolder/Libraries/Mono/$assembly.dll $path/$assembly.dll
-            else
-                echo "Remove $assembly.dll (uses win32 interop)"
-                rm $path/$assembly.dll
-            fi
-            
-        fi
-    done
+    local folder=$artifactsFolder/$runtime/$framework/Sonarr
 
-    # Copy more stable version of Vectors for mono <5.12
-    if [ -e $path/System.Numerics.Vectors.dll ]; then
-        packageDir="$HOME/.nuget/packages/system.numerics.vectors/4.5.0"
-
-        if [ ! -d "$HOME/.nuget/packages/system.numerics.vectors/4.5.0" ]; then
-            # May reside in the NuGetFallback folder, which is harder to find
-            # Download somewhere to get the real cache populated
-            if [ $runtime = "dotnet" ] ; then
-                $nuget install System.Numerics.Vectors -Version 4.5.0 -Output ./_temp/System.Numerics.Vectors
-            else
-                mono $nuget install System.Numerics.Vectors -Version 4.5.0 -Output ./_temp/System.Numerics.Vectors
-            fi
-            rm -rf ./_temp/System.Numerics.Vectors
-        fi
-        # Copy the netstandard2.0 version rather than net46
-        cp "$packageDir/lib/netstandard2.0/System.Numerics.Vectors.dll" $path/
-    fi
-}
-
-PackageMono()
-{
-    ProgressStart 'Creating Mono Package'
-
-    rm -rf $outputFolderLinux
-
-    echo "Copying Binaries"
-    cp -r $outputFolder $outputFolderLinux
-
-    echo "Creating MDBs"
-    CreateMdbs $outputFolderLinux
-
-    echo "Removing PDBs"
-    find $outputFolderLinux -name "*.pdb" -exec rm "{}" \;
+    PackageFiles "$folder" "$framework" "$runtime"
 
     echo "Removing Service helpers"
-    rm -f $outputFolderLinux/ServiceUninstall.*
-    rm -f $outputFolderLinux/ServiceInstall.*
-
-    echo "Removing native windows binaries Sqlite, MediaInfo"
-    rm -f $outputFolderLinux/sqlite3.*
-    rm -f $outputFolderLinux/Sonarr.Update/sqlite3.*
-    rm -f $outputFolderLinux/MediaInfo.*
-
-    PatchMono $outputFolderLinux
-
-    echo "Adding Sonarr.Core.dll.config (for dllmap)"
-    cp $sourceFolder/NzbDrone.Core/Sonarr.Core.dll.config $outputFolderLinux
-
-    # Remove Http binding redirect by renaming it
-    # We don't need this anymore once our minimum mono version is 5.10
-    sed -i "s/System.Net.Http/System.Net.Http.Mono/g" $outputFolderLinux/Sonarr.Console.exe.config
-
-    echo "Renaming Sonarr.Console.exe to Sonarr.exe"
-    rm $outputFolderLinux/Sonarr.exe*
-    for file in $outputFolderLinux/Sonarr.Console.exe*; do
-        mv "$file" "${file//.Console/}"
-    done
+    rm -f $folder/ServiceUninstall.*
+    rm -f $folder/ServiceInstall.*
 
     echo "Removing Sonarr.Windows"
-    rm $outputFolderLinux/Sonarr.Windows.*
+    rm $folder/Sonarr.Windows.*
 
     echo "Adding Sonarr.Mono to UpdatePackage"
-    cp $outputFolderLinux/Sonarr.Mono.* $outputFolderLinux/$updateSubFolder/
+    cp $folder/Sonarr.Mono.* $folder/Sonarr.Update
+    if [ "$framework" = "net6.0" ]; then
+        cp $folder/Mono.Posix.NETStandard.* $folder/Sonarr.Update
+        cp $folder/libMonoPosixHelper.* $folder/Sonarr.Update
+    fi
 
-    ProgressEnd 'Creating Mono Package'
+    ProgressEnd "Creating $runtime Package for $framework"
 }
 
 PackageMacOS()
 {
-    ProgressStart 'Creating MacOS Package'
+    local framework="$1"
+    local runtime="$2"
 
-    rm -rf $outputFolderMacOS
-    mkdir $outputFolderMacOS
-    
-    echo "Copying Binaries"
-    cp -r $outputFolderLinux/* $outputFolderMacOS
+    ProgressStart "Creating $runtime Package for $framework"
 
-    echo "Adding Sonarr Launcher"
-    cp ./distribution/osx/Launcher/dist/Launcher $outputFolderMacOS/
-    mv $outputFolderMacOS/Sonarr.exe $outputFolderMacOS/Sonarr.exe.bak
-    mv $outputFolderMacOS/Launcher $outputFolderMacOS/Sonarr
-    mv $outputFolderMacOS/Sonarr.exe.bak $outputFolderMacOS/Sonarr.exe
-    chmod +x $outputFolderMacOS/Sonarr
+    local folder=$artifactsFolder/$runtime/$framework/Sonarr
 
-    echo "Adding Sonarr.Update Launcher"
-    CheckExitCode cp ./distribution/osx/Launcher/dist/Launcher $outputFolderMacOS/Sonarr.Update/
-    CheckExitCode mv $outputFolderMacOS/Sonarr.Update/Sonarr.Update.exe $outputFolderMacOS/Sonarr.Update/Sonarr.Update.exe.bak
-    CheckExitCode mv $outputFolderMacOS/Sonarr.Update/Launcher $outputFolderMacOS/Sonarr.Update/Sonarr.Update
-    CheckExitCode mv $outputFolderMacOS/Sonarr.Update/Sonarr.Update.exe.bak $outputFolderMacOS/Sonarr.Update/Sonarr.Update.exe
-    chmod +x $outputFolderMacOS/Sonarr.Update/Sonarr.Update
+    PackageFiles "$folder" "$framework" "$runtime"
 
-    echo "Adding sqlite dylib"
-    CheckExitCode cp "$sqlitePackageDir/runtimes/osx-x64/native/net46"/*.config $outputFolderMacOS/
-    if [ $runtime = "dotnet" ] ; then
-        CheckExitCode $macho merge $outputFolderMacOS "$sqlitePackageDir/runtimes/osx-x64/native/net46"/*.dylib "$sqlitePackageDir/runtimes/osx-arm64/native/net46"/*.dylib
-    else
-        CheckExitCode mono $macho merge $outputFolderMacOS "$sqlitePackageDir/runtimes/osx-x64/native/net46"/*.dylib "$sqlitePackageDir/runtimes/osx-arm64/native/net46"/*.dylib
+    echo "Removing Service helpers"
+    rm -f $folder/ServiceUninstall.*
+    rm -f $folder/ServiceInstall.*
+
+    echo "Removing Sonarr.Windows"
+    rm $folder/Sonarr.Windows.*
+
+    echo "Adding Sonarr.Mono to UpdatePackage"
+    cp $folder/Sonarr.Mono.* $folder/Sonarr.Update
+    if [ "$framework" = "net6.0" ]; then
+        cp $folder/Mono.Posix.NETStandard.* $folder/Sonarr.Update
+        cp $folder/libMonoPosixHelper.* $folder/Sonarr.Update
     fi
 
-    echo "Adding MediaInfo dylib"
-    CheckExitCode cp $sourceFolder/Libraries/MediaInfo/x64/*.dylib $outputFolderMacOS/
-
-    ProgressEnd 'Creating MacOS Package'
+    ProgressEnd "Creating $runtime Package for $framework"
 }
 
 PackageMacOSApp()
 {
-    ProgressStart 'Creating macOS App Package'
+    local framework="$1"
+    local runtime="$2"
 
-    outputFolderMacOSAppBase=$outputFolderMacOSApp/Sonarr.app/Contents/MacOS
-    outputFolderMacOSAppBin=$outputFolderMacOSAppBase/bin
+    ProgressStart "Creating $runtime App Package for $framework"
 
-    rm -rf $outputFolderMacOSApp
-    mkdir $outputFolderMacOSApp
-    cp -r ./distribution/osx/Sonarr.app $outputFolderMacOSApp
-    mkdir -p $outputFolderMacOSAppBase
+    local folder=$artifactsFolder/$runtime-app/$framework
 
-    echo "Adding Sonarr Launcher"
-    CheckExitCode cp ./distribution/osx/Launcher/dist/Launcher $outputFolderMacOSAppBase/
-    CheckExitCode mv $outputFolderMacOSAppBase/Launcher $outputFolderMacOSAppBase/Sonarr
-    chmod +x $outputFolderMacOSAppBase/Sonarr
+    rm -rf $folder
+    mkdir -p $folder
+    cp -r distribution/macOS/Sonarr.app $folder
+    mkdir -p $folder/Sonarr.app/Contents/MacOS
 
     echo "Copying Binaries"
-    mkdir -p $outputFolderMacOSAppBin
-    CheckExitCode cp -r $outputFolderLinux/* $outputFolderMacOSAppBin
-
-    echo "Adding sqlite dylib"
-    if [ $runtime = "dotnet" ] ; then
-        CheckExitCode $macho merge $outputFolderMacOSAppBin "$sqlitePackageDir/runtimes/osx-x64/native/net46" "$sqlitePackageDir/runtimes/osx-arm64/native/net46"
-    else
-        CheckExitCode mono $macho merge $outputFolderMacOSAppBin "$sqlitePackageDir/runtimes/osx-x64/native/net46" "$sqlitePackageDir/runtimes/osx-arm64/native/net46"
-    fi
-
-
-    echo "Adding MediaInfo dylib"
-    CheckExitCode cp $sourceFolder/Libraries/MediaInfo/x64/*.dylib $outputFolderMacOSAppBin/
+    cp -r $artifactsFolder/$runtime/$framework/Sonarr/* $folder/Sonarr.app/Contents/MacOS
 
     echo "Removing Update Folder"
-    rm -r $outputFolderMacOSAppBin/Sonarr.Update
-    echo "# Do Not Edit\nPackageVersion=${BUILD_NUMBER}\nPackageAuthor=[Team Sonarr](https://sonarr.tv)\nReleaseVersion=${BUILD_NUMBER}\nUpdateMethod=$PackageUpdater\nBranch=${Branch:-master}" > $outputFolderMacOSAppBase/package_info
+    rm -r $folder/Sonarr.app/Contents/MacOS/Sonarr.Update
 
-    ProgressEnd 'Creating macOS App Package'
-}
-
-PackageTestsMono()
-{
-    ProgressStart 'Creating Mono Test Package'
-
-    rm -rf $testPackageFolderLinux
-
-    echo "Copying Binaries"
-    cp -r $testPackageFolder $testPackageFolderLinux
-
-    if [ $runtime = "dotnet" ] ; then
-        $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolderLinux
-    else
-        mono $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolderLinux
-    fi
-
-    echo "Creating MDBs"
-    CreateMdbs $testPackageFolderLinux
-
-    echo "Removing PDBs"
-    find $testPackageFolderLinux -name "*.pdb" -exec rm "{}" \;
-
-    PatchMono $testPackageFolderLinux
-
-    echo "Adding Sonarr.Core.dll.config (for dllmap)"
-    cp $sourceFolder/NzbDrone.Core/Sonarr.Core.dll.config $testPackageFolderLinux
-
-    # Remove Http binding redirect by renaming it
-    # We don't need this anymore once our minimum mono version is 5.10
-    sed -i "s/System.Net.Http/System.Net.Http.Mono/g" $testPackageFolderLinux/Sonarr.Common.Test.dll.config
-
-    cp ./test.sh $testPackageFolderLinux/
-    dos2unix $testPackageFolderLinux/test.sh
-
-    echo "Removing Sonarr.Windows"
-    rm $testPackageFolderLinux/Sonarr.Windows.*
-
-    rm -f $testPackageFolderLinux/*.log.config
-
-    CleanFolder $testPackageFolderLinux true
-
-    ProgressEnd 'Creating Linux Test Package'
-}
-
-PackageTestsWindows()
-{
-    ProgressStart 'Creating Windows Test Package'
-
-    rm -rf $testPackageFolderWindows
-
-    echo "Copying Binaries"
-    cp -r $testPackageFolder $testPackageFolderWindows
-
-    if [ $runtime = "dotnet" ] ; then
-        $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolderWindows
-    else
-        mono $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolderWindows
-    fi
-
-    cp ./test.sh $testPackageFolderWindows
-
-    echo "Removing Sonarr.Mono"
-    rm -f $testPackageFolderWindows/Sonarr.Mono.*
-
-    rm -f $testPackageFolderWindows/*.log.config
-
-    CleanFolder $testPackageFolderWindows true
-
-    ProgressEnd 'Creating Windows Test Package'
+    ProgressEnd "Creating $runtime App Package for $framework"
 }
 
 PackageWindows()
 {
-    ProgressStart 'Creating Windows Package'
+    local framework="$1"
+    local runtime="$2"
 
-    rm -rf $outputFolderWindows
-    
-    echo "Copying Binaries"
-    cp -r $outputFolder $outputFolderWindows
+    ProgressStart "Creating Windows Package for $framework"
+
+    local folder=$artifactsFolder/$runtime/$framework/Sonarr
+
+    PackageFiles "$folder" "$framework" "$runtime"
+    cp -r $outputFolder/$framework-windows/$runtime/publish/* $folder
 
     echo "Removing Sonarr.Mono"
-    rm -f $outputFolderWindows/Sonarr.Mono.*
+    rm -f $folder/Sonarr.Mono.*
+    rm -f $folder/Mono.Posix.NETStandard.*
+    rm -f $folder/libMonoPosixHelper.*
 
     echo "Adding Sonarr.Windows to UpdatePackage"
-    cp $outputFolderWindows/Sonarr.Windows.* $outputFolderWindows/$updateSubFolder/
+    cp $folder/Sonarr.Windows.* $folder/Sonarr.Update
 
-    ProgressEnd 'Creating Windows Package'
+    ProgressEnd "Creating Windows Package for $framework"
 }
 
-PublishArtifacts()
+Package()
 {
-    ProgressStart 'Publishing Artifacts'
+    local framework="$1"
+    local runtime="$2"
+    local SPLIT
+
+    IFS='-' read -ra SPLIT <<< "$runtime"
+
+    case "${SPLIT[0]}" in
+        linux|freebsd*)
+            PackageLinux "$framework" "$runtime"
+            ;;
+        win)
+            PackageWindows "$framework" "$runtime"
+            ;;
+        osx)
+            PackageMacOS "$framework" "$runtime"
+            ;;
+    esac
+}
+
+PackageTests()
+{
+    local framework="$1"
+    local runtime="$2"
+
+    ProgressStart "Creating $runtime Test Package for $framework"
+
+    cp test.sh "$testPackageFolder/$framework/$runtime/publish"
+
+    rm -f $testPackageFolder/$framework/$runtime/*.log.config
+
+    ProgressEnd "Creating $runtime Test Package for $framework"
+}
+
+UploadTestArtifacts()
+{
+    local framework="$1"
+
+    ProgressStart 'Publishing Test Artifacts'
 
     # Tests
-    echo "##teamcity[publishArtifacts '$testPackageFolderWindows/** => tests.windows.zip']"
-    echo "##teamcity[publishArtifacts '$testPackageFolderLinux/** => tests.linux.zip']"
+    for dir in $testPackageFolder/$framework/*
+    do
+        local runtime=$(basename "$dir")
+        echo "##teamcity[publishArtifacts '$testPackageFolder/$framework/$runtime/publish/** => tests.$runtime.zip']"
+    done
+
+    ProgressEnd 'Publishing Test Artifacts'
+}
+
+UploadArtifacts()
+{
+    local framework="$1"
+
+    ProgressStart 'Publishing Artifacts'
 
     # Releases
-    echo "##teamcity[publishArtifacts '$outputFolderWindows/** => Sonarr.$BRANCH.$BUILD_NUMBER.windows.zip!Sonarr']"
-    echo "##teamcity[publishArtifacts '$outputFolderLinux/** => Sonarr.$BRANCH.$BUILD_NUMBER.linux.tar.gz!Sonarr']"
-    echo "##teamcity[publishArtifacts '$outputFolderMacOS/** => Sonarr.$BRANCH.$BUILD_NUMBER.macos.tar.gz!Sonarr']"
-    echo "##teamcity[publishArtifacts '$outputFolderMacOSApp/** => Sonarr.$BRANCH.$BUILD_NUMBER.macos.zip']"
-    
-    # Debian Package
+    for dir in $artifactsFolder/*
+    do
+        local runtime=$(basename "$dir")
+
+        echo "##teamcity[publishArtifacts '$artifactsFolder/$runtime/$framework/** => Sonarr.$BRANCH.$SONARR_VERSION.$runtime.zip']"
+    done
+
+    # Debian Package / Windows installer / macOS app
     echo "##teamcity[publishArtifacts 'distribution/** => distribution.zip']"
-    
+
     ProgressEnd 'Publishing Artifacts'
 }
 
+UploadUIArtifacts()
+{
+    local framework="$1"
+
+    ProgressStart 'Publishing UI Artifacts'
+
+    # UI folder
+    echo "##teamcity[publishArtifacts '$outputFolder/UI/** => UI.zip']"
+
+    ProgressEnd 'Publishing UI Artifacts'
+}
+
 # Use mono or .net depending on OS
 case "$(uname -s)" in
     CYGWIN*|MINGW32*|MINGW64*|MSYS*)
         # on windows, use dotnet
-        runtime="dotnet"
+        os="windows"
         ;;
     *)
         # otherwise use mono
-        runtime="mono"
+        os="posix"
         ;;
 esac
 
-UpdateVersionNumber
-Build
-CreateReleaseInfo
-RunWebpack
-PackageMono
-PackageMacOS
-PackageMacOSApp
-PackageTestsMono
-PackageTestsWindows
-PackageWindows
-PublishArtifacts
+POSITIONAL=()
+
+if [ $# -eq 0 ]; then
+    echo "No arguments provided, building everything"
+    BACKEND=YES
+    FRONTEND=YES
+    PACKAGES=YES
+    LINT=YES
+    ENABLE_EXTRA_PLATFORMS=NO
+    ENABLE_EXTRA_PLATFORMS_IN_SDK=NO
+fi
+
+while [[ $# -gt 0 ]]
+do
+key="$1"
+
+case $key in
+    --backend)
+        BACKEND=YES
+        shift # past argument
+        ;;
+    --enable-bsd|--enable-extra-platforms)
+        ENABLE_EXTRA_PLATFORMS=YES
+        shift # past argument
+        ;;
+    --enable-extra-platforms-in-sdk)
+        ENABLE_EXTRA_PLATFORMS_IN_SDK=YES
+        shift # past argument
+        ;;
+    -r|--runtime)
+        RID="$2"
+        shift # past argument
+        shift # past value
+        ;;
+    -f|--framework)
+        FRAMEWORK="$2"
+        shift # past argument
+        shift # past value
+        ;;
+    --frontend)
+        FRONTEND=YES
+        shift # past argument
+        ;;
+    --packages)
+        PACKAGES=YES
+        shift # past argument
+        ;;
+    --lint)
+        LINT=YES
+        shift # past argument
+        ;;
+    --all)
+        BACKEND=YES
+        FRONTEND=YES
+        PACKAGES=YES
+        LINT=YES
+        shift # past argument
+        ;;
+    *)    # unknown option
+        POSITIONAL+=("$1") # save it in an array for later
+        shift # past argument
+        ;;
+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" ];
+    then
+        EnableExtraPlatforms
+    fi
+
+    Build
+
+    if [[ -z "$RID" || -z "$FRAMEWORK" ]];
+    then
+        PackageTests "net6.0" "win-x64"
+        PackageTests "net6.0" "win-x86"
+        PackageTests "net6.0" "linux-x64"
+        PackageTests "net6.0" "linux-musl-x64"
+        PackageTests "net6.0" "osx-x64"
+        if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
+        then
+            PackageTests "net6.0" "freebsd-x64"
+        fi
+    else
+        PackageTests "$FRAMEWORK" "$RID"
+    fi
+
+    UploadTestArtifacts "net6.0"
+fi
+
+if [ "$FRONTEND" = "YES" ];
+then
+    YarnInstall
+
+    if [ "$LINT" = "YES" ];
+    then
+        LintUI
+    fi
+
+    RunWebpack
+    UploadUIArtifacts
+fi
+
+if [ "$PACKAGES" = "YES" ];
+then
+    UpdateVersionNumber
+
+    if [[ -z "$RID" || -z "$FRAMEWORK" ]];
+    then
+        Package "net6.0" "win-x64"
+        Package "net6.0" "win-x86"
+        Package "net6.0" "linux-x64"
+        Package "net6.0" "linux-musl-x64"
+        Package "net6.0" "linux-arm64"
+        Package "net6.0" "linux-musl-arm64"
+        Package "net6.0" "linux-arm"
+        Package "net6.0" "osx-x64"
+        Package "net6.0" "osx-arm64"
+        if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
+        then
+            Package "net6.0" "freebsd-x64"
+        fi
+    else
+        Package "$FRAMEWORK" "$RID"
+    fi
+
+    UploadArtifacts "net6.0"
+fi

distribution/debian.sh

@@ -2,8 +2,8 @@ fromdos ./debian/*
 chmod ugo-x ./debian/*
 cp -r ./debian ./debian_backup
 
-BuildVersion=${dependent_build_number:-3.10.0.999}
-BuildBranch=${dependent_build_branch:-master}
+BuildVersion=${dependent_build_number:-4.10.0.999}
+BuildBranch=${dependent_build_branch:-main}
 BootstrapVersion=`echo "$BuildVersion" | cut -d. -f1,2,3`
 BootstrapUpdater="BuiltIn"
 PackageUpdater="apt"

distribution/debian/control

@@ -5,18 +5,14 @@ Source: sonarr
 Homepage: https://sonarr.tv
 Vcs-Git: git@github.com:Sonarr/Sonarr.git
 Vcs-Browser: https://github.com/Sonarr/Sonarr
-Build-Depends:  debhelper (>= 9),
-                dh-systemd (>= 1.5),
-                mono-devel (>= 5.18),
-                libmono-cil-dev (>= 5.18),
-                cli-common-dev (>= 0.9+xamarin5)
+Build-Depends: debhelper (>= 9),
+  dh-systemd (>= 1.5)
 
 Package: sonarr
 Architecture: all
 Provides: nzbdrone
 Conflicts: nzbdrone
 Replaces: nzbdrone
-Depends: adduser, libsqlite3-0 (>= 3.7), libmediainfo0v5 (>= 0.7.52) | libmediainfo0 (>= 0.7.52), mono-runtime (>= 5.18), ca-certificates-mono, libmono-system-net-http4.0-cil (>= 4.0.0~alpha1), ${cli:Depends}, ${misc:Depends}
-Recommends: libmediainfo0v5 (>= 18.03) | libmediainfo0 (>= 18.03)
-Suggests: sqlite3 (>= 3.7), mediainfo (>= 0.7.52)
+Depends: adduser, libsqlite3-0 (>= 3.7), ${cli:Depends}, ${misc:Depends}
+Suggests: sqlite3 (>= 3.7)
 Description: Internet PVR

distribution/debian/rules

@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-EXCLUDE_MODULEREFS = crypt32 httpapi __Internal ole32.dll libmonosgen-2.0
+EXCLUDE_MODULEREFS = crypt32 httpapi __Internal ole32.dll
 
 %:
 	dh $@ --with=systemd --with=cli

distribution/debian/sonarr.clideps-override

@@ -1,3 +1,2 @@
 ignores msbuild
-ignores libmediainfo0v5
 ignores libc6

distribution/debian/sonarr.service

@@ -11,7 +11,7 @@ Group=sonarr
 UMask=002
 
 Type=simple
-ExecStart=/usr/bin/mono --debug /usr/lib/sonarr/bin/Sonarr.exe -nobrowser -data=/var/lib/sonarr
+ExecStart=/usr/lib/sonarr/bin/Sonarr -nobrowser -data=/var/lib/sonarr
 TimeoutStopSec=20
 KillMode=process
 Restart=on-failure

distribution/osx/Launcher/LICENSE.LGPL.md

@@ -1,459 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-			 

distribution/osx/Launcher/README.md

@@ -1,28 +0,0 @@
-Code reused from duplicati, licensed under LGPL 2.1
-Modified for Sonarr by Taloth Saldono
-
-see here for the original source: https://github.com/duplicati/duplicati/tree/679981d29f8a6e445d3c1e6d41e72a673ffaa653/Installer/OSX
-
-License
--------
-
-Sonarr as a whole is licensed under GPL 3.0 as specified in the git repository root.
-
-But to preserve the original intent of the duplicati project, the modified versions of the sources in this folder are dual licensed under LGPL 2.1 and GPL 3.0.
-Note: This exception can be freely removed in any copy of Sonarr sources as per LGPL/GPL licensing terms.
-
-A copy of the LGPL 2.1 license is included in the LICENSE.LGPL.md file.
-
-Purpose
--------
-
-The Launcher is a bootstrap/shim application that checks if the appropriate version of mono is installed and subsequently use it to execute Sonarr.
-By using a separate application, instead of a shell script, this allows the user to assign certain operating system permissions to Sonarr specifically.
-
-Compiling the Launcher
-----------------------
-
-You need an OSX installation with xcode
-Then run compile.sh in a terminal
-
-The generated dist/Launcher can be renamed to Sonarr and Sonarr.Update to serve as shims to run Sonarr.exe and Sonarr.Update.exe respectively.

distribution/osx/Launcher/src/Launcher.m

@@ -1,32 +0,0 @@
-#import "run-with-mono.h"
-#import "PFMoveApplication.h"
-
-int const MONO_VERSION_MAJOR = 5;
-int const MONO_VERSION_MINOR = 20;
-
-int main() {
-	@autoreleasepool {
-		// Use our own executable name so the same compiled binary to be used for forks
-		NSString * const FileName = NSProcessInfo.processInfo.arguments[0].lastPathComponent;
-
-		// Sonarr.Update.exe
-		NSString * const ASSEMBLY = [NSString stringWithFormat:@"%@.exe", FileName];
-
-		// Sonarr Update
-		NSString * const APP_NAME = [FileName stringByReplacingOccurrencesOfString:@"." withString:@" "];
-		
-		// -sonarrupdate
-		NSString * const PROCESS_NAME = [NSString stringWithFormat:@"-%@", [FileName stringByReplacingOccurrencesOfString:@"." withString:@""].lowercaseString];
-		
-		@try
-		{
-			PFMoveToApplicationsFolderIfNecessary();
-		}
-		@catch (NSException * ex)
-		{
-			NSLog(@"Translocation/Quarantine check failed, starting normally. Reason: %@", ex.reason);
-		}
-
-		return [RunWithMono runAssemblyWithMono:APP_NAME procnamesuffix:PROCESS_NAME assembly:ASSEMBLY major:MONO_VERSION_MAJOR minor:MONO_VERSION_MINOR];
-	}
-}

distribution/osx/Launcher/src/PFMoveApplication.h

@@ -1,32 +0,0 @@
-//
-//  PFMoveApplication.h, version 1.24
-//  LetsMove
-//
-//  Created by Andy Kim at Potion Factory LLC on 9/17/09
-//
-//  The contents of this file are dedicated to the public domain.
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	
-#import <Foundation/Foundation.h>
-
-/**
- Moves the running application to ~/Applications or /Applications if the former does not exist.
- After the move, it relaunches app from the new location.
- DOES NOT work for sandboxed applications.
- 
- Call from \c NSApplication's delegate method \c -applicationWillFinishLaunching: method. */
-void PFMoveToApplicationsFolderIfNecessary(void);
-
-/**
- Check whether an app move is currently in progress.
- Returns YES if LetsMove is currently in-progress trying to move the app to the Applications folder, or NO otherwise.
- This can be used to work around a crash with apps that terminate after last window is closed.
- See https://github.com/potionfactory/LetsMove/issues/64 for details. */
-BOOL PFMoveIsInProgress(void);
-
-#ifdef __cplusplus
-}
-#endif

distribution/osx/Launcher/src/PFMoveApplication.m

@@ -1,565 +0,0 @@
-//
-//  PFMoveApplication.m, version 1.24
-//  LetsMove
-//
-//  Created by Andy Kim at Potion Factory LLC on 9/17/09
-//
-//  The contents of this file are dedicated to the public domain.
-
-#import "PFMoveApplication.h"
-
-#import <AppKit/AppKit.h>
-#import <Security/Security.h>
-#import <dlfcn.h>
-#import <sys/mount.h>
-
-@interface LetsMove : NSObject
-@end
-
-@implementation LetsMove
-+ (NSBundle *)bundle {
-	return [NSBundle bundleForClass:self];
-}
-@end
-
-// Strings
-// These are macros to be able to use custom i18n tools
-#define _I10NS(nsstr) NSLocalizedStringFromTableInBundle(nsstr, @"MoveApplication", [LetsMove bundle], nil)
-#define kStrMoveApplicationCouldNotMove _I10NS(@"Could not move to Applications folder")
-#define kStrMoveApplicationQuestionTitle  _I10NS(@"Move to Applications folder?")
-#define kStrMoveApplicationQuestionTitleHome _I10NS(@"Move to Applications folder in your Home folder?")
-#define kStrMoveApplicationQuestionMessage _I10NS(@"I can move myself to the Applications folder if you'd like.")
-#define kStrMoveApplicationButtonMove _I10NS(@"Move to Applications Folder")
-#define kStrMoveApplicationButtonDoNotMove _I10NS(@"Do Not Move")
-#define kStrMoveApplicationQuestionInfoWillRequirePasswd _I10NS(@"Note that this will require an administrator password.")
-#define kStrMoveApplicationQuestionInfoInDownloadsFolder _I10NS(@"This will keep your Downloads folder uncluttered.")
-
-// Needs to be defined for compiling under 10.5 SDK
-#ifndef NSAppKitVersionNumber10_5
-	#define NSAppKitVersionNumber10_5 949
-#endif
-
-// By default, we use a small control/font for the suppression button.
-// If you prefer to use the system default (to match your other alerts),
-// set this to 0.
-#define PFUseSmallAlertSuppressCheckbox 1
-
-
-static NSString *AlertSuppressKey = @"moveToApplicationsFolderAlertSuppress";
-static BOOL MoveInProgress = NO;
-
-// Helper functions
-static NSString *PreferredInstallLocation(BOOL *isUserDirectory);
-static BOOL IsInApplicationsFolder(NSString *path);
-static BOOL IsInDownloadsFolder(NSString *path);
-static BOOL IsApplicationAtPathRunning(NSString *path);
-static BOOL IsApplicationAtPathNested(NSString *path);
-static NSString *ContainingDiskImageDevice(NSString *path);
-static BOOL Trash(NSString *path);
-static BOOL DeleteOrTrash(NSString *path);
-static BOOL AuthorizedInstall(NSString *srcPath, NSString *dstPath, BOOL *canceled);
-static BOOL CopyBundle(NSString *srcPath, NSString *dstPath);
-static NSString *ShellQuotedString(NSString *string);
-static void Relaunch(NSString *destinationPath);
-
-// Main worker function
-void PFMoveToApplicationsFolderIfNecessary(void) {
-
-	// Make sure to do our work on the main thread.
-	// Apparently Electron apps need this for things to work properly.
-	if (![NSThread isMainThread]) {
-		dispatch_async(dispatch_get_main_queue(), ^{
-			PFMoveToApplicationsFolderIfNecessary();
-		});
-		return;
-	}
-	
-	// Skip if user suppressed the alert before
-	if ([[NSUserDefaults standardUserDefaults] boolForKey:AlertSuppressKey]) return;
-
-	// Path of the bundle
-	NSString *bundlePath = [[NSBundle mainBundle] bundlePath];
-
-	// Check if the bundle is embedded in another application
-	BOOL isNestedApplication = IsApplicationAtPathNested(bundlePath);
-
-	// Skip if the application is already in some Applications folder,
-	// unless it's inside another app's bundle.
-	if (IsInApplicationsFolder(bundlePath) && !isNestedApplication) return;
-
-	// OK, looks like we'll need to do a move - set the status variable appropriately
-	MoveInProgress = YES;
-	
-	// File Manager
-	NSFileManager *fm = [NSFileManager defaultManager];
-
-	// Are we on a disk image?
-	NSString *diskImageDevice = ContainingDiskImageDevice(bundlePath);
-
-	// Since we are good to go, get the preferred installation directory.
-	BOOL installToUserApplications = NO;
-	NSString *applicationsDirectory = PreferredInstallLocation(&installToUserApplications);
-	NSString *bundleName = [bundlePath lastPathComponent];
-	NSString *destinationPath = [applicationsDirectory stringByAppendingPathComponent:bundleName];
-
-	// Check if we need admin password to write to the Applications directory
-	BOOL needAuthorization = ([fm isWritableFileAtPath:applicationsDirectory] == NO);
-
-	// Check if the destination bundle is already there but not writable
-	needAuthorization |= ([fm fileExistsAtPath:destinationPath] && ![fm isWritableFileAtPath:destinationPath]);
-
-	// Setup the alert
-	NSAlert *alert = [[[NSAlert alloc] init] autorelease];
-	{
-		NSString *informativeText = nil;
-
-		[alert setMessageText:(installToUserApplications ? kStrMoveApplicationQuestionTitleHome : kStrMoveApplicationQuestionTitle)];
-
-		informativeText = kStrMoveApplicationQuestionMessage;
-
-		if (needAuthorization) {
-			informativeText = [informativeText stringByAppendingString:@" "];
-			informativeText = [informativeText stringByAppendingString:kStrMoveApplicationQuestionInfoWillRequirePasswd];
-		}
-		else if (IsInDownloadsFolder(bundlePath)) {
-			// Don't mention this stuff if we need authentication. The informative text is long enough as it is in that case.
-			informativeText = [informativeText stringByAppendingString:@" "];
-			informativeText = [informativeText stringByAppendingString:kStrMoveApplicationQuestionInfoInDownloadsFolder];
-		}
-
-		[alert setInformativeText:informativeText];
-
-		// Add accept button
-		[alert addButtonWithTitle:kStrMoveApplicationButtonMove];
-
-		// Add deny button
-		NSButton *cancelButton = [alert addButtonWithTitle:kStrMoveApplicationButtonDoNotMove];
-		[cancelButton setKeyEquivalent:[NSString stringWithFormat:@"%C", 0x1b]]; // Escape key
-
-		// Setup suppression button
-		[alert setShowsSuppressionButton:YES];
-
-		if (PFUseSmallAlertSuppressCheckbox) {
-			NSCell *cell = [[alert suppressionButton] cell];
-			[cell setControlSize:NSSmallControlSize];
-			[cell setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
-		}
-	}
-
-	// Activate app -- work-around for focus issues related to "scary file from internet" OS dialog.
-	if (![NSApp isActive]) {
-		[NSApp activateIgnoringOtherApps:YES];
-	}
-
-	if ([alert runModal] == NSAlertFirstButtonReturn) {
-		NSLog(@"INFO -- Moving myself to the Applications folder");
-
-		// Move
-		if (needAuthorization) {
-			BOOL authorizationCanceled;
-
-			if (!AuthorizedInstall(bundlePath, destinationPath, &authorizationCanceled)) {
-				if (authorizationCanceled) {
-					NSLog(@"INFO -- Not moving because user canceled authorization");
-					MoveInProgress = NO;
-					return;
-				}
-				else {
-					NSLog(@"ERROR -- Could not copy myself to /Applications with authorization");
-					goto fail;
-				}
-			}
-		}
-		else {
-			// If a copy already exists in the Applications folder, put it in the Trash
-			if ([fm fileExistsAtPath:destinationPath]) {
-				// But first, make sure that it's not running
-				if (IsApplicationAtPathRunning(destinationPath)) {
-					// Give the running app focus and terminate myself
-					NSLog(@"INFO -- Switching to an already running version");
-					[[NSTask launchedTaskWithLaunchPath:@"/usr/bin/open" arguments:[NSArray arrayWithObject:destinationPath]] waitUntilExit];
-					MoveInProgress = NO;
-					exit(0);
-				}
-				else {
-					if (!Trash([applicationsDirectory stringByAppendingPathComponent:bundleName]))
-						goto fail;
-				}
-			}
-
- 			if (!CopyBundle(bundlePath, destinationPath)) {
-				NSLog(@"ERROR -- Could not copy myself to %@", destinationPath);
-				goto fail;
-			}
-		}
-
-		// Trash the original app. It's okay if this fails.
-		// NOTE: This final delete does not work if the source bundle is in a network mounted volume.
-		//       Calling rm or file manager's delete method doesn't work either. It's unlikely to happen
-		//       but it'd be great if someone could fix this.
-		if (!isNestedApplication && diskImageDevice == nil && !DeleteOrTrash(bundlePath)) {
-			NSLog(@"WARNING -- Could not delete application after moving it to Applications folder");
-		}
-
-		// Relaunch.
-		Relaunch(destinationPath);
-
-		// Launched from within a disk image? -- unmount (if no files are open after 5 seconds,
-		// otherwise leave it mounted).
-		if (diskImageDevice && !isNestedApplication) {
-			NSString *script = [NSString stringWithFormat:@"(/bin/sleep 5 && /usr/bin/hdiutil detach %@) &", ShellQuotedString(diskImageDevice)];
-			[NSTask launchedTaskWithLaunchPath:@"/bin/sh" arguments:[NSArray arrayWithObjects:@"-c", script, nil]];
-		}
-
-		MoveInProgress = NO;
-		exit(0);
-	}
-	// Save the alert suppress preference if checked
-	else if ([[alert suppressionButton] state] == NSOnState) {
-		[[NSUserDefaults standardUserDefaults] setBool:YES forKey:AlertSuppressKey];
-	}
-
-	MoveInProgress = NO;
-	return;
-
-fail:
-	{
-		// Show failure message
-		alert = [[[NSAlert alloc] init] autorelease];
-		[alert setMessageText:kStrMoveApplicationCouldNotMove];
-		[alert runModal];
-		MoveInProgress = NO;
-	}
-}
-
-BOOL PFMoveIsInProgress() {
-    return MoveInProgress;
-}
-
-#pragma mark -
-#pragma mark Helper Functions
-
-static NSString *PreferredInstallLocation(BOOL *isUserDirectory) {
-	// Return the preferred install location.
-	// Assume that if the user has a ~/Applications folder, they'd prefer their
-	// applications to go there.
-
-	NSFileManager *fm = [NSFileManager defaultManager];
-
-	/*
-	NSArray *userApplicationsDirs = NSSearchPathForDirectoriesInDomains(NSApplicationDirectory, NSUserDomainMask, YES);
-
-	if ([userApplicationsDirs count] > 0) {
-		NSString *userApplicationsDir = [userApplicationsDirs objectAtIndex:0];
-		BOOL isDirectory;
-
-		if ([fm fileExistsAtPath:userApplicationsDir isDirectory:&isDirectory] && isDirectory) {
-			// User Applications directory exists. Get the directory contents.
-			NSArray *contents = [fm contentsOfDirectoryAtPath:userApplicationsDir error:NULL];
-
-			// Check if there is at least one ".app" inside the directory.
-			for (NSString *contentsPath in contents) {
-				if ([[contentsPath pathExtension] isEqualToString:@"app"]) {
-					if (isUserDirectory) *isUserDirectory = YES;
-					return [userApplicationsDir stringByResolvingSymlinksInPath];
-				}
-			}
-		}
-	}
-    */
-	
-	// No user Applications directory in use. Return the machine local Applications directory
-	if (isUserDirectory) *isUserDirectory = NO;
-
-	return [[NSSearchPathForDirectoriesInDomains(NSApplicationDirectory, NSLocalDomainMask, YES) lastObject] stringByResolvingSymlinksInPath];
-}
-
-static BOOL IsInApplicationsFolder(NSString *path) {
-	// Check all the normal Application directories
-	NSArray *applicationDirs = NSSearchPathForDirectoriesInDomains(NSApplicationDirectory, NSAllDomainsMask, YES);
-	for (NSString *appDir in applicationDirs) {
-		if ([path hasPrefix:appDir]) return YES;
-	}
-
-	// Also, handle the case that the user has some other Application directory (perhaps on a separate data partition).
-	if ([[path pathComponents] containsObject:@"Applications"]) return YES;
-
-	return NO;
-}
-
-static BOOL IsInDownloadsFolder(NSString *path) {
-	NSArray *downloadDirs = NSSearchPathForDirectoriesInDomains(NSDownloadsDirectory, NSAllDomainsMask, YES);
-	for (NSString *downloadsDirPath in downloadDirs) {
-		if ([path hasPrefix:downloadsDirPath]) return YES;
-	}
-
-	return NO;
-}
-
-static BOOL IsApplicationAtPathRunning(NSString *bundlePath) {
-	bundlePath = [bundlePath stringByStandardizingPath];
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
-	// Use the new API on 10.6 or higher to determine if the app is already running
-	if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5) {
-		for (NSRunningApplication *runningApplication in [[NSWorkspace sharedWorkspace] runningApplications]) {
-			NSString *runningAppBundlePath = [[[runningApplication bundleURL] path] stringByStandardizingPath];
-			if ([runningAppBundlePath isEqualToString:bundlePath]) {
-				return YES;
-			}
-		}
-		return NO;
-	}
-#endif
-	// Use the shell to determine if the app is already running on systems 10.5 or lower
-	NSString *script = [NSString stringWithFormat:@"/bin/ps ax -o comm | /usr/bin/grep %@/ | /usr/bin/grep -v grep >/dev/null", ShellQuotedString(bundlePath)];
-	NSTask *task = [NSTask launchedTaskWithLaunchPath:@"/bin/sh" arguments:[NSArray arrayWithObjects:@"-c", script, nil]];
-	[task waitUntilExit];
-
-	// If the task terminated with status 0, it means that the final grep produced 1 or more lines of output.
-	// Which means that the app is already running
-	return [task terminationStatus] == 0;
-}
-
-static BOOL IsApplicationAtPathNested(NSString *path) {
-	NSString *containingPath = [path stringByDeletingLastPathComponent];
-
-	NSArray *components = [containingPath pathComponents];
-	for (NSString *component in components) {
-		if ([[component pathExtension] isEqualToString:@"app"]) {
-			return YES;
-		}
-	}
-
-	return NO;
-}
-
-static NSString *ContainingDiskImageDevice(NSString *path) {
-	NSString *containingPath = [path stringByDeletingLastPathComponent];
-
-	struct statfs fs;
-	if (statfs([containingPath fileSystemRepresentation], &fs) || (fs.f_flags & MNT_ROOTFS))
-		return nil;
-
-	NSString *device = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:fs.f_mntfromname length:strlen(fs.f_mntfromname)];
-
-	NSTask *hdiutil = [[[NSTask alloc] init] autorelease];
-	[hdiutil setLaunchPath:@"/usr/bin/hdiutil"];
-	[hdiutil setArguments:[NSArray arrayWithObjects:@"info", @"-plist", nil]];
-	[hdiutil setStandardOutput:[NSPipe pipe]];
-	[hdiutil launch];
-	[hdiutil waitUntilExit];
-
-	NSData *data = [[[hdiutil standardOutput] fileHandleForReading] readDataToEndOfFile];
-	NSDictionary *info = nil;
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
-	if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5) {
-		info = [NSPropertyListSerialization propertyListWithData:data options:NSPropertyListImmutable format:NULL error:NULL];
-	}
-	else {
-#endif
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10
-		info = [NSPropertyListSerialization propertyListFromData:data mutabilityOption:NSPropertyListImmutable format:NULL errorDescription:NULL];
-#endif
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
-	}
-#endif
-
-	if (![info isKindOfClass:[NSDictionary class]]) return nil;
-
-	NSArray *images = (NSArray *)[info objectForKey:@"images"];
-	if (![images isKindOfClass:[NSArray class]]) return nil;
-
-	for (NSDictionary *image in images) {
-		if (![image isKindOfClass:[NSDictionary class]]) return nil;
-
-		id systemEntities = [image objectForKey:@"system-entities"];
-		if (![systemEntities isKindOfClass:[NSArray class]]) return nil;
-
-		for (NSDictionary *systemEntity in systemEntities) {
-			if (![systemEntity isKindOfClass:[NSDictionary class]]) return nil;
-
-			NSString *devEntry = [systemEntity objectForKey:@"dev-entry"];
-			if (![devEntry isKindOfClass:[NSString class]]) return nil;
-
-			if ([devEntry isEqualToString:device])
-				return device;
-		}
-	}
-
-	return nil;
-}
-
-static BOOL Trash(NSString *path) {
-	BOOL result = NO;
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-	if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_8) {
-		result = [[NSFileManager defaultManager] trashItemAtURL:[NSURL fileURLWithPath:path] resultingItemURL:NULL error:NULL];
-	}
-#endif
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11
-	if (!result) {
-		result = [[NSWorkspace sharedWorkspace] performFileOperation:NSWorkspaceRecycleOperation
-															  source:[path stringByDeletingLastPathComponent]
-														 destination:@""
-															   files:[NSArray arrayWithObject:[path lastPathComponent]]
-																 tag:NULL];
-	}
-#endif
-	
-	// As a last resort try trashing with AppleScript.
-	// This allows us to trash the app in macOS Sierra even when the app is running inside
-	// an app translocation image.
-	if (!result) {
-		NSAppleScript *appleScript = [[[NSAppleScript alloc] initWithSource:
-									   [NSString stringWithFormat:@"\
-										set theFile to POSIX file \"%@\" \n\
-									   	tell application \"Finder\" \n\
-									  		move theFile to trash \n\
-									  	end tell", path]] autorelease];
-		NSDictionary *errorDict = nil;
-		NSAppleEventDescriptor *scriptResult = [appleScript executeAndReturnError:&errorDict];
-		if (scriptResult == nil) {
-			NSLog(@"Trash AppleScript error: %@", errorDict);
-		}
-		result = (scriptResult != nil);
-	}
-
-	if (!result) {
-		NSLog(@"ERROR -- Could not trash '%@'", path);
-	}
-
-	return result;
-}
-
-static BOOL DeleteOrTrash(NSString *path) {
-	NSError *error;
-
-	if ([[NSFileManager defaultManager] removeItemAtPath:path error:&error]) {
-		return YES;
-	}
-	else {
-		// Don't log warning if on Sierra and running inside App Translocation path
-		if ([path rangeOfString:@"/AppTranslocation/"].location == NSNotFound)
-			NSLog(@"WARNING -- Could not delete '%@': %@", path, [error localizedDescription]);
-		
-		return Trash(path);
-	}
-}
-
-static BOOL AuthorizedInstall(NSString *srcPath, NSString *dstPath, BOOL *canceled) {
-	if (canceled) *canceled = NO;
-
-	// Make sure that the destination path is an app bundle. We're essentially running 'sudo rm -rf'
-	// so we really don't want to fuck this up.
-	if (![[dstPath pathExtension] isEqualToString:@"app"]) return NO;
-
-	// Do some more checks
-	if ([[dstPath stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length] == 0) return NO;
-	if ([[srcPath stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length] == 0) return NO;
-
-	int pid, status;
-	AuthorizationRef myAuthorizationRef;
-
-	// Get the authorization
-	OSStatus err = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &myAuthorizationRef);
-	if (err != errAuthorizationSuccess) return NO;
-
-	AuthorizationItem myItems = {kAuthorizationRightExecute, 0, NULL, 0};
-	AuthorizationRights myRights = {1, &myItems};
-	AuthorizationFlags myFlags = (AuthorizationFlags)(kAuthorizationFlagInteractionAllowed | kAuthorizationFlagExtendRights | kAuthorizationFlagPreAuthorize);
-
-	err = AuthorizationCopyRights(myAuthorizationRef, &myRights, NULL, myFlags, NULL);
-	if (err != errAuthorizationSuccess) {
-		if (err == errAuthorizationCanceled && canceled)
-			*canceled = YES;
-		goto fail;
-	}
-
-	static OSStatus (*security_AuthorizationExecuteWithPrivileges)(AuthorizationRef authorization, const char *pathToTool,
-																   AuthorizationFlags options, char * const *arguments,
-																   FILE **communicationsPipe) = NULL;
-	if (!security_AuthorizationExecuteWithPrivileges) {
-		// On 10.7, AuthorizationExecuteWithPrivileges is deprecated. We want to still use it since there's no
-		// good alternative (without requiring code signing). We'll look up the function through dyld and fail
-		// if it is no longer accessible. If Apple removes the function entirely this will fail gracefully. If
-		// they keep the function and throw some sort of exception, this won't fail gracefully, but that's a
-		// risk we'll have to take for now.
-		security_AuthorizationExecuteWithPrivileges = (OSStatus (*)(AuthorizationRef, const char*,
-																   AuthorizationFlags, char* const*,
-																   FILE **)) dlsym(RTLD_DEFAULT, "AuthorizationExecuteWithPrivileges");
-	}
-	if (!security_AuthorizationExecuteWithPrivileges) goto fail;
-
-	// Delete the destination
-	{
-		char *args[] = {"-rf", (char *)[dstPath fileSystemRepresentation], NULL};
-		err = security_AuthorizationExecuteWithPrivileges(myAuthorizationRef, "/bin/rm", kAuthorizationFlagDefaults, args, NULL);
-		if (err != errAuthorizationSuccess) goto fail;
-
-		// Wait until it's done
-		pid = wait(&status);
-		if (pid == -1 || !WIFEXITED(status)) goto fail; // We don't care about exit status as the destination most likely does not exist
-	}
-
-	// Copy
-	{
-		char *args[] = {"-pR", (char *)[srcPath fileSystemRepresentation], (char *)[dstPath fileSystemRepresentation], NULL};
-		err = security_AuthorizationExecuteWithPrivileges(myAuthorizationRef, "/bin/cp", kAuthorizationFlagDefaults, args, NULL);
-		if (err != errAuthorizationSuccess) goto fail;
-
-		// Wait until it's done
-		pid = wait(&status);
-		if (pid == -1 || !WIFEXITED(status) || WEXITSTATUS(status)) goto fail;
-	}
-
-	AuthorizationFree(myAuthorizationRef, kAuthorizationFlagDefaults);
-	return YES;
-
-fail:
-	AuthorizationFree(myAuthorizationRef, kAuthorizationFlagDefaults);
-	return NO;
-}
-
-static BOOL CopyBundle(NSString *srcPath, NSString *dstPath) {
-	NSFileManager *fm = [NSFileManager defaultManager];
-	NSError *error = nil;
-
-	if ([fm copyItemAtPath:srcPath toPath:dstPath error:&error]) {
-		return YES;
-	}
-	else {
-		NSLog(@"ERROR -- Could not copy '%@' to '%@' (%@)", srcPath, dstPath, error);
-		return NO;
-	}
-}
-
-static NSString *ShellQuotedString(NSString *string) {
-	return [NSString stringWithFormat:@"'%@'", [string stringByReplacingOccurrencesOfString:@"'" withString:@"'\\''"]];
-}
-
-static void Relaunch(NSString *destinationPath) {
-	// The shell script waits until the original app process terminates.
-	// This is done so that the relaunched app opens as the front-most app.
-	int pid = [[NSProcessInfo processInfo] processIdentifier];
-
-	// Command run just before running open /final/path
-	NSString *preOpenCmd = @"";
-
-	NSString *quotedDestinationPath = ShellQuotedString(destinationPath);
-
-	// OS X >=10.5:
-	// Before we launch the new app, clear xattr:com.apple.quarantine to avoid
-	// duplicate "scary file from the internet" dialog.
-	if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5) {
-		// Add the -r flag on 10.6
-		preOpenCmd = [NSString stringWithFormat:@"/usr/bin/xattr -d -r com.apple.quarantine %@", quotedDestinationPath];
-	}
-	else {
-		preOpenCmd = [NSString stringWithFormat:@"/usr/bin/xattr -d com.apple.quarantine %@", quotedDestinationPath];
-	}
-
-	NSString *script = [NSString stringWithFormat:@"(while /bin/kill -0 %d >&/dev/null; do /bin/sleep 0.1; done; %@; /usr/bin/open %@) &", pid, preOpenCmd, quotedDestinationPath];
-
-	[NSTask launchedTaskWithLaunchPath:@"/bin/sh" arguments:[NSArray arrayWithObjects:@"-c", script, nil]];
-}

distribution/osx/Launcher/src/compile.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-# -fobjc-arc: enables ARC
-# -fmodules: enables modules so you can import with `@import AppKit;`
-# -mmacosx-version-min=10.6: support older OS X versions, this might increase the binary size
-
-if [ ! -d "../dist" ]; then mkdir ../dist; fi
-
-clang PFMoveApplication.m -fno-objc-arc -fmodules -mmacosx-version-min=10.6 -c -o PFMoveApplication.o
-clang run-with-mono.m Launcher.m PFMoveApplication.o  -fobjc-arc -fmodules -mmacosx-version-min=10.6 -o ../dist/Launcher
-rm PFMoveApplication.o
-
-if [ "$1" == "install" ] && [ "$2" != "" ]; then
-    echo "Installing to $2"
-    cp ../dist/Launcher $2
-    chmod +x $2
-fi

distribution/osx/Launcher/src/run-with-mono.h

@@ -1,11 +0,0 @@
-@import Foundation;
-@import AppKit;
-
-@interface RunWithMono : NSObject {
-}
-
-+ (void) openDownloadLink:(NSButton*)button;
-+ (bool) showDownloadMonoDialog:(NSString *)appName major:(int)major minor:(int)minor;
-+ (int) runAssemblyWithMono:(NSString *)appName procnamesuffix:(NSString *)procnamesuffix assembly:(NSString *)assembly major:(int) major minor:(int) minor;
-
-@end

distribution/osx/Launcher/src/run-with-mono.m

@@ -1,258 +0,0 @@
-#import "run-with-mono.h"
-
-@import Foundation;
-@import AppKit;
-
-NSString * const VERSION_TITLE = @"Cannot launch %@";
-NSString * const VERSION_MSG = @"%@ requires the Mono Framework version %d.%d or later.";
-NSString * const DOWNLOAD_URL = @"http://www.mono-project.com/download/stable/#download-mac";
-
-// Helper method to see if the user has requested debug output
-bool D() {
-	NSString* v = [[[NSProcessInfo processInfo]environment]objectForKey:@"DEBUG"];
-	if (v == nil || v.length == 0 || [v isEqual:@"0"] || [v isEqual:@"false"] || [v isEqual:@"f"])
-		return false;
-	return true;
-}
-
-// Wrapper method to invoke commandline operations and return the string output
-NSString *runCommand(NSString *program, NSArray<NSString *> *arguments) {
-	NSPipe *pipe = [NSPipe pipe];
-	NSFileHandle *file = pipe.fileHandleForReading;
-
-	NSTask *task = [[NSTask alloc] init];
-	task.launchPath = program;
-	task.arguments = arguments;
-	task.standardOutput = pipe;
-
-	[task launch];
-
-	NSData *data = [file readDataToEndOfFile];
-	[file closeFile];
-	[task waitUntilExit];
-
-	NSString *cmdOutput = [[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding];
-	if (cmdOutput == nil || cmdOutput.length == 0)
-		return nil;
-
-	return [cmdOutput stringByTrimmingCharactersInSet:
-                              [NSCharacterSet whitespaceAndNewlineCharacterSet]];
-}
-
-// Checks if the Mono version is greater than or equal to the desired version
-bool isValidMono(NSString *mono, int major, int minor) {
-	NSFileManager *fileManager = [NSFileManager defaultManager];
-
-	if (mono == nil)
-		return false;
-
-	if (![fileManager fileExistsAtPath:mono] || ![fileManager isExecutableFileAtPath:mono])
-		return false;
-
-	NSString *versionInfo = runCommand(mono, @[@"--version"]);
-
-	NSRange rg = [versionInfo rangeOfString:@"Mono JIT compiler version \\d+\\.\\d+" options:NSRegularExpressionSearch];
-	if (rg.location != NSNotFound) {
-		versionInfo = [versionInfo substringWithRange:rg];
-		if (D()) NSLog(@"Matched version: %@", versionInfo);
-		rg = [versionInfo rangeOfString:@"\\d+\\.\\d+" options:NSRegularExpressionSearch];
-		if (rg.location != NSNotFound) {
-			versionInfo = [versionInfo substringWithRange:rg];
-			if (D()) NSLog(@"Matched version: %@", versionInfo);
-
-			NSArray<NSString *> *versionComponents = [versionInfo componentsSeparatedByString:@"."];
-			if ([versionComponents[0] intValue] < major)
-				return false;
-			if ([versionComponents[0] intValue] == major && [versionComponents[1] intValue] < minor)
-				return false;
-
-			return true;
-		}
-	}
-
-	return false;
-}
-
-// Attempts to locate a mono with a valid version
-NSString *findMono(int major, int minor) {
-	NSFileManager *fileManager = [NSFileManager defaultManager];
-
-	NSString *currentMono = runCommand(@"/usr/bin/which", @[@"mono"]);
-	if (D()) NSLog(@"which mono: %@", currentMono);
-
-	if (isValidMono(currentMono, major, minor)) {
-		if (D()) NSLog(@"Found mono with: %@", currentMono);
-		return currentMono;
-	}
-
-	NSArray *probepaths = @[@"/usr/local/bin/mono", @"/Library/Frameworks/Mono.framework/Versions/Current/bin/mono", @"/opt/local/bin/mono"];
-	for(NSString* probepath in probepaths) {
-		if (D()) NSLog(@"Trying mono with: %@", probepath);
-		if (isValidMono(probepath, major, minor)) {
-			if (D()) NSLog(@"Found mono with: %@", probepath);
-			return probepath;
-		}
-	}
-
-	if (D()) NSLog(@"Failed to find Mono, returning: %@", nil);
-	return nil;
-}
-
-// Check Bundle for quarantine
-void checkBundle() {
-    		
-	NSString * const bundlePath = [[NSBundle mainBundle] bundlePath];
-	NSString * const attributes = runCommand(@"/usr/bin/xattr", @[@"-l", bundlePath]);
-	if (D()) NSLog(@"Attributes: %@", attributes);
-	if ([attributes containsString:@"com.apple.quarantine:"]) {
-		runCommand(@"/usr/bin/xattr", @[@"-dr", @"com.apple.quarantine", bundlePath]);
-		NSLog(@"Removed quarantine attribute from bundle");
-	}
-}
-
-
-@implementation RunWithMono
-
-+ (void) openDownloadLink:(NSButton*)button {
-	if (D()) NSLog(@"Clicked Download");
-	runCommand(@"/usr/bin/open", @[DOWNLOAD_URL]);
-}
-
-// Shows the download dialog, prompting to download Mono
-+ (bool) showDownloadMonoDialog:(NSString *)appName major:(int)major minor:(int)minor {
-	NSAlert *alert = [[NSAlert alloc] init];
-
-	[alert setInformativeText:[NSString stringWithFormat:VERSION_MSG, appName, major, minor]];
-	[alert setMessageText:[NSString stringWithFormat:VERSION_TITLE, appName]];
-	[alert addButtonWithTitle:@"Cancel"];
-	[alert addButtonWithTitle:@"Retry"];
-	[alert addButtonWithTitle:@"Download"];
-
-	NSButton *downloadButton = [[alert buttons] objectAtIndex:2];
-
-	[downloadButton setTarget:self];
-	[downloadButton setAction:@selector(openDownloadLink:)];
-
-	NSModalResponse btn = [alert runModal];
-	if (btn == NSAlertFirstButtonReturn) {
-		if (D()) NSLog(@"Clicked Cancel");
-		return true;
-	}
-	else if (btn == NSAlertSecondButtonReturn) {
-		if (D()) NSLog(@"Clicked Retry");
-		return false;
-	}
-
-	return true;
-}
-
-// Top-level method, finds Mono with an appropriate version and launches the assembly
-+ (int) runAssemblyWithMono: (NSString *)appName procnamesuffix:(NSString *)procnamesuffix assembly:(NSString *)assembly major:(int) major minor:(int) minor {
-	NSFileManager *fileManager = [NSFileManager defaultManager];
-
-	NSString *assemblyPath;
-	bool found = false;
-
-	NSString *localPath = NSProcessInfo.processInfo.arguments[0].stringByDeletingLastPathComponent;
-	NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
-	NSArray *paths = @[
-		localPath,
-		[NSString pathWithComponents:@[localPath, @"bin"]],
-		resourcePath,
-		[NSString pathWithComponents:@[resourcePath, @"bin"]]
-	];
-	for (NSString* entryFolder in paths) {
-		if (D()) NSLog(@"Checking folder: %@", entryFolder);
-
-		assemblyPath = [NSString pathWithComponents:@[entryFolder, assembly]];
-
-		if ([fileManager fileExistsAtPath:assemblyPath]) {
-			found = true;
-			break;
-		}
-	}
-
-	if (!found) {
-		NSLog(@"Assembly file not found");
-		return 1;
-	}
-
-	if (D()) NSLog(@"assemblyPath: %@", assemblyPath);
-
-	checkBundle();
-
-	NSString *currentMono = findMono(major, minor);
-	
-	while (currentMono == nil) {
-		NSLog(@"No valid mono found!");
-		bool close = [self showDownloadMonoDialog:appName major:major minor:minor];
-		if (close)
-			return 1;
-		currentMono = findMono(major, minor);
-	}
-
-	// Setup dylib fallback loading
-	NSMutableArray * dylibPath = [NSMutableArray arrayWithObject:assemblyPath.stringByDeletingLastPathComponent];
-
-	// Update the PATH to use the specified mono version
-	if ([currentMono hasPrefix:@"/"])
-	{
-		NSString * curMonoBinDir = currentMono.stringByDeletingLastPathComponent;
-		NSString * curMonoDir = curMonoBinDir.stringByDeletingLastPathComponent;
-		NSString * curMonoLibDir = [NSString pathWithComponents:@[curMonoDir, @"lib"]];
-		
-		NSString * curEnvPath = [NSString stringWithUTF8String:getenv("PATH")];
-		NSString * newEnvPath = [NSString stringWithFormat:@"%@:%@", curMonoBinDir, curEnvPath];
-		setenv("PATH", newEnvPath.UTF8String, 1);
-
-		[dylibPath addObject:curMonoLibDir];
-
-		NSLog(@"Added %@ to PATH", curMonoBinDir);
-	}
-
-	// Setup libsqlite?
-	/*	if [[ -f '/opt/local/lib/libsqlite3.0.dylib' ]]; then
-			export DYLD_FALLBACK_LIBRARY_PATH="/opt/local/lib:$DYLD_FALLBACK_LIBRARY_PATH"
-		fi
-	*/
-	
-	[dylibPath addObjectsFromArray:@[@"$HOME/lib", @"/usr/local/lib", @"/lib", @"/usr/lib"]];
-
-	setenv("DYLD_FALLBACK_LIBRARY_PATH", [dylibPath componentsJoinedByString:@":"].UTF8String, 1);
-
-	if (D()) NSLog(@"Running %@ --debug %@", currentMono, assemblyPath);
-	
-	// Copy commandline arguments
-	NSMutableArray* arguments = [[NSMutableArray alloc] init];
-	// Disabled suffix for now coz it's confusing and not preserved on in-app restart
-	[arguments addObject:currentMono];
-	//[arguments addObject:[currentMono stringByAppendingString:procnamesuffix]];
-	[arguments addObject:@"--debug"];
-	[arguments addObjectsFromArray:[[NSProcessInfo processInfo] arguments]];
-	
-	// replace the executable-path with the assembly path
-	[arguments replaceObjectAtIndex:2 withObject:assemblyPath];
-
-	// Try switch to mono using execv
-	char * cPath = strdup([currentMono UTF8String]);
-	char ** cArgs;
-	char ** pArgNext = cArgs = malloc(sizeof(*cArgs) * ([arguments count] + 1));
-	for (NSString *s in arguments) {
-		*pArgNext++ = strdup([s UTF8String]);
-	}
-	*pArgNext = NULL;
-	int ret = execv(cPath, cArgs);
-	if (ret != 0)
-		NSLog(@"Failed execv with errno @d", errno);
-	// execv failed, cleanup
-	pArgNext = cArgs;
-	for (NSString *s in arguments) {
-		free(*pArgNext++);
-	}
-	free(cArgs);
-	free(cPath);
-
-	return -1;
-}
-
-@end

distribution/osx/Sonarr.old.sh

@@ -1,62 +0,0 @@
-#!/bin/sh
-
-#get the bundle's MacOS directory full path
-DIR=$(cd "$(dirname "$0")"; pwd)
-
-#change these values to match your app
-EXE_PATH="$DIR/Sonarr.exe"
-APPNAME="Sonarr"
- 
-#set up environment
-if [[ -x '/opt/local/bin/mono' ]]; then
-    # Macports and mono-supplied installer path
-    export PATH="/opt/local/bin:$PATH"
-elif [[ -x '/usr/local/bin/mono' ]]; then
-    # Homebrew-supplied path to mono
-    export PATH="/usr/local/bin:$PATH"
-fi
-
-export DYLD_FALLBACK_LIBRARY_PATH="$DIR"
-
-if [ -e /Library/Frameworks/Mono.framework ]; then
-	MONO_FRAMEWORK_PATH=/Library/Frameworks/Mono.framework/Versions/Current
-	export PATH="$MONO_FRAMEWORK_PATH/bin:$PATH"
-	export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$MONO_FRAMEWORK_PATH/lib"
-fi
-
-if [[ -f '/opt/local/lib/libsqlite3.0.dylib' ]]; then
-	export DYLD_FALLBACK_LIBRARY_PATH="/opt/local/lib:$DYLD_FALLBACK_LIBRARY_PATH"
-fi
-
-export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$HOME/lib:/usr/local/lib:/lib:/usr/lib"
-
-#mono version check
-REQUIRED_MAJOR=4
-REQUIRED_MINOR=6
- 
-VERSION_TITLE="Cannot launch $APPNAME"
-VERSION_MSG="$APPNAME requires Mono Runtime Environment(MRE) $REQUIRED_MAJOR.$REQUIRED_MINOR or later."
-DOWNLOAD_URL="http://www.mono-project.com/download/#download-mac"
- 
-MONO_VERSION="$(mono --version | grep 'Mono JIT compiler version ' |  cut -f5 -d\ )"
-# if [[ -o DEBUG ]]; then osascript -e "display dialog \"MONO_VERSION: $MONO_VERSION\""; fi
-
-
-MONO_VERSION_MAJOR="$(echo $MONO_VERSION | cut -f1 -d.)"
-MONO_VERSION_MINOR="$(echo $MONO_VERSION | cut -f2 -d.)"
-if [ -z "$MONO_VERSION" ] \
-    || [ $MONO_VERSION_MAJOR -lt $REQUIRED_MAJOR ] \
-    || [ $MONO_VERSION_MAJOR -eq $REQUIRED_MAJOR -a $MONO_VERSION_MINOR -lt $REQUIRED_MINOR ] 
-then
-    osascript \
-    -e "set question to display dialog \"$VERSION_MSG\" with title \"$VERSION_TITLE\" buttons {\"Cancel\", \"Download...\"} default button 2" \
-    -e "if button returned of question is equal to \"Download...\" then open location \"$DOWNLOAD_URL\""
-    echo "$VERSION_TITLE"
-    echo "$VERSION_MSG"
-    exit 1
-fi
- 
-MONO_EXEC="exec mono --debug"
- 
-#run app using mono
-$MONO_EXEC "$EXE_PATH"

distribution/windows/setup/build.bat

@@ -1,7 +1,10 @@
-REM SET BUILD_NUMBER=1
-REM SET BRANCH=develop
+@REM SET SONARR_MAJOR_VERSION=4
+@REM SET SONARR_VERSION=4.0.0.5
+@REM SET BRANCH=develop
+@REM SET FRAMEWORK=net6.0
+@REM SET RUNTIME=win-x64
 echo ##teamcity[progressStart 'Building setup file']
 inno\ISCC.exe sonarr.iss
 echo ##teamcity[progressFinish 'Building setup file']
 
-echo ##teamcity[publishArtifacts 'distribution\windows\setup\output\*.exe']
+echo ##teamcity[publishArtifacts 'distribution\windows\setup\output\*%RUNTIME%*.exe']

distribution/windows/setup/sonarr.iss

@@ -6,17 +6,20 @@
 #define AppURL "https://sonarr.tv/"
 #define ForumsURL "https://forums.sonarr.tv/"
 #define AppExeName "Sonarr.exe"
-#define BuildNumber "3.0"
-#define BuildNumber GetEnv('BUILD_NUMBER')
+#define BuildNumber "4.0"
+#define BuildNumber GetEnv('SONARR_VERSION')
+#define MajorVersion GetEnv('SONARR_MAJOR_VERSION')
 #define BranchName GetEnv('BRANCH')
+#define Framework GetEnv('FRAMEWORK')
+#define Runtime GetEnv('RUNTIME')
 
 [Setup]
-; NOTE: The value of AppId uniquely identifies this application.
+; NOTE: The value of AppId uniquely identifies this appl ication.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{56C1065D-3523-4025-B76D-6F73F67F7F71}
 AppName={#AppName}
-AppVersion=3.0
+AppVersion={#MajorVersion}
 AppPublisher={#AppPublisher}
 AppPublisherURL={#AppURL}
 AppSupportURL={#ForumsURL}
@@ -26,7 +29,7 @@ DefaultDirName={commonappdata}\Sonarr\bin
 DisableDirPage=yes
 DefaultGroupName={#AppName}
 DisableProgramGroupPage=yes
-OutputBaseFilename=Sonarr.{#BranchName}.{#BuildNumber}.windows
+OutputBaseFilename=Sonarr.{#BranchName}.{#BuildNumber}.{#Runtime}-installer
 SolidCompression=yes
 AppCopyright=Creative Commons 3.0 License
 AllowUNCPath=False
@@ -35,9 +38,10 @@ DisableReadyPage=True
 CompressionThreads=2
 Compression=lzma2/normal
 AppContact={#ForumsURL}
-VersionInfoVersion={#BuildNumber}
+VersionInfoVersion={#MajorVersion}
 SetupLogging=yes
 OutputDir=output
+AppverName={#AppName}
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -49,8 +53,8 @@ Name: "startupShortcut"; Description: "Create shortcut in Startup folder (Starts
 Name: "none"; Description: "Do not start automatically"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
 
 [Files]
-Source: "..\..\..\_output_windows\Sonarr.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\..\_output_windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Sonarr\Sonarr.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Sonarr\*"; Excludes: "Sonarr.Update"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
@@ -80,26 +84,3 @@ begin
   Exec('net', 'stop nzbdrone', '', 0, ewWaitUntilTerminated, ResultCode)
   Exec('sc', 'delete nzbdrone', '', 0, ewWaitUntilTerminated, ResultCode)
 end;
-
-function Framework472IsNotInstalled(): Boolean;
-var
-  bSuccess: Boolean;
-  regVersion: Cardinal;
-begin
-  Result := True;
-bSuccess := RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', regVersion);
-  if (True = bSuccess) and (regVersion >= 461808) then begin
-    Result := False;
-  end;
-end;
-
-function InitializeSetup(): Boolean;
-begin
-    if Framework472IsNotInstalled() then begin
-        MsgBox('Sonarr requires Microsoft .NET Framework 4.7.2 or higher.'#13#13
-            'Please use Windows Update to install this version'#13
-            'or download it from https://dotnet.microsoft.com/download/dotnet-framework.', mbInformation, MB_OK);
-        result := false;
-    end else
-        result := true;
-end;

docs.sh

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

frontend/.csscomb.json

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

frontend/.esformatter

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

frontend/.eslintignore

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

frontend/.eslintrc

@@ -1,293 +0,0 @@
-{
-  "parser": "babel-eslint",
-
-  "env": {
-    "browser": true,
-    "commonjs": true,
-    "node": true,
-    "es6": true
-  },
-
-  "globals": {
-    "expect": false,
-    "chai": false,
-    "sinon": false
-  },
-
-  "parserOptions": {
-    "ecmaVersion": 6,
-    "sourceType": "module",
-    "ecmaFeatures": {
-      "modules": true,
-      "impliedStrict": true
-    }
-  },
-
-  "plugins": [
-    "filenames",
-    "react"
-  ],
-
-  "settings": {
-    "react": {
-      "version": "detect"
-    }
-  },
-
-  "rules": {
-    "filenames/match-exported": ["error"],
-
-    # ECMAScript 6
-
-    "arrow-body-style": [0],
-    "arrow-parens": ["error", "always"],
-    "arrow-spacing": ["error", { "before": true, "after": true }],
-    "constructor-super": "error",
-    "generator-star-spacing": "off",
-    "no-class-assign": "error",
-    "no-confusing-arrow": "error",
-    "no-const-assign": "error",
-    "no-dupe-class-members": "error",
-    "no-duplicate-imports": "error",
-    "no-new-symbol": "error",
-    "no-this-before-super": "error",
-    "no-useless-escape": "error",
-    "no-useless-computed-key": "error",
-    "no-useless-constructor": "error",
-    "no-var": "warn",
-    "object-shorthand": ["error", "properties"],
-    "prefer-arrow-callback": "error",
-    "prefer-const": "warn",
-    "prefer-reflect": "off",
-    "prefer-rest-params": "off",
-    "prefer-spread": "warn",
-    "prefer-template": "error",
-    "require-yield": "off",
-    "template-curly-spacing": ["error", "never"],
-    "yield-star-spacing": "off",
-
-    # Possible Errors
-
-    "comma-dangle": "error",
-    "no-cond-assign": "error",
-    "no-console": "off",
-    "no-constant-condition": "warn",
-    "no-control-regex": "error",
-    "no-debugger": "off",
-    "no-dupe-args": "error",
-    "no-dupe-keys": "error",
-    "no-duplicate-case": "error",
-    "no-empty": "warn",
-    "no-empty-character-class": "error",
-    "no-ex-assign": "error",
-    "no-extra-boolean-cast": "error",
-    "no-extra-parens": ["error", "functions"],
-    "no-extra-semi": "error",
-    "no-func-assign": "error",
-    "no-inner-declarations": "error",
-    "no-invalid-regexp": "error",
-    "no-irregular-whitespace": "error",
-    "no-negated-in-lhs": "error",
-    "no-obj-calls": "error",
-    "no-regex-spaces": "error",
-    "no-sparse-arrays": "error",
-    "no-unexpected-multiline": "error",
-    "no-unreachable": "warn",
-    "no-unsafe-finally": "error",
-    "use-isnan": "error",
-    "valid-jsdoc": "off",
-    "valid-typeof": "error",
-
-    # Best Practices
-
-    "accessor-pairs": "off",
-    "array-callback-return": "warn",
-    "block-scoped-var": "warn",
-    "consistent-return": "off",
-    "curly": "error",
-    "default-case": "error",
-    "dot-location": ["error", "property"],
-    "dot-notation": "error",
-    "eqeqeq": ["error", "smart"],
-    "guard-for-in": "error",
-    "no-alert": "warn",
-    "no-caller": "error",
-    "no-case-declarations": "error",
-    "no-div-regex": "error",
-    "no-else-return": "error",
-    "no-empty-function": ["error", {"allow": ["arrowFunctions"]}],
-    "no-empty-pattern": "error",
-    "no-eval": "error",
-    "no-extend-native": "error",
-    "no-extra-bind": "error",
-    "no-fallthrough": "error",
-    "no-floating-decimal": "error",
-    "no-implicit-coercion": ["error", {
-        "boolean": false,
-        "number": true,
-        "string": true,
-        "allow": [/* "!!", "~", "*", "+" */]
-    }],
-    "no-implicit-globals": "error",
-    "no-implied-eval": "error",
-    "no-invalid-this": "off",
-    "no-iterator": "error",
-    "no-labels": "error",
-    "no-lone-blocks": "error",
-    "no-loop-func": "error",
-    "no-magic-numbers": ["off", {"ignoreArrayIndexes": true, "ignore": [0, 1] }],
-    "no-multi-spaces": "error",
-    "no-multi-str": "error",
-    "no-native-reassign": ["error", {"exceptions": ["console"]}],
-    "no-new": "off",
-    "no-new-func": "error",
-    "no-new-wrappers": "error",
-    "no-octal": "error",
-    "no-octal-escape": "error",
-    "no-param-reassign": "off",
-    "no-process-env": "off",
-    "no-proto": "error",
-    "no-redeclare": "error",
-    "no-return-assign": "warn",
-    "no-script-url": "error",
-    "no-self-assign": "error",
-    "no-self-compare": "error",
-    "no-sequences": "error",
-    "no-throw-literal": "error",
-    "no-unmodified-loop-condition": "error",
-    "no-unused-expressions": "error",
-    "no-unused-labels": "error",
-    "no-useless-call": "error",
-    "no-useless-concat": "error",
-    "no-void": "error",
-    "no-warning-comments": "off",
-    "no-with": "error",
-    "radix": ["error", "as-needed"],
-    "vars-on-top": "off",
-    "wrap-iife": ["error", "inside"],
-    "yoda": "error",
-
-    # Strict Mode
-
-    "strict": ["error", "never"],
-
-    # Variables
-
-    "init-declarations": ["error", "always"],
-    "no-catch-shadow": "error",
-    "no-delete-var": "error",
-    "no-label-var": "error",
-    "no-restricted-globals": "off",
-    "no-shadow": "error",
-    "no-shadow-restricted-names": "error",
-    "no-undef": "error",
-    "no-undef-init": "off",
-    "no-undefined": "off",
-    "no-unused-vars": ["error", { "args": "none", "ignoreRestSiblings": true }],
-    "no-use-before-define": "error",
-
-    # Node.js and CommonJS
-
-    "callback-return": "warn",
-    "global-require": "error",
-    "handle-callback-err": "warn",
-    "no-mixed-requires": "error",
-    "no-new-require": "error",
-    "no-path-concat": "error",
-    "no-process-exit": "error",
-
-    # Stylistic Issues
-
-    "array-bracket-spacing": ["error", "never"],
-    "block-spacing": ["error", "always"],
-    "brace-style": ["error", "1tbs", { "allowSingleLine": false }],
-    "camelcase": "off",
-    "comma-spacing": ["error", {"before": false, "after": true}],
-    "comma-style": ["error", "last"],
-    "computed-property-spacing": ["error", "never"],
-    "consistent-this": ["error", "self"],
-    "eol-last": "error",
-    "func-names": "off",
-    "func-style": ["error", "declaration"],
-    "indent": ["error", 2, {"SwitchCase": 1}],
-    "key-spacing": ["error", {"beforeColon": false, "afterColon": true}],
-    "keyword-spacing": ["error", { "before": true, "after": true}],
-    "lines-around-comment": ["error", { "beforeBlockComment": true, "afterBlockComment": false }],
-    "max-depth": ["error", {"maximum": 5}],
-    "max-nested-callbacks": ["error", 4],
-    "max-statements": "off",
-    "max-statements-per-line": ["error", { "max": 1 }],
-    "new-cap": ["error", {"capIsNewExceptions": ["$.Deferred", "DragDropContext", "DragLayer", "DragSource", "DropTarget"]}],
-    "new-parens": "error",
-    "newline-after-var": "off",
-    "newline-before-return": "off",
-    "newline-per-chained-call": "off",
-    "no-array-constructor": "error",
-    "no-bitwise": "error",
-    "no-continue": "error",
-    "no-inline-comments": "off",
-    "no-lonely-if": "warn",
-    "no-mixed-spaces-and-tabs": "error",
-    "no-multiple-empty-lines": ["error", { "max": 1 }],
-    "no-negated-condition": "warn",
-    "no-nested-ternary": "error",
-    "no-new-object": "error",
-    "no-plusplus": "off",
-    "no-restricted-syntax": "off",
-    "no-spaced-func": "error",
-    "no-ternary": "off",
-    "no-trailing-spaces": "error",
-    "no-underscore-dangle": ["error", { "allowAfterThis": true }],
-    "no-unneeded-ternary": "error",
-    "no-whitespace-before-property": "error",
-    "object-curly-spacing": ["error", "always"],
-    "one-var": ["error", "never"],
-    "one-var-declaration-per-line": ["error", "always"],
-    "operator-assignment": ["off", "never"],
-    "operator-linebreak": ["error", "after"],
-    "quote-props": ["error", "as-needed"],
-    "quotes": ["error", "single"],
-    "require-jsdoc": "off",
-    "semi": "error",
-    "semi-spacing": ["error", { "before": false, "after": true }],
-    "sort-vars": "off",
-    "space-before-blocks": ["error", "always"],
-    "space-before-function-paren": ["error", "never"],
-    "space-in-parens": "off",
-    "space-infix-ops": "off",
-    "space-unary-ops": "off",
-    "spaced-comment": "error",
-    "wrap-regex": "error",
-
-    # React
-
-    "react/jsx-boolean-value": [2, "always"],
-    "react/jsx-uses-vars": 2,
-    "react/jsx-closing-bracket-location": 2,
-    "react/jsx-tag-spacing": ["error"],
-    "react/jsx-curly-spacing": [2, "never"],
-    "react/jsx-equals-spacing": [2, "never"],
-    "react/jsx-indent-props": [2, 2],
-    "react/jsx-indent": [2, 2],
-    "react/jsx-key": 2,
-    "react/jsx-no-bind": [2, { "allowArrowFunctions": true }],
-    "react/jsx-no-duplicate-props": [2, { "ignoreCase": true }],
-    "react/jsx-max-props-per-line": [2, { "maximum": 2 }],
-    "react/jsx-handler-names": [2, { "eventHandlerPrefix": "(on|dispatch)", "eventHandlerPropPrefix": "on" }],
-    "react/jsx-no-undef": 2,
-    "react/jsx-pascal-case": 2,
-    "react/jsx-uses-react": 2,
-    // Explicitly disabled in case we want to enable them again
-    "react/no-did-mount-set-state": 0,
-    "react/no-did-update-set-state": 0,
-    "react/no-direct-mutation-state": 2,
-    "react/no-multi-comp": [2, { "ignoreStateless": true }],
-    "react/no-unknown-property": 2,
-    "react/prefer-es6-class": 2,
-    "react/prop-types": 2,
-    "react/react-in-jsx-scope": 2,
-    "react/self-closing-comp": 2,
-    "react/sort-comp": 2,
-    "react/jsx-wrap-multilines": 2
-  }
-}

frontend/.eslintrc.js

@@ -0,0 +1,393 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const fs = require('fs');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const path = require('path');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const typescriptEslintRecommended = require('@typescript-eslint/eslint-plugin').configs.recommended;
+
+const frontendFolder = __dirname;
+
+const dirs = fs
+  .readdirSync(path.join(frontendFolder, 'src'), { withFileTypes: true })
+  .filter((dirent) => dirent.isDirectory())
+  .map((dirent) => dirent.name)
+  .join('|');
+
+module.exports = {
+  root: true,
+
+  parser: '@babel/eslint-parser',
+
+  env: {
+    browser: true,
+    commonjs: true,
+    node: true,
+    es6: true
+  },
+
+  globals: {
+    expect: false,
+    chai: false,
+    sinon: false,
+    JSX: true
+  },
+
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module',
+    babelOptions: {
+      configFile: `${frontendFolder}/babel.config.js`
+    },
+    ecmaFeatures: {
+      modules: true,
+      impliedStrict: true
+    }
+  },
+
+  plugins: [
+    'filenames',
+    'react',
+    'react-hooks',
+    'simple-import-sort',
+    'import',
+    '@typescript-eslint',
+    'prettier'
+  ],
+
+  settings: {
+    react: {
+      version: 'detect'
+    }
+  },
+
+  rules: {
+    'filenames/match-exported': ['error'],
+
+    // ECMAScript 6
+
+    'arrow-body-style': [0],
+    'arrow-parens': ['error', 'always'],
+    'arrow-spacing': ['error', { before: true, after: true }],
+    'constructor-super': 'error',
+    'generator-star-spacing': 'off',
+    'no-class-assign': 'error',
+    'no-confusing-arrow': 'error',
+    'no-const-assign': 'error',
+    'no-dupe-class-members': 'error',
+    'no-duplicate-imports': 'error',
+    'no-new-symbol': 'error',
+    'no-this-before-super': 'error',
+    'no-useless-escape': 'error',
+    'no-useless-computed-key': 'error',
+    'no-useless-constructor': 'error',
+    'no-var': 'warn',
+    'object-shorthand': ['error', 'properties'],
+    'prefer-arrow-callback': 'error',
+    'prefer-const': 'warn',
+    'prefer-reflect': 'off',
+    'prefer-rest-params': 'off',
+    'prefer-spread': 'warn',
+    'prefer-template': 'error',
+    'require-yield': 'off',
+    'template-curly-spacing': ['error', 'never'],
+    'yield-star-spacing': 'off',
+
+    // Possible Errors
+
+    'comma-dangle': 'error',
+    'no-cond-assign': 'error',
+    'no-console': 'off',
+    'no-constant-condition': 'warn',
+    'no-control-regex': 'error',
+    'no-debugger': 'off',
+    'no-dupe-args': 'error',
+    'no-dupe-keys': 'error',
+    'no-duplicate-case': 'error',
+    'no-empty': 'warn',
+    'no-empty-character-class': 'error',
+    'no-ex-assign': 'error',
+    'no-extra-boolean-cast': 'error',
+    'no-extra-parens': ['error', 'functions'],
+    'no-extra-semi': 'error',
+    'no-func-assign': 'error',
+    'no-inner-declarations': 'error',
+    'no-invalid-regexp': 'error',
+    'no-irregular-whitespace': 'error',
+    'no-negated-in-lhs': 'error',
+    'no-obj-calls': 'error',
+    'no-regex-spaces': 'error',
+    'no-sparse-arrays': 'error',
+    'no-unexpected-multiline': 'error',
+    'no-unreachable': 'warn',
+    'no-unsafe-finally': 'error',
+    'use-isnan': 'error',
+    'valid-jsdoc': 'off',
+    'valid-typeof': 'error',
+
+    // Best Practices
+
+    'accessor-pairs': 'off',
+    'array-callback-return': 'warn',
+    'block-scoped-var': 'warn',
+    'consistent-return': 'off',
+    curly: 'error',
+    'default-case': 'error',
+    'dot-location': ['error', 'property'],
+    'dot-notation': 'error',
+    eqeqeq: ['error', 'smart'],
+    'guard-for-in': 'error',
+    'no-alert': 'warn',
+    'no-caller': 'error',
+    'no-case-declarations': 'error',
+    'no-div-regex': 'error',
+    'no-else-return': 'error',
+    'no-empty-function': ['error', { allow: ['arrowFunctions'] }],
+    'no-empty-pattern': 'error',
+    'no-eval': 'error',
+    'no-extend-native': 'error',
+    'no-extra-bind': 'error',
+    'no-fallthrough': 'error',
+    'no-floating-decimal': 'error',
+    'no-implicit-coercion': ['error', {
+      boolean: false,
+      number: true,
+      string: true,
+      allow: [/* "!!", "~", "*", "+" */]
+    }],
+    'no-implicit-globals': 'error',
+    'no-implied-eval': 'error',
+    'no-invalid-this': 'off',
+    'no-iterator': 'error',
+    'no-labels': 'error',
+    'no-lone-blocks': 'error',
+    'no-loop-func': 'error',
+    'no-magic-numbers': ['off', { ignoreArrayIndexes: true, ignore: [0, 1] }],
+    'no-multi-spaces': 'error',
+    'no-multi-str': 'error',
+    'no-native-reassign': ['error', { exceptions: ['console'] }],
+    'no-new': 'off',
+    'no-new-func': 'error',
+    'no-new-wrappers': 'error',
+    'no-octal': 'error',
+    'no-octal-escape': 'error',
+    'no-param-reassign': 'off',
+    'no-process-env': 'off',
+    'no-proto': 'error',
+    'no-redeclare': 'error',
+    'no-return-assign': 'warn',
+    'no-script-url': 'error',
+    'no-self-assign': 'error',
+    'no-self-compare': 'error',
+    'no-sequences': 'error',
+    'no-throw-literal': 'error',
+    'no-unmodified-loop-condition': 'error',
+    'no-unused-expressions': 'error',
+    'no-unused-labels': 'error',
+    'no-useless-call': 'error',
+    'no-useless-concat': 'error',
+    'no-void': 'error',
+    'no-warning-comments': 'off',
+    'no-with': 'error',
+    radix: ['error', 'as-needed'],
+    'vars-on-top': 'off',
+    'wrap-iife': ['error', 'inside'],
+    yoda: 'error',
+
+    // Strict Mode
+
+    strict: ['error', 'never'],
+
+    // Variables
+
+    'init-declarations': ['error', 'always'],
+    'no-catch-shadow': 'error',
+    'no-delete-var': 'error',
+    'no-label-var': 'error',
+    'no-restricted-globals': 'off',
+    'no-shadow': 'error',
+    'no-shadow-restricted-names': 'error',
+    'no-undef': 'error',
+    'no-undef-init': 'off',
+    'no-undefined': 'off',
+    'no-unused-vars': ['error', { args: 'none', ignoreRestSiblings: true }],
+    'no-use-before-define': 'error',
+
+    // Node.js and CommonJS
+
+    'callback-return': 'warn',
+    'global-require': 'error',
+    'handle-callback-err': 'warn',
+    'no-mixed-requires': 'error',
+    'no-new-require': 'error',
+    'no-path-concat': 'error',
+    'no-process-exit': 'error',
+
+    // Stylistic Issues
+
+    'array-bracket-spacing': ['error', 'never'],
+    'block-spacing': ['error', 'always'],
+    'brace-style': ['error', '1tbs', { allowSingleLine: false }],
+    camelcase: 'off',
+    'comma-spacing': ['error', { before: false, after: true }],
+    'comma-style': ['error', 'last'],
+    'computed-property-spacing': ['error', 'never'],
+    'consistent-this': ['error', 'self'],
+    'eol-last': 'error',
+    'func-names': 'off',
+    'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
+    indent: ['error', 2, { SwitchCase: 1 }],
+    'key-spacing': ['error', { beforeColon: false, afterColon: true }],
+    'keyword-spacing': ['error', { before: true, after: true }],
+    'lines-around-comment': ['error', { beforeBlockComment: true, afterBlockComment: false }],
+    'max-depth': ['error', { maximum: 5 }],
+    'max-nested-callbacks': ['error', 4],
+    'max-statements': 'off',
+    'max-statements-per-line': ['error', { max: 1 }],
+    'new-cap': ['error', { capIsNewExceptions: ['$.Deferred', 'DragDropContext', 'DragLayer', 'DragSource', 'DropTarget'] }],
+    'new-parens': 'error',
+    'newline-after-var': 'off',
+    'newline-before-return': 'off',
+    'newline-per-chained-call': 'off',
+    'no-array-constructor': 'error',
+    'no-bitwise': 'error',
+    'no-continue': 'error',
+    'no-inline-comments': 'off',
+    'no-lonely-if': 'warn',
+    'no-mixed-spaces-and-tabs': 'error',
+    'no-multiple-empty-lines': ['error', { max: 1 }],
+    'no-negated-condition': 'warn',
+    'no-nested-ternary': 'error',
+    'no-new-object': 'error',
+    'no-plusplus': 'off',
+    'no-restricted-syntax': 'off',
+    'no-spaced-func': 'error',
+    'no-ternary': 'off',
+    'no-trailing-spaces': 'error',
+    'no-underscore-dangle': ['error', { allowAfterThis: true }],
+    'no-unneeded-ternary': 'error',
+    'no-whitespace-before-property': 'error',
+    'object-curly-spacing': ['error', 'always'],
+    'one-var': ['error', 'never'],
+    'one-var-declaration-per-line': ['error', 'always'],
+    'operator-assignment': ['off', 'never'],
+    'operator-linebreak': ['error', 'after'],
+    'quote-props': ['error', 'as-needed'],
+    quotes: ['error', 'single'],
+    'require-jsdoc': 'off',
+    semi: 'error',
+    'semi-spacing': ['error', { before: false, after: true }],
+    'sort-vars': 'off',
+    'space-before-blocks': ['error', 'always'],
+    'space-before-function-paren': ['error', 'never'],
+    'space-in-parens': 'off',
+    'space-infix-ops': 'off',
+    'space-unary-ops': 'off',
+    'spaced-comment': 'error',
+    'wrap-regex': 'error',
+
+    // ImportSort
+
+    'simple-import-sort/imports': 'error',
+    'import/newline-after-import': 'error',
+
+    // React
+
+    'react/jsx-boolean-value': [2, 'always'],
+    'react/jsx-uses-vars': 2,
+    'react/jsx-closing-bracket-location': 2,
+    'react/jsx-tag-spacing': ['error'],
+    'react/jsx-curly-spacing': [2, 'never'],
+    'react/jsx-equals-spacing': [2, 'never'],
+    'react/jsx-indent-props': [2, 2],
+    'react/jsx-indent': [2, 2, { indentLogicalExpressions: true }],
+    'react/jsx-key': 2,
+    'react/jsx-no-bind': [2, { allowArrowFunctions: true }],
+    'react/jsx-no-duplicate-props': [2, { ignoreCase: true }],
+    'react/jsx-max-props-per-line': [2, { maximum: 2 }],
+    'react/jsx-handler-names': [2, { eventHandlerPrefix: '(on|dispatch)', eventHandlerPropPrefix: 'on' }],
+    'react/jsx-no-undef': 2,
+    'react/jsx-pascal-case': 2,
+    'react/jsx-uses-react': 2,
+    // Explicitly disabled in case we want to enable them again
+    'react/no-did-mount-set-state': 0,
+    'react/no-did-update-set-state': 0,
+    'react/no-direct-mutation-state': 2,
+    'react/no-multi-comp': [2, { ignoreStateless: true }],
+    'react/no-unknown-property': 2,
+    'react/prefer-es6-class': 2,
+    'react/prop-types': 2,
+    'react/react-in-jsx-scope': 2,
+    'react/self-closing-comp': 2,
+    'react/sort-comp': 2,
+    'react/jsx-wrap-multilines': 2,
+    'react-hooks/rules-of-hooks': 'error',
+    'react-hooks/exhaustive-deps': 'error'
+  },
+  overrides: [
+    {
+      files: [
+        '*.js'
+      ],
+      rules: {
+        'simple-import-sort/imports': [
+          'error',
+          {
+            groups: [
+              // Packages
+              // Absolute Paths
+              // Relative Paths
+              // Css
+              ['^@?\\w', `^(${dirs})(/.*|$)`, '^\\.', '^\\..*css$']
+            ]
+          }
+        ]
+      }
+    },
+    {
+      files: [
+        '*.ts',
+        '*.tsx'
+      ],
+
+      parser: '@typescript-eslint/parser',
+      parserOptions: {
+        project: './tsconfig.json'
+      },
+
+      extends: [
+        'prettier'
+      ],
+
+      rules: Object.assign(typescriptEslintRecommended.rules, {
+        'no-shadow': 'off',
+        // These should be enabled after cleaning things up
+        '@typescript-eslint/no-unused-vars': 'warn',
+        '@typescript-eslint/explicit-function-return-type': 'off',
+        'react/prop-types': 'off',
+        'prettier/prettier': 'error',
+        'simple-import-sort/imports': [
+          'error',
+          {
+            groups: [
+              // Packages
+              // Absolute Paths
+              // Relative Paths
+              // Css
+              ['^@?\\w', `^(${dirs})(/.*|$)`, '^\\.', '^\\..*css$']
+            ]
+          }
+        ]
+      })
+    },
+    {
+      files: [
+        '*.css.d.ts'
+      ],
+      rules: {
+        'filenames/match-exported': 'off',
+        'init-declarations': 'off',
+        'prettier/prettier': 'off'
+      }
+    }
+  ]
+};

frontend/.jsbeautifyrc

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

frontend/.prettierignore

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

frontend/.prettierrc.json

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

frontend/.stylelintrc

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

frontend/.vscode/extensions.json

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

frontend/.vscode/settings.json

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

frontend/babel.config.js

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

frontend/build/webpack.config.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 const path = require('path');
 const webpack = require('webpack');
 const FileManagerPlugin = require('filemanager-webpack-plugin');
@@ -5,6 +6,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const LiveReloadPlugin = require('webpack-livereload-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
+const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 
 module.exports = (env) => {
   const uiFolder = 'UI';
@@ -34,41 +36,54 @@ module.exports = (env) => {
     },
 
     entry: {
-      index: 'index.js'
+      index: 'index.ts'
     },
 
     resolve: {
+      extensions: [
+        '.ts',
+        '.tsx',
+        '.js'
+      ],
       modules: [
         srcFolder,
         path.join(srcFolder, 'Shims'),
         'node_modules'
       ],
       alias: {
-        jquery: 'jquery/src/jquery',
+        jquery: 'jquery/dist/jquery.min',
         'react-middle-truncate': 'react-middle-truncate/lib/react-middle-truncate'
+      },
+      fallback: {
+        buffer: false,
+        http: false,
+        https: false,
+        url: false,
+        util: false,
+        net: false
       }
     },
 
     output: {
       path: distFolder,
       publicPath: '/',
-      filename: '[name].js',
+      filename: '[name]-[contenthash].js',
       sourceMapFilename: '[file].map'
     },
 
     optimization: {
       moduleIds: 'deterministic',
-      chunkIds: 'named',
-      splitChunks: {
-        chunks: 'initial',
-        name: 'vendors'
-      }
+      chunkIds: isProduction ? 'deterministic' : 'named'
     },
 
     performance: {
       hints: false
     },
 
+    experiments: {
+      topLevelAwait: true
+    },
+
     plugins: [
       new webpack.DefinePlugin({
         __DEV__: !isProduction,
@@ -76,13 +91,15 @@ module.exports = (env) => {
       }),
 
       new MiniCssExtractPlugin({
-        filename: 'Content/styles.css'
+        filename: 'Content/styles.css',
+        chunkFilename: 'Content/[id]-[chunkhash].css'
       }),
 
       new HtmlWebpackPlugin({
         template: 'frontend/src/index.ejs',
         filename: 'index.html',
-        publicPath: '/'
+        publicPath: '/',
+        inject: false
       }),
 
       new FileManagerPlugin({
@@ -123,6 +140,8 @@ module.exports = (env) => {
         }
       }),
 
+      new ForkTsCheckerWebpackPlugin(),
+
       new LiveReloadPlugin()
     ],
 
@@ -146,7 +165,7 @@ module.exports = (env) => {
           }
         },
         {
-          test: /\.js?$/,
+          test: [/\.jsx?$/, /\.tsx?$/],
           exclude: /(node_modules|JsLibraries)/,
           use: [
             {
@@ -177,6 +196,7 @@ module.exports = (env) => {
           exclude: /(node_modules|globals.css)/,
           use: [
             { loader: MiniCssExtractPlugin.loader },
+            { loader: 'css-modules-typescript-loader' },
             {
               loader: 'css-loader',
               options: {
@@ -245,18 +265,19 @@ module.exports = (env) => {
     config.resolve.alias['react-dom$'] = 'react-dom/profiling';
     config.resolve.alias['scheduler/tracing'] = 'scheduler/tracing-profiling';
 
-    config.optimization.minimizer = [
-      new TerserPlugin({
-        cache: true,
-        parallel: true,
-        sourceMap: true, // Must be set to true if using source-maps in production
-        terserOptions: {
-          mangle: false,
-          keep_classnames: true,
-          keep_fnames: true
-        }
-      })
-    ];
+    config.optimization = {
+      minimize: true,
+      minimizer: [
+        new TerserPlugin({
+          terserOptions: {
+            sourceMap: true, // Must be set to true if using source-maps in production
+            mangle: false,
+            keep_classnames: true,
+            keep_fnames: true
+          }
+        })
+      ]
+    };
   }
 
   return config;

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

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

frontend/jsconfig.json

@@ -1,20 +0,0 @@
-{
-    "compilerOptions": {
-        "target": "es6",
-        "checkJs": false,
-        "baseUrl": "src",
-        "jsx": "react",
-        "module": "commonjs",
-        "moduleResolution": "node",
-        "paths": {
-            "*": [
-                "*"
-            ]
-        }
-    },
-    "include": [
-        "./src/**/*"
-    ],
-    "exclude": [
-    ]
-}

frontend/postcss.config.js

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

frontend/src/.vscode/settings.json

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

frontend/src/Activity/Blocklist/Blocklist.js

@@ -1,23 +1,25 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import getRemovedItems from 'Utilities/Object/getRemovedItems';
-import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
-import getSelectedIds from 'Utilities/Table/getSelectedIds';
-import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
-import selectAll from 'Utilities/Table/selectAll';
-import toggleSelected from 'Utilities/Table/toggleSelected';
-import { align, icons, kinds } from 'Helpers/Props';
+import Alert from 'Components/Alert';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
+import PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
+import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
+import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
 import TablePager from 'Components/Table/TablePager';
-import PageContent from 'Components/Page/PageContent';
-import PageContentBody from 'Components/Page/PageContentBody';
-import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
-import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
-import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
+import { align, icons, kinds } from 'Helpers/Props';
+import getRemovedItems from 'Utilities/Object/getRemovedItems';
+import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
+import translate from 'Utilities/String/translate';
+import getSelectedIds from 'Utilities/Table/getSelectedIds';
+import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
+import selectAll from 'Utilities/Table/selectAll';
+import toggleSelected from 'Utilities/Table/toggleSelected';
 import BlocklistRowConnector from './BlocklistRowConnector';
 
 class Blocklist extends Component {
@@ -34,6 +36,7 @@ class Blocklist extends Component {
       lastToggled: null,
       selectedState: {},
       isConfirmRemoveModalOpen: false,
+      isConfirmClearModalOpen: false,
       items: props.items
     };
   }
@@ -60,33 +63,46 @@ class Blocklist extends Component {
 
   getSelectedIds = () => {
     return getSelectedIds(this.state.selectedState);
-  }
+  };
 
   //
   // Listeners
 
   onSelectAllChange = ({ value }) => {
     this.setState(selectAll(this.state.selectedState, value));
-  }
+  };
 
   onSelectedChange = ({ id, value, shiftKey = false }) => {
     this.setState((state) => {
       return toggleSelected(state, this.props.items, id, value, shiftKey);
     });
-  }
+  };
 
   onRemoveSelectedPress = () => {
     this.setState({ isConfirmRemoveModalOpen: true });
-  }
+  };
 
   onRemoveSelectedConfirmed = () => {
     this.props.onRemoveSelected(this.getSelectedIds());
     this.setState({ isConfirmRemoveModalOpen: false });
-  }
+  };
 
   onConfirmRemoveModalClose = () => {
     this.setState({ isConfirmRemoveModalOpen: false });
-  }
+  };
+
+  onClearBlocklistPress = () => {
+    this.setState({ isConfirmClearModalOpen: true });
+  };
+
+  onClearBlocklistConfirmed = () => {
+    this.props.onClearBlocklistPress();
+    this.setState({ isConfirmClearModalOpen: false });
+  };
+
+  onConfirmClearModalClose = () => {
+    this.setState({ isConfirmClearModalOpen: false });
+  };
 
   //
   // Render
@@ -101,7 +117,6 @@ class Blocklist extends Component {
       totalRecords,
       isRemoving,
       isClearingBlocklistExecuting,
-      onClearBlocklistPress,
       ...otherProps
     } = this.props;
 
@@ -109,17 +124,18 @@ class Blocklist extends Component {
       allSelected,
       allUnselected,
       selectedState,
-      isConfirmRemoveModalOpen
+      isConfirmRemoveModalOpen,
+      isConfirmClearModalOpen
     } = this.state;
 
     const selectedIds = this.getSelectedIds();
 
     return (
-      <PageContent title="Blocklist">
+      <PageContent title={translate('Blocklist')}>
         <PageToolbar>
           <PageToolbarSection>
             <PageToolbarButton
-              label="Remove Selected"
+              label={translate('RemoveSelected')}
               iconName={icons.REMOVE}
               isDisabled={!selectedIds.length}
               isSpinning={isRemoving}
@@ -127,10 +143,11 @@ class Blocklist extends Component {
             />
 
             <PageToolbarButton
-              label="Clear"
+              label={translate('Clear')}
               iconName={icons.CLEAR}
+              isDisabled={!items.length}
               isSpinning={isClearingBlocklistExecuting}
-              onPress={onClearBlocklistPress}
+              onPress={this.onClearBlocklistPress}
             />
           </PageToolbarSection>
 
@@ -140,7 +157,7 @@ class Blocklist extends Component {
               columns={columns}
             >
               <PageToolbarButton
-                label="Options"
+                label={translate('Options')}
                 iconName={icons.TABLE}
               />
             </TableOptionsModalWrapper>
@@ -150,67 +167,79 @@ class Blocklist extends Component {
         <PageContentBody>
           {
             isFetching && !isPopulated &&
-            <LoadingIndicator />
+              <LoadingIndicator />
           }
 
           {
             !isFetching && !!error &&
-            <div>Unable to load blocklist</div>
+              <Alert kind={kinds.DANGER}>
+                {translate('BlocklistLoadError')}
+              </Alert>
           }
 
           {
             isPopulated && !error && !items.length &&
-            <div>
-              No history blocklist
-            </div>
+              <Alert kind={kinds.INFO}>
+                {translate('NoHistoryBlocklist')}
+              </Alert>
           }
 
           {
             isPopulated && !error && !!items.length &&
-            <div>
-              <Table
-                selectAll={true}
-                allSelected={allSelected}
-                allUnselected={allUnselected}
-                columns={columns}
-                {...otherProps}
-                onSelectAllChange={this.onSelectAllChange}
-              >
-                <TableBody>
-                  {
-                    items.map((item) => {
-                      return (
-                        <BlocklistRowConnector
-                          key={item.id}
-                          isSelected={selectedState[item.id] || false}
-                          columns={columns}
-                          {...item}
-                          onSelectedChange={this.onSelectedChange}
-                        />
-                      );
-                    })
-                  }
-                </TableBody>
-              </Table>
+              <div>
+                <Table
+                  selectAll={true}
+                  allSelected={allSelected}
+                  allUnselected={allUnselected}
+                  columns={columns}
+                  {...otherProps}
+                  onSelectAllChange={this.onSelectAllChange}
+                >
+                  <TableBody>
+                    {
+                      items.map((item) => {
+                        return (
+                          <BlocklistRowConnector
+                            key={item.id}
+                            isSelected={selectedState[item.id] || false}
+                            columns={columns}
+                            {...item}
+                            onSelectedChange={this.onSelectedChange}
+                          />
+                        );
+                      })
+                    }
+                  </TableBody>
+                </Table>
 
-              <TablePager
-                totalRecords={totalRecords}
-                isFetching={isFetching}
-                {...otherProps}
-              />
-            </div>
+                <TablePager
+                  totalRecords={totalRecords}
+                  isFetching={isFetching}
+                  {...otherProps}
+                />
+              </div>
           }
         </PageContentBody>
 
         <ConfirmModal
           isOpen={isConfirmRemoveModalOpen}
           kind={kinds.DANGER}
-          title="Remove Selected"
-          message={'Are you sure you want to remove the selected items from the blocklist?'}
-          confirmLabel="Remove Selected"
+          title={translate('RemoveSelected')}
+          message={translate('RemoveSelectedBlocklistMessageText')}
+          confirmLabel={translate('RemoveSelected')}
           onConfirm={this.onRemoveSelectedConfirmed}
           onCancel={this.onConfirmRemoveModalClose}
         />
+
+        <ConfirmModal
+          isOpen={isConfirmClearModalOpen}
+          kind={kinds.DANGER}
+          title={translate('ClearBlocklist')}
+          message={translate('ClearBlocklistMessageText')}
+          confirmLabel={translate('Clear')}
+          onConfirm={this.onClearBlocklistConfirmed}
+          onCancel={this.onConfirmClearModalClose}
+        />
       </PageContent>
     );
   }

frontend/src/Activity/Blocklist/BlocklistConnector.js

@@ -2,12 +2,12 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
+import * as commandNames from 'Commands/commandNames';
 import withCurrentPage from 'Components/withCurrentPage';
-import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import * as blocklistActions from 'Store/Actions/blocklistActions';
 import { executeCommand } from 'Store/Actions/commandActions';
-import * as commandNames from 'Commands/commandNames';
+import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
+import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
 import Blocklist from './Blocklist';
 
 function createMapStateToProps() {
@@ -65,49 +65,41 @@ class BlocklistConnector extends Component {
 
   repopulate = () => {
     this.props.fetchBlocklist();
-  }
+  };
   //
   // Listeners
 
   onFirstPagePress = () => {
     this.props.gotoBlocklistFirstPage();
-  }
+  };
 
   onPreviousPagePress = () => {
     this.props.gotoBlocklistPreviousPage();
-  }
+  };
 
   onNextPagePress = () => {
     this.props.gotoBlocklistNextPage();
-  }
+  };
 
   onLastPagePress = () => {
     this.props.gotoBlocklistLastPage();
-  }
+  };
 
   onPageSelect = (page) => {
     this.props.gotoBlocklistPage({ page });
-  }
+  };
 
   onRemoveSelected = (ids) => {
     this.props.removeBlocklistItems({ ids });
-  }
+  };
 
   onSortPress = (sortKey) => {
     this.props.setBlocklistSort({ sortKey });
-  }
-
-  onTableOptionChange = (payload) => {
-    this.props.setBlocklistTableOption(payload);
-
-    if (payload.pageSize) {
-      this.props.gotoBlocklistFirstPage();
-    }
-  }
+  };
 
   onClearBlocklistPress = () => {
     this.props.executeCommand({ name: commandNames.CLEAR_BLOCKLIST });
-  }
+  };
 
   onTableOptionChange = (payload) => {
     this.props.setBlocklistTableOption(payload);
@@ -115,7 +107,7 @@ class BlocklistConnector extends Component {
     if (payload.pageSize) {
       this.props.gotoBlocklistFirstPage();
     }
-  }
+  };
 
   //
   // Render

frontend/src/Activity/Blocklist/BlocklistDetailsModal.js

@@ -1,13 +1,14 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Button from 'Components/Link/Button';
 import DescriptionList from 'Components/DescriptionList/DescriptionList';
 import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
+import Button from 'Components/Link/Button';
 import Modal from 'Components/Modal/Modal';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalHeader from 'Components/Modal/ModalHeader';
 import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import translate from 'Utilities/String/translate';
 
 class BlocklistDetailsModal extends Component {
 
@@ -39,19 +40,19 @@ class BlocklistDetailsModal extends Component {
           <ModalBody>
             <DescriptionList>
               <DescriptionListItem
-                title="Name"
+                title={translate('Name')}
                 data={sourceTitle}
               />
 
               <DescriptionListItem
-                title="Protocol"
+                title={translate('Protocol')}
                 data={protocol}
               />
 
               {
                 !!message &&
                   <DescriptionListItem
-                    title="Indexer"
+                    title={translate('Indexer')}
                     data={indexer}
                   />
               }
@@ -59,7 +60,7 @@ class BlocklistDetailsModal extends Component {
               {
                 !!message &&
                   <DescriptionListItem
-                    title="Message"
+                    title={translate('Message')}
                     data={message}
                   />
               }
@@ -68,7 +69,7 @@ class BlocklistDetailsModal extends Component {
 
           <ModalFooter>
             <Button onPress={onModalClose}>
-              Close
+              {translate('Close')}
             </Button>
           </ModalFooter>
         </ModalContent>

frontend/src/Activity/Blocklist/BlocklistRow.css

@@ -1,4 +1,4 @@
-.language,
+.languages,
 .quality {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 

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

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

frontend/src/Activity/Blocklist/BlocklistRow.js

@@ -1,14 +1,16 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { icons, kinds } from 'Helpers/Props';
 import IconButton from 'Components/Link/IconButton';
-import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
-import TableRow from 'Components/Table/TableRow';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import EpisodeLanguage from 'Episode/EpisodeLanguage';
+import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
+import TableRow from 'Components/Table/TableRow';
+import EpisodeFormats from 'Episode/EpisodeFormats';
+import EpisodeLanguages from 'Episode/EpisodeLanguages';
 import EpisodeQuality from 'Episode/EpisodeQuality';
+import { icons, kinds } from 'Helpers/Props';
 import SeriesTitleLink from 'Series/SeriesTitleLink';
+import translate from 'Utilities/String/translate';
 import BlocklistDetailsModal from './BlocklistDetailsModal';
 import styles from './BlocklistRow.css';
 
@@ -30,11 +32,11 @@ class BlocklistRow extends Component {
 
   onDetailsPress = () => {
     this.setState({ isDetailsModalOpen: true });
-  }
+  };
 
   onDetailsModalClose = () => {
     this.setState({ isDetailsModalOpen: false });
-  }
+  };
 
   //
   // Render
@@ -44,8 +46,9 @@ class BlocklistRow extends Component {
       id,
       series,
       sourceTitle,
-      language,
+      languages,
       quality,
+      customFormats,
       date,
       protocol,
       indexer,
@@ -94,14 +97,14 @@ class BlocklistRow extends Component {
               );
             }
 
-            if (name === 'language') {
+            if (name === 'languages') {
               return (
                 <TableRowCell
                   key={name}
-                  className={styles.language}
+                  className={styles.languages}
                 >
-                  <EpisodeLanguage
-                    language={language}
+                  <EpisodeLanguages
+                    languages={languages}
                   />
                 </TableRowCell>
               );
@@ -120,6 +123,16 @@ class BlocklistRow extends Component {
               );
             }
 
+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <EpisodeFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
             if (name === 'date') {
               return (
                 <RelativeDateCellConnector
@@ -152,7 +165,7 @@ class BlocklistRow extends Component {
                   />
 
                   <IconButton
-                    title="Remove from blocklist"
+                    title={translate('RemoveFromBlocklist')}
                     name={icons.REMOVE}
                     kind={kinds.DANGER}
                     onPress={onRemovePress}
@@ -183,8 +196,9 @@ BlocklistRow.propTypes = {
   id: PropTypes.number.isRequired,
   series: PropTypes.object.isRequired,
   sourceTitle: PropTypes.string.isRequired,
-  language: PropTypes.object.isRequired,
+  languages: PropTypes.arrayOf(PropTypes.object).isRequired,
   quality: PropTypes.object.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object).isRequired,
   date: PropTypes.string.isRequired,
   protocol: PropTypes.string.isRequired,
   indexer: PropTypes.string,

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

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

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

@@ -1,13 +1,14 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import formatAge from 'Utilities/Number/formatAge';
-import formatDateTime from 'Utilities/Date/formatDateTime';
-import formatPreferredWordScore from 'Utilities/Number/formatPreferredWordScore';
-import Link from 'Components/Link/Link';
 import DescriptionList from 'Components/DescriptionList/DescriptionList';
 import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
-import DescriptionListItemTitle from 'Components/DescriptionList/DescriptionListItemTitle';
 import DescriptionListItemDescription from 'Components/DescriptionList/DescriptionListItemDescription';
+import DescriptionListItemTitle from 'Components/DescriptionList/DescriptionListItemTitle';
+import Link from 'Components/Link/Link';
+import formatDateTime from 'Utilities/Date/formatDateTime';
+import formatAge from 'Utilities/Number/formatAge';
+import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
+import translate from 'Utilities/String/translate';
 import styles from './HistoryDetails.css';
 
 function HistoryDetails(props) {
@@ -15,6 +16,7 @@ function HistoryDetails(props) {
     eventType,
     sourceTitle,
     data,
+    downloadId,
     shortDateFormat,
     timeFormat
   } = props;
@@ -23,12 +25,11 @@ function HistoryDetails(props) {
     const {
       indexer,
       releaseGroup,
-      preferredWordScore,
       seriesMatchType,
+      customFormatScore,
       nzbInfoUrl,
       downloadClient,
       downloadClientName,
-      downloadId,
       age,
       ageHours,
       ageMinutes,
@@ -41,14 +42,14 @@ function HistoryDetails(props) {
       <DescriptionList>
         <DescriptionListItem
           descriptionClassName={styles.description}
-          title="Name"
+          title={translate('Name')}
           data={sourceTitle}
         />
 
         {
           indexer ?
             <DescriptionListItem
-              title="Indexer"
+              title={translate('Indexer')}
               data={indexer}
             /> :
             null
@@ -58,17 +59,17 @@ function HistoryDetails(props) {
           releaseGroup ?
             <DescriptionListItem
               descriptionClassName={styles.description}
-              title="Release Group"
+              title={translate('ReleaseGroup')}
               data={releaseGroup}
             /> :
             null
         }
 
         {
-          preferredWordScore && preferredWordScore !== '0' ?
+          customFormatScore && customFormatScore !== '0' ?
             <DescriptionListItem
-              title="Preferred Word Score"
-              data={formatPreferredWordScore(preferredWordScore)}
+              title={translate('CustomFormatScore')}
+              data={formatCustomFormatScore(customFormatScore)}
             /> :
             null
         }
@@ -77,7 +78,7 @@ function HistoryDetails(props) {
           seriesMatchType ?
             <DescriptionListItem
               descriptionClassName={styles.description}
-              title="Series Match Type"
+              title={translate('SeriesMatchType')}
               data={seriesMatchType}
             /> :
             null
@@ -87,7 +88,7 @@ function HistoryDetails(props) {
           nzbInfoUrl ?
             <span>
               <DescriptionListItemTitle>
-                Info URL
+                {translate('InfoUrl')}
               </DescriptionListItemTitle>
 
               <DescriptionListItemDescription>
@@ -100,7 +101,7 @@ function HistoryDetails(props) {
         {
           downloadClientNameInfo ?
             <DescriptionListItem
-              title="Download Client"
+              title={translate('DownloadClient')}
               data={downloadClientNameInfo}
             /> :
             null
@@ -109,7 +110,7 @@ function HistoryDetails(props) {
         {
           downloadId ?
             <DescriptionListItem
-              title="Grab ID"
+              title={translate('GrabId')}
               data={downloadId}
             /> :
             null
@@ -118,7 +119,7 @@ function HistoryDetails(props) {
         {
           age || ageHours || ageMinutes ?
             <DescriptionListItem
-              title="Age (when grabbed)"
+              title={translate('AgeWhenGrabbed')}
               data={formatAge(age, ageHours, ageMinutes)}
             /> :
             null
@@ -127,7 +128,7 @@ function HistoryDetails(props) {
         {
           publishedDate ?
             <DescriptionListItem
-              title="Published Date"
+              title={translate('PublishedDate')}
               data={formatDateTime(publishedDate, shortDateFormat, timeFormat, { includeSeconds: true })}
             /> :
             null
@@ -145,14 +146,23 @@ function HistoryDetails(props) {
       <DescriptionList>
         <DescriptionListItem
           descriptionClassName={styles.description}
-          title="Name"
+          title={translate('Name')}
           data={sourceTitle}
         />
 
+        {
+          downloadId ?
+            <DescriptionListItem
+              title={translate('GrabId')}
+              data={downloadId}
+            /> :
+            null
+        }
+
         {
           message ?
             <DescriptionListItem
-              title="Message"
+              title={translate('Message')}
               data={message}
             /> :
             null
@@ -163,7 +173,7 @@ function HistoryDetails(props) {
 
   if (eventType === 'downloadFolderImported') {
     const {
-      preferredWordScore,
+      customFormatScore,
       droppedPath,
       importedPath
     } = data;
@@ -172,7 +182,7 @@ function HistoryDetails(props) {
       <DescriptionList>
         <DescriptionListItem
           descriptionClassName={styles.description}
-          title="Name"
+          title={translate('Name')}
           data={sourceTitle}
         />
 
@@ -180,7 +190,7 @@ function HistoryDetails(props) {
           droppedPath ?
             <DescriptionListItem
               descriptionClassName={styles.description}
-              title="Source"
+              title={translate('Source')}
               data={droppedPath}
             /> :
             null
@@ -190,17 +200,17 @@ function HistoryDetails(props) {
           importedPath ?
             <DescriptionListItem
               descriptionClassName={styles.description}
-              title="Imported To"
+              title={translate('ImportedTo')}
               data={importedPath}
             /> :
             null
         }
 
         {
-          preferredWordScore && preferredWordScore !== '0' ?
+          customFormatScore && customFormatScore !== '0' ?
             <DescriptionListItem
-              title="Preferred Word Score"
-              data={formatPreferredWordScore(preferredWordScore)}
+              title={translate('CustomFormatScore')}
+              data={formatCustomFormatScore(customFormatScore)}
             /> :
             null
         }
@@ -211,20 +221,20 @@ function HistoryDetails(props) {
   if (eventType === 'episodeFileDeleted') {
     const {
       reason,
-      preferredWordScore
+      customFormatScore
     } = data;
 
     let reasonMessage = '';
 
     switch (reason) {
       case 'Manual':
-        reasonMessage = 'File was deleted by via UI';
+        reasonMessage = translate('DeletedReasonManual');
         break;
       case 'MissingFromDisk':
-        reasonMessage = 'Sonarr was unable to find the file on disk so the file was unlinked from the episode in the database';
+        reasonMessage = translate('DeletedReasonEpisodeMissingFromDisk');
         break;
       case 'Upgrade':
-        reasonMessage = 'File was deleted to import an upgrade';
+        reasonMessage = translate('DeletedReasonUpgrade');
         break;
       default:
         reasonMessage = '';
@@ -233,20 +243,20 @@ function HistoryDetails(props) {
     return (
       <DescriptionList>
         <DescriptionListItem
-          title="Name"
+          title={translate('Name')}
           data={sourceTitle}
         />
 
         <DescriptionListItem
-          title="Reason"
+          title={translate('Reason')}
           data={reasonMessage}
         />
 
         {
-          preferredWordScore && preferredWordScore !== '0' ?
+          customFormatScore && customFormatScore !== '0' ?
             <DescriptionListItem
-              title="Preferred Word Score"
-              data={formatPreferredWordScore(preferredWordScore)}
+              title={translate('CustomFormatScore')}
+              data={formatCustomFormatScore(customFormatScore)}
             /> :
             null
         }
@@ -265,22 +275,22 @@ function HistoryDetails(props) {
     return (
       <DescriptionList>
         <DescriptionListItem
-          title="Source Path"
+          title={translate('SourcePath')}
           data={sourcePath}
         />
 
         <DescriptionListItem
-          title="Source Relative Path"
+          title={translate('SourceRelativePath')}
           data={sourceRelativePath}
         />
 
         <DescriptionListItem
-          title="Destination Path"
+          title={translate('DestinationPath')}
           data={path}
         />
 
         <DescriptionListItem
-          title="Destination Relative Path"
+          title={translate('DestinationRelativePath')}
           data={relativePath}
         />
       </DescriptionList>
@@ -296,14 +306,23 @@ function HistoryDetails(props) {
       <DescriptionList>
         <DescriptionListItem
           descriptionClassName={styles.description}
-          title="Name"
+          title={translate('Name')}
           data={sourceTitle}
         />
 
+        {
+          downloadId ?
+            <DescriptionListItem
+              title={translate('GrabId')}
+              data={downloadId}
+            /> :
+            null
+        }
+
         {
           message ?
             <DescriptionListItem
-              title="Message"
+              title={translate('Message')}
               data={message}
             /> :
             null
@@ -316,7 +335,7 @@ function HistoryDetails(props) {
     <DescriptionList>
       <DescriptionListItem
         descriptionClassName={styles.description}
-        title="Name"
+        title={translate('Name')}
         data={sourceTitle}
       />
     </DescriptionList>
@@ -327,6 +346,7 @@ HistoryDetails.propTypes = {
   eventType: PropTypes.string.isRequired,
   sourceTitle: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired,
+  downloadId: PropTypes.string,
   shortDateFormat: PropTypes.string.isRequired,
   timeFormat: PropTypes.string.isRequired
 };

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

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

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

@@ -1,32 +1,33 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import { kinds } from 'Helpers/Props';
 import Button from 'Components/Link/Button';
 import SpinnerButton from 'Components/Link/SpinnerButton';
 import Modal from 'Components/Modal/Modal';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalHeader from 'Components/Modal/ModalHeader';
 import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import { kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import HistoryDetails from './HistoryDetails';
 import styles from './HistoryDetailsModal.css';
 
 function getHeaderTitle(eventType) {
   switch (eventType) {
     case 'grabbed':
-      return 'Grabbed';
+      return translate('Grabbed');
     case 'downloadFailed':
-      return 'Download Failed';
+      return translate('DownloadFailed');
     case 'downloadFolderImported':
-      return 'Episode Imported';
+      return translate('EpisodeImported');
     case 'episodeFileDeleted':
-      return 'Episode File Deleted';
+      return translate('EpisodeFileDeleted');
     case 'episodeFileRenamed':
-      return 'Episode File Renamed';
+      return translate('EpisodeFileRenamed');
     case 'downloadIgnored':
-      return 'Download Ignored';
+      return translate('DownloadIgnored');
     default:
-      return 'Unknown';
+      return translate('Unknown');
   }
 }
 
@@ -36,6 +37,7 @@ function HistoryDetailsModal(props) {
     eventType,
     sourceTitle,
     data,
+    downloadId,
     isMarkingAsFailed,
     shortDateFormat,
     timeFormat,
@@ -58,6 +60,7 @@ function HistoryDetailsModal(props) {
             eventType={eventType}
             sourceTitle={sourceTitle}
             data={data}
+            downloadId={downloadId}
             shortDateFormat={shortDateFormat}
             timeFormat={timeFormat}
           />
@@ -72,14 +75,14 @@ function HistoryDetailsModal(props) {
                 isSpinning={isMarkingAsFailed}
                 onPress={onMarkAsFailedPress}
               >
-                Mark as Failed
+                {translate('MarkAsFailed')}
               </SpinnerButton>
           }
 
           <Button
             onPress={onModalClose}
           >
-            Close
+            {translate('Close')}
           </Button>
         </ModalFooter>
       </ModalContent>
@@ -92,6 +95,7 @@ HistoryDetailsModal.propTypes = {
   eventType: PropTypes.string.isRequired,
   sourceTitle: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired,
+  downloadId: PropTypes.string,
   isMarkingAsFailed: PropTypes.bool.isRequired,
   shortDateFormat: PropTypes.string.isRequired,
   timeFormat: PropTypes.string.isRequired,

frontend/src/Activity/History/History.js

@@ -1,18 +1,21 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { align, icons } from 'Helpers/Props';
-import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
+import Alert from 'Components/Alert';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import FilterMenu from 'Components/Menu/FilterMenu';
+import PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
+import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
+import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
 import TablePager from 'Components/Table/TablePager';
-import PageContent from 'Components/Page/PageContent';
-import PageContentBody from 'Components/Page/PageContentBody';
-import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
-import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
-import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
-import FilterMenu from 'Components/Menu/FilterMenu';
+import { align, icons, kinds } from 'Helpers/Props';
+import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
+import translate from 'Utilities/String/translate';
+import HistoryFilterModal from './HistoryFilterModal';
 import HistoryRowConnector from './HistoryRowConnector';
 
 class History extends Component {
@@ -50,6 +53,7 @@ class History extends Component {
       columns,
       selectedFilterKey,
       filters,
+      customFilters,
       totalRecords,
       isEpisodesFetching,
       isEpisodesPopulated,
@@ -64,11 +68,11 @@ class History extends Component {
     const hasError = error || episodesError;
 
     return (
-      <PageContent title="History">
+      <PageContent title={translate('History')}>
         <PageToolbar>
           <PageToolbarSection>
             <PageToolbarButton
-              label="Refresh"
+              label={translate('Refresh')}
               iconName={icons.REFRESH}
               isSpinning={isFetching}
               onPress={onFirstPagePress}
@@ -81,7 +85,7 @@ class History extends Component {
               columns={columns}
             >
               <PageToolbarButton
-                label="Options"
+                label={translate('Options')}
                 iconName={icons.TABLE}
               />
             </TableOptionsModalWrapper>
@@ -90,7 +94,8 @@ class History extends Component {
               alignMenu={align.RIGHT}
               selectedFilterKey={selectedFilterKey}
               filters={filters}
-              customFilters={[]}
+              customFilters={customFilters}
+              filterModalConnectorComponent={HistoryFilterModal}
               onFilterSelect={onFilterSelect}
             />
           </PageToolbarSection>
@@ -104,7 +109,9 @@ class History extends Component {
 
           {
             !isFetchingAny && hasError &&
-              <div>Unable to load history</div>
+              <Alert kind={kinds.DANGER}>
+                {translate('HistoryLoadError')}
+              </Alert>
           }
 
           {
@@ -112,9 +119,9 @@ class History extends Component {
             // wait for the episodes to populate because they are never coming.
 
             isPopulated && !hasError && !items.length &&
-              <div>
-                No history found
-              </div>
+              <Alert kind={kinds.INFO}>
+                {translate('NoHistoryFound')}
+              </Alert>
           }
 
           {
@@ -159,8 +166,9 @@ History.propTypes = {
   error: PropTypes.object,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
-  selectedFilterKey: PropTypes.string.isRequired,
+  selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
   filters: PropTypes.arrayOf(PropTypes.object).isRequired,
+  customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
   totalRecords: PropTypes.number,
   isEpisodesFetching: PropTypes.bool.isRequired,
   isEpisodesPopulated: PropTypes.bool.isRequired,

frontend/src/Activity/History/HistoryConnector.js

@@ -2,24 +2,27 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
+import withCurrentPage from 'Components/withCurrentPage';
+import { clearEpisodes, fetchEpisodes } from 'Store/Actions/episodeActions';
+import { clearEpisodeFiles } from 'Store/Actions/episodeFileActions';
+import * as historyActions from 'Store/Actions/historyActions';
+import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
 import selectUniqueIds from 'Utilities/Object/selectUniqueIds';
-import withCurrentPage from 'Components/withCurrentPage';
-import * as historyActions from 'Store/Actions/historyActions';
-import { fetchEpisodes, clearEpisodes } from 'Store/Actions/episodeActions';
-import { clearEpisodeFiles } from 'Store/Actions/episodeFileActions';
+import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
 import History from './History';
 
 function createMapStateToProps() {
   return createSelector(
     (state) => state.history,
     (state) => state.episodes,
-    (history, episodes) => {
+    createCustomFiltersSelector('history'),
+    (history, episodes, customFilters) => {
       return {
         isEpisodesFetching: episodes.isFetching,
         isEpisodesPopulated: episodes.isPopulated,
         episodesError: episodes.error,
+        customFilters,
         ...history
       };
     }
@@ -78,38 +81,38 @@ class HistoryConnector extends Component {
 
   repopulate = () => {
     this.props.fetchHistory();
-  }
+  };
 
   //
   // Listeners
 
   onFirstPagePress = () => {
     this.props.gotoHistoryFirstPage();
-  }
+  };
 
   onPreviousPagePress = () => {
     this.props.gotoHistoryPreviousPage();
-  }
+  };
 
   onNextPagePress = () => {
     this.props.gotoHistoryNextPage();
-  }
+  };
 
   onLastPagePress = () => {
     this.props.gotoHistoryLastPage();
-  }
+  };
 
   onPageSelect = (page) => {
     this.props.gotoHistoryPage({ page });
-  }
+  };
 
   onSortPress = (sortKey) => {
     this.props.setHistorySort({ sortKey });
-  }
+  };
 
   onFilterSelect = (selectedFilterKey) => {
     this.props.setHistoryFilter({ selectedFilterKey });
-  }
+  };
 
   onTableOptionChange = (payload) => {
     this.props.setHistoryTableOption(payload);
@@ -117,7 +120,7 @@ class HistoryConnector extends Component {
     if (payload.pageSize) {
       this.props.gotoHistoryFirstPage();
     }
-  }
+  };
 
   //
   // Render

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

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

frontend/src/Activity/History/HistoryEventTypeCell.js

@@ -1,8 +1,9 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import { icons, kinds } from 'Helpers/Props';
 import Icon from 'Components/Icon';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import { icons, kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import styles from './HistoryEventTypeCell.css';
 
 function getIconName(eventType) {
@@ -38,21 +39,21 @@ function getIconKind(eventType) {
 function getTooltip(eventType, data) {
   switch (eventType) {
     case 'grabbed':
-      return `Episode grabbed from ${data.indexer} and sent to ${data.downloadClient}`;
+      return translate('EpisodeGrabbedTooltip', { indexer: data.indexer, downloadClient: data.downloadClient });
     case 'seriesFolderImported':
-      return 'Episode imported from series folder';
+      return translate('SeriesFolderImportedTooltip');
     case 'downloadFolderImported':
-      return 'Episode downloaded successfully and picked up from download client';
+      return translate('EpisodeImportedTooltip');
     case 'downloadFailed':
-      return 'Episode download failed';
+      return translate('DownloadFailedEpisodeTooltip');
     case 'episodeFileDeleted':
-      return 'Episode file deleted';
+      return translate('EpisodeFileDeletedTooltip');
     case 'episodeFileRenamed':
-      return 'Episode file renamed';
+      return translate('EpisodeFileRenamedTooltip');
     case 'downloadIgnored':
-      return 'Episode Download Ignored';
+      return translate('DownloadIgnoredEpisodeTooltip');
     default:
-      return 'Unknown event';
+      return translate('UnknownEventTooltip');
   }
 }
 

frontend/src/Activity/History/HistoryFilterModal.tsx

@@ -0,0 +1,54 @@
+import React, { useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import FilterModal from 'Components/Filter/FilterModal';
+import { setHistoryFilter } from 'Store/Actions/historyActions';
+
+function createHistorySelector() {
+  return createSelector(
+    (state: AppState) => state.history.items,
+    (queueItems) => {
+      return queueItems;
+    }
+  );
+}
+
+function createFilterBuilderPropsSelector() {
+  return createSelector(
+    (state: AppState) => state.history.filterBuilderProps,
+    (filterBuilderProps) => {
+      return filterBuilderProps;
+    }
+  );
+}
+
+interface HistoryFilterModalProps {
+  isOpen: boolean;
+}
+
+export default function HistoryFilterModal(props: HistoryFilterModalProps) {
+  const sectionItems = useSelector(createHistorySelector());
+  const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
+  const customFilterType = 'history';
+
+  const dispatch = useDispatch();
+
+  const dispatchSetFilter = useCallback(
+    (payload: unknown) => {
+      dispatch(setHistoryFilter(payload));
+    },
+    [dispatch]
+  );
+
+  return (
+    <FilterModal
+      // TODO: Don't spread all the props
+      {...props}
+      sectionItems={sectionItems}
+      filterBuilderProps={filterBuilderProps}
+      customFilterType={customFilterType}
+      dispatchSetFilter={dispatchSetFilter}
+    />
+  );
+}

frontend/src/Activity/History/HistoryRow.css

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

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

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

frontend/src/Activity/History/HistoryRow.js

@@ -1,19 +1,21 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import formatPreferredWordScore from 'Utilities/Number/formatPreferredWordScore';
-import { icons } from 'Helpers/Props';
 import IconButton from 'Components/Link/IconButton';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
-import TableRow from 'Components/Table/TableRow';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import TableRow from 'Components/Table/TableRow';
+import Tooltip from 'Components/Tooltip/Tooltip';
 import episodeEntities from 'Episode/episodeEntities';
-import SeasonEpisodeNumber from 'Episode/SeasonEpisodeNumber';
-import EpisodeTitleLink from 'Episode/EpisodeTitleLink';
-import EpisodeLanguage from 'Episode/EpisodeLanguage';
+import EpisodeFormats from 'Episode/EpisodeFormats';
+import EpisodeLanguages from 'Episode/EpisodeLanguages';
 import EpisodeQuality from 'Episode/EpisodeQuality';
+import EpisodeTitleLink from 'Episode/EpisodeTitleLink';
+import SeasonEpisodeNumber from 'Episode/SeasonEpisodeNumber';
+import { icons, tooltipPositions } from 'Helpers/Props';
 import SeriesTitleLink from 'Series/SeriesTitleLink';
-import HistoryEventTypeCell from './HistoryEventTypeCell';
+import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import HistoryDetailsModal from './Details/HistoryDetailsModal';
+import HistoryEventTypeCell from './HistoryEventTypeCell';
 import styles from './HistoryRow.css';
 
 class HistoryRow extends Component {
@@ -44,11 +46,11 @@ class HistoryRow extends Component {
 
   onDetailsPress = () => {
     this.setState({ isDetailsModalOpen: true });
-  }
+  };
 
   onDetailsModalClose = () => {
     this.setState({ isDetailsModalOpen: false });
-  }
+  };
 
   //
   // Render
@@ -58,14 +60,16 @@ class HistoryRow extends Component {
       episodeId,
       series,
       episode,
-      language,
-      languageCutoffNotMet,
+      languages,
       quality,
+      customFormats,
+      customFormatScore,
       qualityCutoffNotMet,
       eventType,
       sourceTitle,
       date,
       data,
+      downloadId,
       isMarkingAsFailed,
       columns,
       shortDateFormat,
@@ -128,7 +132,7 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'episodeTitle') {
+            if (name === 'episodes.title') {
               return (
                 <TableRowCell key={name}>
                   <EpisodeTitleLink
@@ -142,13 +146,10 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'language') {
+            if (name === 'languages') {
               return (
                 <TableRowCell key={name}>
-                  <EpisodeLanguage
-                    language={language}
-                    isCutoffMet={languageCutoffNotMet}
-                  />
+                  <EpisodeLanguages languages={languages} />
                 </TableRowCell>
               );
             }
@@ -164,6 +165,16 @@ class HistoryRow extends Component {
               );
             }
 
+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <EpisodeFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
             if (name === 'date') {
               return (
                 <RelativeDateCellConnector
@@ -195,13 +206,20 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'preferredWordScore') {
+            if (name === 'customFormatScore') {
               return (
                 <TableRowCell
                   key={name}
-                  className={styles.preferredWordScore}
+                  className={styles.customFormatScore}
                 >
-                  {formatPreferredWordScore(data.preferredWordScore)}
+                  <Tooltip
+                    anchor={formatCustomFormatScore(
+                      customFormatScore,
+                      customFormats.length
+                    )}
+                    tooltip={<EpisodeFormats formats={customFormats} />}
+                    position={tooltipPositions.BOTTOM}
+                  />
                 </TableRowCell>
               );
             }
@@ -233,10 +251,12 @@ class HistoryRow extends Component {
                   key={name}
                   className={styles.details}
                 >
-                  <IconButton
-                    name={icons.INFO}
-                    onPress={this.onDetailsPress}
-                  />
+                  <div className={styles.actionContents}>
+                    <IconButton
+                      name={icons.INFO}
+                      onPress={this.onDetailsPress}
+                    />
+                  </div>
                 </TableRowCell>
               );
             }
@@ -250,6 +270,7 @@ class HistoryRow extends Component {
           eventType={eventType}
           sourceTitle={sourceTitle}
           data={data}
+          downloadId={downloadId}
           isMarkingAsFailed={isMarkingAsFailed}
           shortDateFormat={shortDateFormat}
           timeFormat={timeFormat}
@@ -266,14 +287,16 @@ HistoryRow.propTypes = {
   episodeId: PropTypes.number,
   series: PropTypes.object.isRequired,
   episode: PropTypes.object,
-  language: PropTypes.object.isRequired,
-  languageCutoffNotMet: PropTypes.bool.isRequired,
+  languages: PropTypes.arrayOf(PropTypes.object).isRequired,
   quality: PropTypes.object.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object),
+  customFormatScore: PropTypes.number.isRequired,
   qualityCutoffNotMet: PropTypes.bool.isRequired,
   eventType: PropTypes.string.isRequired,
   sourceTitle: PropTypes.string.isRequired,
   date: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired,
+  downloadId: PropTypes.string,
   isMarkingAsFailed: PropTypes.bool,
   markAsFailedError: PropTypes.object,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
@@ -282,4 +305,8 @@ HistoryRow.propTypes = {
   onMarkAsFailedPress: PropTypes.func.isRequired
 };
 
+HistoryRow.defaultProps = {
+  customFormats: []
+};
+
 export default HistoryRow;

frontend/src/Activity/History/HistoryRowConnector.js

@@ -3,8 +3,8 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { fetchHistory, markAsFailed } from 'Store/Actions/historyActions';
-import createSeriesSelector from 'Store/Selectors/createSeriesSelector';
 import createEpisodeSelector from 'Store/Selectors/createEpisodeSelector';
+import createSeriesSelector from 'Store/Selectors/createSeriesSelector';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
 import HistoryRow from './HistoryRow';
 
@@ -49,7 +49,7 @@ class HistoryRowConnector extends Component {
 
   onMarkAsFailedPress = () => {
     this.props.markAsFailed({ id: this.props.id });
-  }
+  };
 
   //
   // Render

frontend/src/Activity/Queue/ProtocolLabel.css

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

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

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

frontend/src/Activity/Queue/Queue.js

@@ -1,27 +1,31 @@
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Alert from 'Components/Alert';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import FilterMenu from 'Components/Menu/FilterMenu';
+import PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
+import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
+import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
+import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
+import Table from 'Components/Table/Table';
+import TableBody from 'Components/Table/TableBody';
+import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
+import TablePager from 'Components/Table/TablePager';
+import { align, icons, kinds } from 'Helpers/Props';
 import getRemovedItems from 'Utilities/Object/getRemovedItems';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
+import translate from 'Utilities/String/translate';
 import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
 import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
-import { align, icons } from 'Helpers/Props';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import Table from 'Components/Table/Table';
-import TableBody from 'Components/Table/TableBody';
-import TablePager from 'Components/Table/TablePager';
-import PageContent from 'Components/Page/PageContent';
-import PageContentBody from 'Components/Page/PageContentBody';
-import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
-import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
-import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
-import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
-import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
-import RemoveQueueItemsModal from './RemoveQueueItemsModal';
+import QueueFilterModal from './QueueFilterModal';
 import QueueOptionsConnector from './QueueOptionsConnector';
 import QueueRowConnector from './QueueRowConnector';
+import RemoveQueueItemsModal from './RemoveQueueItemsModal';
 
 class Queue extends Component {
 
@@ -72,13 +76,23 @@ class Queue extends Component {
       return;
     }
 
+    const nextState = {};
+
+    if (prevProps.items !== items) {
+      nextState.items = items;
+    }
+
     const selectedIds = this.getSelectedIds();
     const isPendingSelected = _.some(this.props.items, (item) => {
       return selectedIds.indexOf(item.id) > -1 && item.status === 'delay';
     });
 
     if (isPendingSelected !== this.state.isPendingSelected) {
-      this.setState({ isPendingSelected });
+      nextState.isPendingSelected = isPendingSelected;
+    }
+
+    if (!_.isEmpty(nextState)) {
+      this.setState(nextState);
     }
   }
 
@@ -87,45 +101,45 @@ class Queue extends Component {
 
   getSelectedIds = () => {
     return getSelectedIds(this.state.selectedState);
-  }
+  };
 
   //
   // Listeners
 
   onQueueRowModalOpenOrClose = (isOpen) => {
     this._shouldBlockRefresh = isOpen;
-  }
+  };
 
   onSelectAllChange = ({ value }) => {
     this.setState(selectAll(this.state.selectedState, value));
-  }
+  };
 
   onSelectedChange = ({ id, value, shiftKey = false }) => {
     this.setState((state) => {
       return toggleSelected(state, this.props.items, id, value, shiftKey);
     });
-  }
+  };
 
   onGrabSelectedPress = () => {
     this.props.onGrabSelectedPress(this.getSelectedIds());
-  }
+  };
 
   onRemoveSelectedPress = () => {
     this.setState({ isConfirmRemoveModalOpen: true }, () => {
       this._shouldBlockRefresh = true;
     });
-  }
+  };
 
   onRemoveSelectedConfirmed = (payload) => {
     this._shouldBlockRefresh = false;
     this.props.onRemoveSelectedPress({ ids: this.getSelectedIds(), ...payload });
     this.setState({ isConfirmRemoveModalOpen: false });
-  }
+  };
 
   onConfirmRemoveModalClose = () => {
     this._shouldBlockRefresh = false;
     this.setState({ isConfirmRemoveModalOpen: false });
-  }
+  };
 
   //
   // Render
@@ -139,11 +153,16 @@ class Queue extends Component {
       isEpisodesPopulated,
       episodesError,
       columns,
+      selectedFilterKey,
+      filters,
+      customFilters,
+      count,
       totalRecords,
       isGrabbing,
       isRemoving,
       isRefreshMonitoredDownloadsExecuting,
       onRefreshPress,
+      onFilterSelect,
       ...otherProps
     } = this.props;
 
@@ -164,7 +183,7 @@ class Queue extends Component {
     const disableSelectedActions = selectedCount === 0;
 
     return (
-      <PageContent title="Queue">
+      <PageContent title={translate('Queue')}>
         <PageToolbar>
           <PageToolbarSection>
             <PageToolbarButton
@@ -177,7 +196,7 @@ class Queue extends Component {
             <PageToolbarSeparator />
 
             <PageToolbarButton
-              label="Grab Selected"
+              label={translate('GrabSelected')}
               iconName={icons.DOWNLOAD}
               isDisabled={disableSelectedActions || !isPendingSelected}
               isSpinning={isGrabbing}
@@ -185,7 +204,7 @@ class Queue extends Component {
             />
 
             <PageToolbarButton
-              label="Remove Selected"
+              label={translate('RemoveSelected')}
               iconName={icons.REMOVE}
               isDisabled={disableSelectedActions}
               isSpinning={isRemoving}
@@ -202,35 +221,51 @@ class Queue extends Component {
               optionsComponent={QueueOptionsConnector}
             >
               <PageToolbarButton
-                label="Options"
+                label={translate('Options')}
                 iconName={icons.TABLE}
               />
             </TableOptionsModalWrapper>
+
+            <FilterMenu
+              alignMenu={align.RIGHT}
+              selectedFilterKey={selectedFilterKey}
+              filters={filters}
+              customFilters={customFilters}
+              filterModalConnectorComponent={QueueFilterModal}
+              onFilterSelect={onFilterSelect}
+            />
           </PageToolbarSection>
         </PageToolbar>
 
         <PageContentBody>
           {
-            isRefreshing && !isAllPopulated &&
-              <LoadingIndicator />
+            isRefreshing && !isAllPopulated ?
+              <LoadingIndicator /> :
+              null
           }
 
           {
-            !isRefreshing && hasError &&
-              <div>
-                Failed to load Queue
-              </div>
+            !isRefreshing && hasError ?
+              <Alert kind={kinds.DANGER}>
+                {translate('QueueLoadError')}
+              </Alert> :
+              null
           }
 
           {
-            isAllPopulated && !hasError && !items.length &&
-              <div>
-                Queue is empty
-              </div>
+            isAllPopulated && !hasError && !items.length ?
+              <Alert kind={kinds.INFO}>
+                {
+                  selectedFilterKey !== 'all' && count > 0 ?
+                    translate('QueueFilterHasNoItems') :
+                    translate('QueueIsEmpty')
+                }
+              </Alert> :
+              null
           }
 
           {
-            isAllPopulated && !hasError && !!items.length &&
+            isAllPopulated && !hasError && !!items.length ?
               <div>
                 <Table
                   columns={columns}
@@ -265,7 +300,8 @@ class Queue extends Component {
                   isFetching={isRefreshing}
                   {...otherProps}
                 />
-              </div>
+              </div> :
+              null
           }
         </PageContentBody>
 
@@ -307,13 +343,22 @@ Queue.propTypes = {
   isEpisodesPopulated: PropTypes.bool.isRequired,
   episodesError: PropTypes.object,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
+  selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  filters: PropTypes.arrayOf(PropTypes.object).isRequired,
+  customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
+  count: PropTypes.number.isRequired,
   totalRecords: PropTypes.number,
   isGrabbing: PropTypes.bool.isRequired,
   isRemoving: PropTypes.bool.isRequired,
   isRefreshMonitoredDownloadsExecuting: PropTypes.bool.isRequired,
   onRefreshPress: PropTypes.func.isRequired,
   onGrabSelectedPress: PropTypes.func.isRequired,
-  onRemoveSelectedPress: PropTypes.func.isRequired
+  onRemoveSelectedPress: PropTypes.func.isRequired,
+  onFilterSelect: PropTypes.func.isRequired
+};
+
+Queue.defaultProps = {
+  count: 0
 };
 
 export default Queue;

frontend/src/Activity/Queue/QueueConnector.js

@@ -2,15 +2,16 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
+import * as commandNames from 'Commands/commandNames';
+import withCurrentPage from 'Components/withCurrentPage';
+import { executeCommand } from 'Store/Actions/commandActions';
+import { clearEpisodes, fetchEpisodes } from 'Store/Actions/episodeActions';
+import * as queueActions from 'Store/Actions/queueActions';
+import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
+import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
 import selectUniqueIds from 'Utilities/Object/selectUniqueIds';
-import withCurrentPage from 'Components/withCurrentPage';
-import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
-import { executeCommand } from 'Store/Actions/commandActions';
-import * as queueActions from 'Store/Actions/queueActions';
-import { fetchEpisodes, clearEpisodes } from 'Store/Actions/episodeActions';
-import * as commandNames from 'Commands/commandNames';
+import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
 import Queue from './Queue';
 
 function createMapStateToProps() {
@@ -18,12 +19,16 @@ function createMapStateToProps() {
     (state) => state.episodes,
     (state) => state.queue.options,
     (state) => state.queue.paged,
+    (state) => state.queue.status.item,
+    createCustomFiltersSelector('queue'),
     createCommandExecutingSelector(commandNames.REFRESH_MONITORED_DOWNLOADS),
-    (episodes, options, queue, isRefreshMonitoredDownloadsExecuting) => {
+    (episodes, options, queue, status, customFilters, isRefreshMonitoredDownloadsExecuting) => {
       return {
+        count: options.includeUnknownSeriesItems ? status.totalCount : status.count,
         isEpisodesFetching: episodes.isFetching,
         isEpisodesPopulated: episodes.isPopulated,
         episodesError: episodes.error,
+        customFilters,
         isRefreshMonitoredDownloadsExecuting,
         ...options,
         ...queue
@@ -93,34 +98,38 @@ class QueueConnector extends Component {
 
   repopulate = () => {
     this.props.fetchQueue();
-  }
+  };
 
   //
   // Listeners
 
   onFirstPagePress = () => {
     this.props.gotoQueueFirstPage();
-  }
+  };
 
   onPreviousPagePress = () => {
     this.props.gotoQueuePreviousPage();
-  }
+  };
 
   onNextPagePress = () => {
     this.props.gotoQueueNextPage();
-  }
+  };
 
   onLastPagePress = () => {
     this.props.gotoQueueLastPage();
-  }
+  };
 
   onPageSelect = (page) => {
     this.props.gotoQueuePage({ page });
-  }
+  };
 
   onSortPress = (sortKey) => {
     this.props.setQueueSort({ sortKey });
-  }
+  };
+
+  onFilterSelect = (selectedFilterKey) => {
+    this.props.setQueueFilter({ selectedFilterKey });
+  };
 
   onTableOptionChange = (payload) => {
     this.props.setQueueTableOption(payload);
@@ -128,21 +137,21 @@ class QueueConnector extends Component {
     if (payload.pageSize) {
       this.props.gotoQueueFirstPage();
     }
-  }
+  };
 
   onRefreshPress = () => {
     this.props.executeCommand({
       name: commandNames.REFRESH_MONITORED_DOWNLOADS
     });
-  }
+  };
 
   onGrabSelectedPress = (ids) => {
     this.props.grabQueueItems({ ids });
-  }
+  };
 
   onRemoveSelectedPress = (payload) => {
     this.props.removeQueueItems(payload);
-  }
+  };
 
   //
   // Render
@@ -156,6 +165,7 @@ class QueueConnector extends Component {
         onLastPagePress={this.onLastPagePress}
         onPageSelect={this.onPageSelect}
         onSortPress={this.onSortPress}
+        onFilterSelect={this.onFilterSelect}
         onTableOptionChange={this.onTableOptionChange}
         onRefreshPress={this.onRefreshPress}
         onGrabSelectedPress={this.onGrabSelectedPress}
@@ -178,6 +188,7 @@ QueueConnector.propTypes = {
   gotoQueueLastPage: PropTypes.func.isRequired,
   gotoQueuePage: PropTypes.func.isRequired,
   setQueueSort: PropTypes.func.isRequired,
+  setQueueFilter: PropTypes.func.isRequired,
   setQueueTableOption: PropTypes.func.isRequired,
   clearQueue: PropTypes.func.isRequired,
   grabQueueItems: PropTypes.func.isRequired,

frontend/src/Activity/Queue/QueueDetails.css

@@ -0,0 +1,5 @@
+.progressBarContainer {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+}

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

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

frontend/src/Activity/Queue/QueueDetails.js

@@ -1,115 +1,71 @@
-import moment from 'moment';
 import PropTypes from 'prop-types';
 import React from 'react';
-import { icons, kinds } from 'Helpers/Props';
 import Icon from 'Components/Icon';
+import Popover from 'Components/Tooltip/Popover';
+import { icons, tooltipPositions } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import QueueStatus from './QueueStatus';
+import styles from './QueueDetails.css';
 
 function QueueDetails(props) {
   const {
     title,
     size,
     sizeleft,
-    estimatedCompletionTime,
     status,
     trackedDownloadState,
     trackedDownloadStatus,
+    statusMessages,
     errorMessage,
     progressBar
   } = props;
 
   const progress = (100 - sizeleft / size * 100);
+  const isDownloading = status === 'downloading';
+  const isPaused = status === 'paused';
+  const hasWarning = trackedDownloadStatus === 'warning';
+  const hasError = trackedDownloadStatus === 'error';
 
-  if (status === 'pending') {
-    return (
-      <Icon
-        name={icons.PENDING}
-        title={`Release will be processed ${moment(estimatedCompletionTime).fromNow()}`}
-      />
-    );
-  }
+  if (
+    (isDownloading || isPaused) &&
+    !hasWarning &&
+    !hasError
+  ) {
+    const state = isPaused ? translate('Paused') : translate('Downloading');
 
-  if (status === 'completed') {
-    if (errorMessage) {
+    if (progress < 5) {
       return (
         <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.DANGER}
-          title={`Import failed: ${errorMessage}`}
+          name={icons.DOWNLOADING}
+          title={`${state} - ${progress.toFixed(1)}% ${title}`}
         />
       );
     }
 
-    if (trackedDownloadStatus === 'warning') {
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.WARNING}
-          title={'Downloaded - Unable to Import: check logs for details'}
-        />
-      );
-    }
-
-    if (trackedDownloadState === 'importPending') {
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.PURPLE}
-          title={'Downloaded - Waiting to Import'}
-        />
-      );
-    }
-
-    if (trackedDownloadState === 'importing') {
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.PURPLE}
-          title={'Downloaded - Importing'}
-        />
-      );
-    }
-  }
-
-  if (errorMessage) {
     return (
-      <Icon
-        name={icons.DOWNLOADING}
-        kind={kinds.DANGER}
-        title={`Download failed: ${errorMessage}`}
+      <Popover
+        className={styles.progressBarContainer}
+        anchor={progressBar}
+        title={`${state} - ${progress.toFixed(1)}%`}
+        body={
+          <div>{title}</div>
+        }
+        position={tooltipPositions.LEFT}
       />
     );
   }
 
-  if (status === 'failed') {
-    return (
-      <Icon
-        name={icons.DOWNLOADING}
-        kind={kinds.DANGER}
-        title="Download failed: check download client for more details"
-      />
-    );
-  }
-
-  if (status === 'warning') {
-    return (
-      <Icon
-        name={icons.DOWNLOADING}
-        kind={kinds.WARNING}
-        title="Download warning: check download client for more details"
-      />
-    );
-  }
-
-  if (progress < 5) {
-    return (
-      <Icon
-        name={icons.DOWNLOADING}
-        title={`Episode is downloading - ${progress.toFixed(1)}% ${title}`}
-      />
-    );
-  }
-
-  return progressBar;
+  return (
+    <QueueStatus
+      sourceTitle={title}
+      status={status}
+      trackedDownloadStatus={trackedDownloadStatus}
+      trackedDownloadState={trackedDownloadState}
+      statusMessages={statusMessages}
+      errorMessage={errorMessage}
+      position={tooltipPositions.LEFT}
+    />
+  );
 }
 
 QueueDetails.propTypes = {
@@ -120,8 +76,14 @@ QueueDetails.propTypes = {
   status: PropTypes.string.isRequired,
   trackedDownloadState: PropTypes.string.isRequired,
   trackedDownloadStatus: PropTypes.string.isRequired,
+  statusMessages: PropTypes.arrayOf(PropTypes.object),
   errorMessage: PropTypes.string,
   progressBar: PropTypes.node.isRequired
 };
 
+QueueDetails.defaultProps = {
+  trackedDownloadStatus: 'ok',
+  trackedDownloadState: 'downloading'
+};
+
 export default QueueDetails;

frontend/src/Activity/Queue/QueueFilterModal.tsx

@@ -0,0 +1,54 @@
+import React, { useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import FilterModal from 'Components/Filter/FilterModal';
+import { setQueueFilter } from 'Store/Actions/queueActions';
+
+function createQueueSelector() {
+  return createSelector(
+    (state: AppState) => state.queue.paged.items,
+    (queueItems) => {
+      return queueItems;
+    }
+  );
+}
+
+function createFilterBuilderPropsSelector() {
+  return createSelector(
+    (state: AppState) => state.queue.paged.filterBuilderProps,
+    (filterBuilderProps) => {
+      return filterBuilderProps;
+    }
+  );
+}
+
+interface QueueFilterModalProps {
+  isOpen: boolean;
+}
+
+export default function QueueFilterModal(props: QueueFilterModalProps) {
+  const sectionItems = useSelector(createQueueSelector());
+  const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
+  const customFilterType = 'queue';
+
+  const dispatch = useDispatch();
+
+  const dispatchSetFilter = useCallback(
+    (payload: unknown) => {
+      dispatch(setQueueFilter(payload));
+    },
+    [dispatch]
+  );
+
+  return (
+    <FilterModal
+      // TODO: Don't spread all the props
+      {...props}
+      sectionItems={sectionItems}
+      filterBuilderProps={filterBuilderProps}
+      customFilterType={customFilterType}
+      dispatchSetFilter={dispatchSetFilter}
+    />
+  );
+}

frontend/src/Activity/Queue/QueueOptions.js

@@ -1,9 +1,10 @@
 import PropTypes from 'prop-types';
 import React, { Component, Fragment } from 'react';
-import { inputTypes } from 'Helpers/Props';
 import FormGroup from 'Components/Form/FormGroup';
-import FormLabel from 'Components/Form/FormLabel';
 import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import { inputTypes } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 
 class QueueOptions extends Component {
 
@@ -41,7 +42,7 @@ class QueueOptions extends Component {
         [name]: value
       });
     });
-  }
+  };
 
   //
   // Render
@@ -54,13 +55,13 @@ class QueueOptions extends Component {
     return (
       <Fragment>
         <FormGroup>
-          <FormLabel>Show Unknown Series Items</FormLabel>
+          <FormLabel>{translate('ShowUnknownSeriesItems')}</FormLabel>
 
           <FormInputGroup
             type={inputTypes.CHECK}
             name="includeUnknownSeriesItems"
             value={includeUnknownSeriesItems}
-            helpText="Show items without a series in the queue, this could include removed series, movies or anything else in Sonarr's category"
+            helpText={translate('ShowUnknownSeriesItemsHelpText')}
             onChange={this.onOptionChange}
           />
         </FormGroup>

frontend/src/Activity/Queue/QueueRow.css

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

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

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

frontend/src/Activity/Queue/QueueRow.js

@@ -1,25 +1,29 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { icons, kinds } from 'Helpers/Props';
+import ProtocolLabel from 'Activity/Queue/ProtocolLabel';
 import IconButton from 'Components/Link/IconButton';
 import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
 import ProgressBar from 'Components/ProgressBar';
-import TableRow from 'Components/Table/TableRow';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
-import ProtocolLabel from 'Activity/Queue/ProtocolLabel';
-import EpisodeTitleLink from 'Episode/EpisodeTitleLink';
-import EpisodeLanguage from 'Episode/EpisodeLanguage';
+import TableRow from 'Components/Table/TableRow';
+import Tooltip from 'Components/Tooltip/Tooltip';
+import EpisodeFormats from 'Episode/EpisodeFormats';
+import EpisodeLanguages from 'Episode/EpisodeLanguages';
 import EpisodeQuality from 'Episode/EpisodeQuality';
+import EpisodeTitleLink from 'Episode/EpisodeTitleLink';
 import SeasonEpisodeNumber from 'Episode/SeasonEpisodeNumber';
+import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal';
 import SeriesTitleLink from 'Series/SeriesTitleLink';
-import QueueStatusCell from './QueueStatusCell';
-import TimeleftCell from './TimeleftCell';
-import RemoveQueueItemModal from './RemoveQueueItemModal';
-import styles from './QueueRow.css';
 import formatBytes from 'Utilities/Number/formatBytes';
+import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
+import translate from 'Utilities/String/translate';
+import QueueStatusCell from './QueueStatusCell';
+import RemoveQueueItemModal from './RemoveQueueItemModal';
+import TimeleftCell from './TimeleftCell';
+import styles from './QueueRow.css';
 
 class QueueRow extends Component {
 
@@ -40,37 +44,37 @@ class QueueRow extends Component {
 
   onRemoveQueueItemPress = () => {
     this.setState({ isRemoveQueueItemModalOpen: true });
-  }
+  };
 
-  onRemoveQueueItemModalConfirmed = (blocklist) => {
+  onRemoveQueueItemModalConfirmed = (blocklist, skipRedownload) => {
     const {
       onRemoveQueueItemPress,
       onQueueRowModalOpenOrClose
     } = this.props;
 
     onQueueRowModalOpenOrClose(false);
-    onRemoveQueueItemPress(blocklist);
+    onRemoveQueueItemPress(blocklist, skipRedownload);
 
     this.setState({ isRemoveQueueItemModalOpen: false });
-  }
+  };
 
   onRemoveQueueItemModalClose = () => {
     this.props.onQueueRowModalOpenOrClose(false);
 
     this.setState({ isRemoveQueueItemModalOpen: false });
-  }
+  };
 
   onInteractiveImportPress = () => {
     this.props.onQueueRowModalOpenOrClose(true);
 
     this.setState({ isInteractiveImportModalOpen: true });
-  }
+  };
 
   onInteractiveImportModalClose = () => {
     this.props.onQueueRowModalOpenOrClose(false);
 
     this.setState({ isInteractiveImportModalOpen: false });
-  }
+  };
 
   //
   // Render
@@ -87,8 +91,10 @@ class QueueRow extends Component {
       errorMessage,
       series,
       episode,
-      language,
+      languages,
       quality,
+      customFormats,
+      customFormatScore,
       protocol,
       indexer,
       outputPath,
@@ -188,7 +194,7 @@ class QueueRow extends Component {
               );
             }
 
-            if (name === 'episode.title') {
+            if (name === 'episodes.title') {
               return (
                 <TableRowCell key={name}>
                   {
@@ -206,7 +212,7 @@ class QueueRow extends Component {
               );
             }
 
-            if (name === 'episode.airDateUtc') {
+            if (name === 'episodes.airDateUtc') {
               if (episode) {
                 return (
                   <RelativeDateCellConnector
@@ -223,11 +229,11 @@ class QueueRow extends Component {
               );
             }
 
-            if (name === 'language') {
+            if (name === 'languages') {
               return (
                 <TableRowCell key={name}>
-                  <EpisodeLanguage
-                    language={language}
+                  <EpisodeLanguages
+                    languages={languages}
                   />
                 </TableRowCell>
               );
@@ -247,6 +253,34 @@ class QueueRow extends Component {
               );
             }
 
+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <EpisodeFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
+            if (name === 'customFormatScore') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.customFormatScore}
+                >
+                  <Tooltip
+                    anchor={formatCustomFormatScore(
+                      customFormatScore,
+                      customFormats.length
+                    )}
+                    tooltip={<EpisodeFormats formats={customFormats} />}
+                    position={tooltipPositions.BOTTOM}
+                  />
+                </TableRowCell>
+              );
+            }
+
             if (name === 'protocol') {
               return (
                 <TableRowCell key={name}>
@@ -353,7 +387,7 @@ class QueueRow extends Component {
                   }
 
                   <SpinnerIconButton
-                    title="Remove from queue"
+                    title={translate('RemoveFromQueue')}
                     name={icons.REMOVE}
                     isSpinning={isRemoving}
                     onPress={this.onRemoveQueueItemPress}
@@ -398,8 +432,10 @@ QueueRow.propTypes = {
   errorMessage: PropTypes.string,
   series: PropTypes.object,
   episode: PropTypes.object,
-  language: PropTypes.object.isRequired,
+  languages: PropTypes.arrayOf(PropTypes.object).isRequired,
   quality: PropTypes.object.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object),
+  customFormatScore: PropTypes.number.isRequired,
   protocol: PropTypes.string.isRequired,
   indexer: PropTypes.string,
   outputPath: PropTypes.string,
@@ -423,6 +459,7 @@ QueueRow.propTypes = {
 };
 
 QueueRow.defaultProps = {
+  customFormats: [],
   isGrabbing: false,
   isRemoving: false
 };

frontend/src/Activity/Queue/QueueRowConnector.js

@@ -3,8 +3,8 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { grabQueueItem, removeQueueItem } from 'Store/Actions/queueActions';
-import createSeriesSelector from 'Store/Selectors/createSeriesSelector';
 import createEpisodeSelector from 'Store/Selectors/createEpisodeSelector';
+import createSeriesSelector from 'Store/Selectors/createSeriesSelector';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
 import QueueRow from './QueueRow';
 
@@ -40,11 +40,11 @@ class QueueRowConnector extends Component {
 
   onGrabPress = () => {
     this.props.grabQueueItem({ id: this.props.id });
-  }
+  };
 
   onRemoveQueueItemPress = (payload) => {
     this.props.removeQueueItem({ id: this.props.id, ...payload });
-  }
+  };
 
   //
   // Render

frontend/src/Activity/Queue/QueueStatus.css

@@ -0,0 +1,3 @@
+.noMessages {
+  margin-bottom: 10px;
+}

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

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

frontend/src/Activity/Queue/QueueStatus.js

@@ -0,0 +1,162 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Icon from 'Components/Icon';
+import Popover from 'Components/Tooltip/Popover';
+import { icons, kinds, tooltipPositions } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import styles from './QueueStatus.css';
+
+function getDetailedPopoverBody(statusMessages) {
+  return (
+    <div>
+      {
+        statusMessages.map(({ title, messages }) => {
+          return (
+            <div
+              key={title}
+              className={messages.length ? undefined: styles.noMessages}
+            >
+              {title}
+              <ul>
+                {
+                  messages.map((message) => {
+                    return (
+                      <li key={message}>
+                        {message}
+                      </li>
+                    );
+                  })
+                }
+              </ul>
+            </div>
+          );
+        })
+      }
+    </div>
+  );
+}
+
+function QueueStatus(props) {
+  const {
+    sourceTitle,
+    status,
+    trackedDownloadStatus,
+    trackedDownloadState,
+    statusMessages,
+    errorMessage,
+    position,
+    canFlip
+  } = props;
+
+  const hasWarning = trackedDownloadStatus === 'warning';
+  const hasError = trackedDownloadStatus === 'error';
+
+  // status === 'downloading'
+  let iconName = icons.DOWNLOADING;
+  let iconKind = kinds.DEFAULT;
+  let title = translate('Downloading');
+
+  if (status === 'paused') {
+    iconName = icons.PAUSED;
+    title = translate('Paused');
+  }
+
+  if (status === 'queued') {
+    iconName = icons.QUEUED;
+    title = translate('Queued');
+  }
+
+  if (status === 'completed') {
+    iconName = icons.DOWNLOADED;
+    title = translate('Downloaded');
+
+    if (trackedDownloadState === 'importPending') {
+      title += ` - ${translate('WaitingToImport')}`;
+      iconKind = kinds.PURPLE;
+    }
+
+    if (trackedDownloadState === 'importing') {
+      title += ` - ${translate('Importing')}`;
+      iconKind = kinds.PURPLE;
+    }
+
+    if (trackedDownloadState === 'failedPending') {
+      title += ` - ${translate('WaitingToProcess')}`;
+      iconKind = kinds.DANGER;
+    }
+  }
+
+  if (hasWarning) {
+    iconKind = kinds.WARNING;
+  }
+
+  if (status === 'delay') {
+    iconName = icons.PENDING;
+    title = translate('Pending');
+  }
+
+  if (status === 'downloadClientUnavailable') {
+    iconName = icons.PENDING;
+    iconKind = kinds.WARNING;
+    title = translate('PendingDownloadClientUnavailable');
+  }
+
+  if (status === 'failed') {
+    iconName = icons.DOWNLOADING;
+    iconKind = kinds.DANGER;
+    title = translate('DownloadFailed');
+  }
+
+  if (status === 'warning') {
+    iconName = icons.DOWNLOADING;
+    iconKind = kinds.WARNING;
+    const warningMessage = errorMessage || translate('CheckDownloadClientForDetails');
+    title = translate('DownloadWarning', { warningMessage });
+  }
+
+  if (hasError) {
+    if (status === 'completed') {
+      iconName = icons.DOWNLOAD;
+      iconKind = kinds.DANGER;
+      title = translate('ImportFailed', { sourceTitle });
+    } else {
+      iconName = icons.DOWNLOADING;
+      iconKind = kinds.DANGER;
+      title = translate('DownloadFailed');
+    }
+  }
+
+  return (
+    <Popover
+      anchor={
+        <Icon
+          name={iconName}
+          kind={iconKind}
+        />
+      }
+      title={title}
+      body={hasWarning || hasError ? getDetailedPopoverBody(statusMessages) : sourceTitle}
+      position={position}
+      canFlip={canFlip}
+    />
+  );
+}
+
+QueueStatus.propTypes = {
+  sourceTitle: PropTypes.string.isRequired,
+  status: PropTypes.string.isRequired,
+  trackedDownloadStatus: PropTypes.string.isRequired,
+  trackedDownloadState: PropTypes.string.isRequired,
+  statusMessages: PropTypes.arrayOf(PropTypes.object),
+  errorMessage: PropTypes.string,
+  position: PropTypes.oneOf(tooltipPositions.all).isRequired,
+  canFlip: PropTypes.bool.isRequired
+};
+
+QueueStatus.defaultProps = {
+  trackedDownloadStatus: 'ok',
+  trackedDownloadState: 'downloading',
+  canFlip: false
+};
+
+export default QueueStatus;

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

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

frontend/src/Activity/Queue/QueueStatusCell.js

@@ -1,41 +1,10 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import { icons, kinds, tooltipPositions } from 'Helpers/Props';
-import Icon from 'Components/Icon';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import Popover from 'Components/Tooltip/Popover';
+import { tooltipPositions } from 'Helpers/Props';
+import QueueStatus from './QueueStatus';
 import styles from './QueueStatusCell.css';
 
-function getDetailedPopoverBody(statusMessages) {
-  return (
-    <div>
-      {
-        statusMessages.map(({ title, messages }) => {
-          return (
-            <div
-              key={title}
-              className={messages.length ? undefined: styles.noMessages}
-            >
-              {title}
-              <ul>
-                {
-                  messages.map((message) => {
-                    return (
-                      <li key={message}>
-                        {message}
-                      </li>
-                    );
-                  })
-                }
-              </ul>
-            </div>
-          );
-        })
-      }
-    </div>
-  );
-}
-
 function QueueStatusCell(props) {
   const {
     sourceTitle,
@@ -46,96 +15,16 @@ function QueueStatusCell(props) {
     errorMessage
   } = props;
 
-  const hasWarning = trackedDownloadStatus === 'warning';
-  const hasError = trackedDownloadStatus === 'error';
-
-  // status === 'downloading'
-  let iconName = icons.DOWNLOADING;
-  let iconKind = kinds.DEFAULT;
-  let title = 'Downloading';
-
-  if (status === 'paused') {
-    iconName = icons.PAUSED;
-    title = 'Paused';
-  }
-
-  if (status === 'queued') {
-    iconName = icons.QUEUED;
-    title = 'Queued';
-  }
-
-  if (status === 'completed') {
-    iconName = icons.DOWNLOADED;
-    title = 'Downloaded';
-
-    if (trackedDownloadState === 'importPending') {
-      title += ' - Waiting to Import';
-      iconKind = kinds.PURPLE;
-    }
-
-    if (trackedDownloadState === 'importing') {
-      title += ' - Importing';
-      iconKind = kinds.PURPLE;
-    }
-
-    if (trackedDownloadState === 'failedPending') {
-      title += ' - Waiting to Process';
-      iconKind = kinds.DANGER;
-    }
-  }
-
-  if (hasWarning) {
-    iconKind = kinds.WARNING;
-  }
-
-  if (status === 'delay') {
-    iconName = icons.PENDING;
-    title = 'Pending';
-  }
-
-  if (status === 'downloadClientUnavailable') {
-    iconName = icons.PENDING;
-    iconKind = kinds.WARNING;
-    title = 'Pending - Download client is unavailable';
-  }
-
-  if (status === 'failed') {
-    iconName = icons.DOWNLOADING;
-    iconKind = kinds.DANGER;
-    title = 'Download failed';
-  }
-
-  if (status === 'warning') {
-    iconName = icons.DOWNLOADING;
-    iconKind = kinds.WARNING;
-    title = `Download warning: ${errorMessage || 'check download client for more details'}`;
-  }
-
-  if (hasError) {
-    if (status === 'completed') {
-      iconName = icons.DOWNLOAD;
-      iconKind = kinds.DANGER;
-      title = `Import failed: ${sourceTitle}`;
-    } else {
-      iconName = icons.DOWNLOADING;
-      iconKind = kinds.DANGER;
-      title = 'Download failed';
-    }
-  }
-
   return (
     <TableRowCell className={styles.status}>
-      <Popover
-        anchor={
-          <Icon
-            name={iconName}
-            kind={iconKind}
-          />
-        }
-        title={title}
-        body={hasWarning || hasError ? getDetailedPopoverBody(statusMessages) : sourceTitle}
+      <QueueStatus
+        sourceTitle={sourceTitle}
+        status={status}
+        trackedDownloadStatus={trackedDownloadStatus}
+        trackedDownloadState={trackedDownloadState}
+        statusMessages={statusMessages}
+        errorMessage={errorMessage}
         position={tooltipPositions.RIGHT}
-        canFlip={false}
       />
     </TableRowCell>
   );
@@ -151,8 +40,8 @@ QueueStatusCell.propTypes = {
 };
 
 QueueStatusCell.defaultProps = {
-  trackedDownloadStatus: 'Ok',
-  trackedDownloadState: 'Downloading'
+  trackedDownloadStatus: 'ok',
+  trackedDownloadState: 'downloading'
 };
 
 export default QueueStatusCell;

frontend/src/Activity/Queue/RemoveQueueItemModal.js

@@ -1,15 +1,16 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { inputTypes, kinds, sizes } from 'Helpers/Props';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
 import Button from 'Components/Link/Button';
 import Modal from 'Components/Modal/Modal';
-import FormGroup from 'Components/Form/FormGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalHeader from 'Components/Modal/ModalHeader';
 import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import { inputTypes, kinds, sizes } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 
 class RemoveQueueItemModal extends Component {
 
@@ -21,7 +22,8 @@ class RemoveQueueItemModal extends Component {
 
     this.state = {
       remove: true,
-      blocklist: false
+      blocklist: false,
+      skipRedownload: false
     };
   }
 
@@ -31,32 +33,37 @@ class RemoveQueueItemModal extends Component {
   resetState = function() {
     this.setState({
       remove: true,
-      blocklist: false
+      blocklist: false,
+      skipRedownload: false
     });
-  }
+  };
 
   //
   // Listeners
 
   onRemoveChange = ({ value }) => {
     this.setState({ remove: value });
-  }
+  };
 
   onBlocklistChange = ({ value }) => {
     this.setState({ blocklist: value });
-  }
+  };
+
+  onSkipRedownloadChange = ({ value }) => {
+    this.setState({ skipRedownload: value });
+  };
 
   onRemoveConfirmed = () => {
     const state = this.state;
 
     this.resetState();
     this.props.onRemovePress(state);
-  }
+  };
 
   onModalClose = () => {
     this.resetState();
     this.props.onModalClose();
-  }
+  };
 
   //
   // Render
@@ -69,7 +76,7 @@ class RemoveQueueItemModal extends Component {
       isPending
     } = this.props;
 
-    const { remove, blocklist } = this.state;
+    const { remove, blocklist, skipRedownload } = this.state;
 
     return (
       <Modal
@@ -81,25 +88,25 @@ class RemoveQueueItemModal extends Component {
           onModalClose={this.onModalClose}
         >
           <ModalHeader>
-            Remove - {sourceTitle}
+            {translate('RemoveQueueItem', { sourceTitle })}
           </ModalHeader>
 
           <ModalBody>
             <div>
-              Are you sure you want to remove '{sourceTitle}' from the queue?
+              {translate('RemoveQueueItemConfirmation', { sourceTitle })}
             </div>
 
             {
               isPending ?
                 null :
                 <FormGroup>
-                  <FormLabel>Remove From Download Client</FormLabel>
+                  <FormLabel>{translate('RemoveFromDownloadClient')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.CHECK}
                     name="remove"
                     value={remove}
-                    helpTextWarning="Removing will remove the download and the file(s) from the download client."
+                    helpTextWarning={translate('RemoveFromDownloadClientHelpTextWarning')}
                     isDisabled={!canIgnore}
                     onChange={this.onRemoveChange}
                   />
@@ -107,29 +114,43 @@ class RemoveQueueItemModal extends Component {
             }
 
             <FormGroup>
-              <FormLabel>Add Release To Blocklist</FormLabel>
+              <FormLabel>{translate('BlocklistRelease')}</FormLabel>
 
               <FormInputGroup
                 type={inputTypes.CHECK}
                 name="blocklist"
                 value={blocklist}
-                helpText="Starts a search for this episode again and prevents this release from being grabbed again"
+                helpText={translate('BlocklistReleaseSearchEpisodeAgainHelpText')}
                 onChange={this.onBlocklistChange}
               />
             </FormGroup>
 
+            {
+              blocklist ?
+                <FormGroup>
+                  <FormLabel>{translate('SkipRedownload')}</FormLabel>
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="skipRedownload"
+                    value={skipRedownload}
+                    helpText={translate('SkipRedownloadHelpText')}
+                    onChange={this.onSkipRedownloadChange}
+                  />
+                </FormGroup> :
+                null
+            }
           </ModalBody>
 
           <ModalFooter>
             <Button onPress={this.onModalClose}>
-              Close
+              {translate('Close')}
             </Button>
 
             <Button
               kind={kinds.DANGER}
               onPress={this.onRemoveConfirmed}
             >
-              Remove
+              {translate('Remove')}
             </Button>
           </ModalFooter>
         </ModalContent>

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

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

frontend/src/Activity/Queue/RemoveQueueItemsModal.js

@@ -1,15 +1,16 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { inputTypes, kinds, sizes } from 'Helpers/Props';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
 import Button from 'Components/Link/Button';
 import Modal from 'Components/Modal/Modal';
-import FormGroup from 'Components/Form/FormGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalHeader from 'Components/Modal/ModalHeader';
 import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import { inputTypes, kinds, sizes } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import styles from './RemoveQueueItemsModal.css';
 
 class RemoveQueueItemsModal extends Component {
@@ -22,42 +23,48 @@ class RemoveQueueItemsModal extends Component {
 
     this.state = {
       remove: true,
-      blocklist: false
+      blocklist: false,
+      skipRedownload: false
     };
   }
 
   //
   // Control
 
-   resetState = function() {
-     this.setState({
-       remove: true,
-       blocklist: false
-     });
-   }
+  resetState = function() {
+    this.setState({
+      remove: true,
+      blocklist: false,
+      skipRedownload: false
+    });
+  };
 
-   //
-   // Listeners
+  //
+  // Listeners
 
-   onRemoveChange = ({ value }) => {
-     this.setState({ remove: value });
-   }
+  onRemoveChange = ({ value }) => {
+    this.setState({ remove: value });
+  };
 
   onBlocklistChange = ({ value }) => {
     this.setState({ blocklist: value });
-  }
+  };
+
+  onSkipRedownloadChange = ({ value }) => {
+    this.setState({ skipRedownload: value });
+  };
 
   onRemoveConfirmed = () => {
     const state = this.state;
 
     this.resetState();
     this.props.onRemovePress(state);
-  }
+  };
 
   onModalClose = () => {
     this.resetState();
     this.props.onModalClose();
-  }
+  };
 
   //
   // Render
@@ -70,7 +77,7 @@ class RemoveQueueItemsModal extends Component {
       allPending
     } = this.props;
 
-    const { remove, blocklist } = this.state;
+    const { remove, blocklist, skipRedownload } = this.state;
 
     return (
       <Modal
@@ -82,25 +89,25 @@ class RemoveQueueItemsModal extends Component {
           onModalClose={this.onModalClose}
         >
           <ModalHeader>
-            Remove Selected Item{selectedCount > 1 ? 's' : ''}
+            {selectedCount > 1 ? translate('RemoveSelectedItems') : translate('RemoveSelectedItem')}
           </ModalHeader>
 
           <ModalBody>
             <div className={styles.message}>
-              Are you sure you want to remove {selectedCount} item{selectedCount > 1 ? 's' : ''} from the queue?
+              {selectedCount > 1 ? translate('RemoveSelectedItemsQueueMessageText', { selectedCount }) : translate('RemoveSelectedItemQueueMessageText')}
             </div>
 
             {
               allPending ?
                 null :
                 <FormGroup>
-                  <FormLabel>Remove From Download Client</FormLabel>
+                  <FormLabel>{translate('RemoveFromDownloadClient')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.CHECK}
                     name="remove"
                     value={remove}
-                    helpTextWarning="Removing will remove the download and the file(s) from the download client."
+                    helpTextWarning={translate('RemoveFromDownloadClientHelpTextWarning')}
                     isDisabled={!canIgnore}
                     onChange={this.onRemoveChange}
                   />
@@ -109,30 +116,44 @@ class RemoveQueueItemsModal extends Component {
 
             <FormGroup>
               <FormLabel>
-                Add Release{selectedCount > 1 ? 's' : ''} To Blocklist
+                {selectedCount > 1 ? translate('BlocklistReleases') : translate('BlocklistRelease')}
               </FormLabel>
 
               <FormInputGroup
                 type={inputTypes.CHECK}
                 name="blocklist"
                 value={blocklist}
-                helpText="Prevents Sonarr from automatically grabbing this episode again"
+                helpText={translate('BlocklistReleaseSearchEpisodeAgainHelpText')}
                 onChange={this.onBlocklistChange}
               />
             </FormGroup>
 
+            {
+              blocklist ?
+                <FormGroup>
+                  <FormLabel>{translate('SkipRedownload')}</FormLabel>
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="skipRedownload"
+                    value={skipRedownload}
+                    helpText={translate('SkipRedownloadHelpText')}
+                    onChange={this.onSkipRedownloadChange}
+                  />
+                </FormGroup> :
+                null
+            }
           </ModalBody>
 
           <ModalFooter>
             <Button onPress={this.onModalClose}>
-              Close
+              {translate('Close')}
             </Button>
 
             <Button
               kind={kinds.DANGER}
               onPress={this.onRemoveConfirmed}
             >
-              Remove
+              {translate('Remove')}
             </Button>
           </ModalFooter>
         </ModalContent>

frontend/src/Activity/Queue/Status/QueueStatusConnector.js

@@ -2,8 +2,8 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { fetchQueueStatus } from 'Store/Actions/queueActions';
 import PageSidebarStatus from 'Components/Page/Sidebar/PageSidebarStatus';
+import { fetchQueueStatus } from 'Store/Actions/queueActions';
 
 function createMapStateToProps() {
   return createSelector(

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

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

frontend/src/Activity/Queue/TimeleftCell.js

@@ -1,10 +1,14 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import Icon from 'Components/Icon';
+import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import Tooltip from 'Components/Tooltip/Tooltip';
+import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import formatTime from 'Utilities/Date/formatTime';
 import formatTimeSpan from 'Utilities/Date/formatTimeSpan';
 import getRelativeDate from 'Utilities/Date/getRelativeDate';
 import formatBytes from 'Utilities/Number/formatBytes';
-import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import translate from 'Utilities/String/translate';
 import styles from './TimeleftCell.css';
 
 function TimeleftCell(props) {
@@ -24,11 +28,13 @@ function TimeleftCell(props) {
     const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true });
 
     return (
-      <TableRowCell
-        className={styles.timeleft}
-        title={`Delaying download until ${date} at ${time}`}
-      >
-        -
+      <TableRowCell className={styles.timeleft}>
+        <Tooltip
+          anchor={<Icon name={icons.INFO} />}
+          tooltip={translate('DelayingDownloadUntil', { date, time })}
+          kind={kinds.INVERSE}
+          position={tooltipPositions.TOP}
+        />
       </TableRowCell>
     );
   }
@@ -38,11 +44,13 @@ function TimeleftCell(props) {
     const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true });
 
     return (
-      <TableRowCell
-        className={styles.timeleft}
-        title={`Retrying download ${date} at ${time}`}
-      >
-        -
+      <TableRowCell className={styles.timeleft}>
+        <Tooltip
+          anchor={<Icon name={icons.INFO} />}
+          tooltip={translate('RetryingDownloadOn', { date, time })}
+          kind={kinds.INVERSE}
+          position={tooltipPositions.TOP}
+        />
       </TableRowCell>
     );
   }

frontend/src/AddSeries/AddNewSeries/AddNewSeries.css

@@ -6,12 +6,12 @@
 .searchIconContainer {
   width: 58px;
   height: 46px;
-  border: 1px solid $inputBorderColor;
+  border: 1px solid var(--inputBorderColor);
   border-right: none;
   border-radius: 4px;
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
-  background-color: #edf1f2;
+  background-color: var(--searchIconContainerBackgroundColor);
   text-align: center;
   line-height: 46px;
 }
@@ -25,7 +25,7 @@
 }
 
 .clearLookupButton {
-  border: 1px solid $inputBorderColor;
+  border: 1px solid var(--inputBorderColor);
   border-left: none;
   border-top-right-radius: 4px;
   border-bottom-right-radius: 4px;

frontend/src/AddSeries/AddNewSeries/AddNewSeries.css.d.ts

@@ -0,0 +1,15 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'clearLookupButton': string;
+  'helpText': string;
+  'message': string;
+  'noResults': string;
+  'noSeriesText': string;
+  'searchContainer': string;
+  'searchIconContainer': string;
+  'searchInput': string;
+  'searchResults': string;
+}
+export const cssExports: CssExports;
+export default cssExports;

frontend/src/AddSeries/AddNewSeries/AddNewSeries.js

@@ -1,14 +1,15 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import getErrorMessage from 'Utilities/Object/getErrorMessage';
-import { icons, kinds } from 'Helpers/Props';
+import TextInput from 'Components/Form/TextInput';
+import Icon from 'Components/Icon';
 import Button from 'Components/Link/Button';
 import Link from 'Components/Link/Link';
-import Icon from 'Components/Icon';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import TextInput from 'Components/Form/TextInput';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
+import { icons, kinds } from 'Helpers/Props';
+import getErrorMessage from 'Utilities/Object/getErrorMessage';
+import translate from 'Utilities/String/translate';
 import AddNewSeriesSearchResultConnector from './AddNewSeriesSearchResultConnector';
 import styles from './AddNewSeries.css';
 
@@ -66,12 +67,12 @@ class AddNewSeries extends Component {
         this.props.onClearSeriesLookup();
       }
     });
-  }
+  };
 
   onClearSeriesLookupPress = () => {
     this.setState({ term: '' });
     this.props.onClearSeriesLookup();
-  }
+  };
 
   //
   // Render
@@ -87,7 +88,7 @@ class AddNewSeries extends Component {
     const isFetching = this.state.isFetching;
 
     return (
-      <PageContent title="Add New Series">
+      <PageContent title={translate('AddNewSeries')}>
         <PageContentBody>
           <div className={styles.searchContainer}>
             <div className={styles.searchIconContainer}>
@@ -126,7 +127,7 @@ class AddNewSeries extends Component {
             !isFetching && !!error ?
               <div className={styles.message}>
                 <div className={styles.helpText}>
-                  Failed to load search results, please try again.
+                  {translate('AddNewSeriesError')}
                 </div>
                 <div>{getErrorMessage(error)}</div>
               </div> : null
@@ -151,11 +152,11 @@ class AddNewSeries extends Component {
           {
             !isFetching && !error && !items.length && !!term &&
               <div className={styles.message}>
-                <div className={styles.noResults}>Couldn't find any results for '{term}'</div>
-                <div>You can also search using TVDB ID of a show. eg. tvdb:71663</div>
+                <div className={styles.noResults}>{translate('CouldNotFindResults', { term })}</div>
+                <div>{translate('SearchByTvdbId')}</div>
                 <div>
                   <Link to="https://wiki.servarr.com/sonarr/faq#why-cant-i-add-a-new-series-when-i-know-the-tvdb-id">
-                    Why can't I find my show?
+                    {translate('WhyCantIFindMyShow')}
                   </Link>
                 </div>
               </div>
@@ -166,9 +167,9 @@ class AddNewSeries extends Component {
               null :
               <div className={styles.message}>
                 <div className={styles.helpText}>
-                  It's easy to add a new series, just start typing the name the series you want to add.
+                  {translate('AddNewSeriesHelpText')}
                 </div>
-                <div>You can also search using TVDB ID of a show. eg. tvdb:71663</div>
+                <div>{translate('SearchByTvdbId')}</div>
               </div>
           }
 
@@ -176,14 +177,14 @@ class AddNewSeries extends Component {
             !term && !hasExistingSeries ?
               <div className={styles.message}>
                 <div className={styles.noSeriesText}>
-                  You haven't added any series yet, do you want to import some or all of your series first?
+                  {translate('NoSeriesHaveBeenAdded')}
                 </div>
                 <div>
                   <Button
                     to="/add/import"
                     kind={kinds.PRIMARY}
                   >
-                    Import Existing Series
+                    {translate('ImportExistingSeries')}
                   </Button>
                 </div>
               </div> :

frontend/src/AddSeries/AddNewSeries/AddNewSeriesConnector.js

@@ -2,9 +2,9 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import parseUrl from 'Utilities/String/parseUrl';
-import { lookupSeries, clearAddSeries } from 'Store/Actions/addSeriesActions';
+import { clearAddSeries, lookupSeries } from 'Store/Actions/addSeriesActions';
 import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
+import parseUrl from 'Utilities/String/parseUrl';
 import AddNewSeries from './AddNewSeries';
 
 function createMapStateToProps() {
@@ -68,11 +68,11 @@ class AddNewSeriesConnector extends Component {
         this.props.lookupSeries({ term });
       }, 300);
     }
-  }
+  };
 
   onClearSeriesLookup = () => {
     this.props.clearAddSeries();
-  }
+  };
 
   //
   // Render

frontend/src/AddSeries/AddNewSeries/AddNewSeriesModalContent.css

@@ -4,7 +4,7 @@
 
 .year {
   margin-left: 5px;
-  color: $disabledColor;
+  color: var(--disabledColor);
 }
 
 .poster {
@@ -57,12 +57,6 @@
   composes: button from '~Components/Link/SpinnerButton.css';
 }
 
-.hideLanguageProfile {
-  composes: group from '~Components/Form/FormGroup.css';
-
-  display: none;
-}
-
 @media only screen and (max-width: $breakpointSmall) {
   .modalFooter {
     display: block;

frontend/src/AddSeries/AddNewSeries/AddNewSeriesModalContent.css.d.ts

@@ -0,0 +1,18 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'addButton': string;
+  'container': string;
+  'info': string;
+  'labelIcon': string;
+  'modalFooter': string;
+  'overview': string;
+  'poster': string;
+  'searchInput': string;
+  'searchInputContainer': string;
+  'searchLabel': string;
+  'searchLabelContainer': string;
+  'year': string;
+}
+export const cssExports: CssExports;
+export default cssExports;

frontend/src/AddSeries/AddNewSeries/AddNewSeriesModalContent.js

@@ -1,22 +1,23 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { icons, kinds, inputTypes, tooltipPositions } from 'Helpers/Props';
-import Icon from 'Components/Icon';
-import SpinnerButton from 'Components/Link/SpinnerButton';
-import Form from 'Components/Form/Form';
-import FormGroup from 'Components/Form/FormGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import CheckInput from 'Components/Form/CheckInput';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalHeader from 'Components/Modal/ModalHeader';
-import ModalBody from 'Components/Modal/ModalBody';
-import ModalFooter from 'Components/Modal/ModalFooter';
-import Popover from 'Components/Tooltip/Popover';
-import SeriesPoster from 'Series/SeriesPoster';
-import * as seriesTypes from 'Utilities/Series/seriesTypes';
 import SeriesMonitoringOptionsPopoverContent from 'AddSeries/SeriesMonitoringOptionsPopoverContent';
 import SeriesTypePopoverContent from 'AddSeries/SeriesTypePopoverContent';
+import CheckInput from 'Components/Form/CheckInput';
+import Form from 'Components/Form/Form';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import Icon from 'Components/Icon';
+import SpinnerButton from 'Components/Link/SpinnerButton';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import Popover from 'Components/Tooltip/Popover';
+import { icons, inputTypes, kinds, tooltipPositions } from 'Helpers/Props';
+import SeriesPoster from 'Series/SeriesPoster';
+import * as seriesTypes from 'Utilities/Series/seriesTypes';
+import translate from 'Utilities/String/translate';
 import styles from './AddNewSeriesModalContent.css';
 
 class AddNewSeriesModalContent extends Component {
@@ -45,11 +46,7 @@ class AddNewSeriesModalContent extends Component {
 
   onQualityProfileIdChange = ({ value }) => {
     this.props.onInputChange({ name: 'qualityProfileId', value: parseInt(value) });
-  }
-
-  onLanguageProfileIdChange = ({ value }) => {
-    this.props.onInputChange({ name: 'languageProfileId', value: parseInt(value) });
-  }
+  };
 
   onAddSeriesPress = () => {
     const {
@@ -59,7 +56,7 @@ class AddNewSeriesModalContent extends Component {
     this.props.onAddSeriesPress(
       seriesType
     );
-  }
+  };
 
   //
   // Render
@@ -74,14 +71,12 @@ class AddNewSeriesModalContent extends Component {
       rootFolderPath,
       monitor,
       qualityProfileId,
-      languageProfileId,
       seriesType,
       seasonFolder,
       searchForMissingEpisodes,
       searchForCutoffUnmetEpisodes,
       folder,
       tags,
-      showLanguageProfile,
       isSmallScreen,
       isWindows,
       onModalClose,
@@ -125,7 +120,7 @@ class AddNewSeriesModalContent extends Component {
 
               <Form {...otherProps}>
                 <FormGroup>
-                  <FormLabel>Root Folder</FormLabel>
+                  <FormLabel>{translate('RootFolder')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.ROOT_FOLDER_SELECT}
@@ -138,7 +133,7 @@ class AddNewSeriesModalContent extends Component {
                       seriesFolder: folder,
                       isWindows
                     }}
-                    helpText={`'${folder}' subfolder will be created automatically`}
+                    helpText={translate('AddNewSeriesRootFolderHelpText', { folder })}
                     onChange={onInputChange}
                     {...rootFolderPath}
                   />
@@ -146,7 +141,7 @@ class AddNewSeriesModalContent extends Component {
 
                 <FormGroup>
                   <FormLabel>
-                    Monitor
+                    {translate('Monitor')}
 
                     <Popover
                       anchor={
@@ -155,7 +150,7 @@ class AddNewSeriesModalContent extends Component {
                           name={icons.INFO}
                         />
                       }
-                      title="Monitoring Options"
+                      title={translate('MonitoringOptions')}
                       body={<SeriesMonitoringOptionsPopoverContent />}
                       position={tooltipPositions.RIGHT}
                     />
@@ -170,7 +165,7 @@ class AddNewSeriesModalContent extends Component {
                 </FormGroup>
 
                 <FormGroup>
-                  <FormLabel>Quality Profile</FormLabel>
+                  <FormLabel>{translate('QualityProfile')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.QUALITY_PROFILE_SELECT}
@@ -180,20 +175,9 @@ class AddNewSeriesModalContent extends Component {
                   />
                 </FormGroup>
 
-                <FormGroup className={showLanguageProfile ? undefined : styles.hideLanguageProfile}>
-                  <FormLabel>Language Profile</FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.LANGUAGE_PROFILE_SELECT}
-                    name="languageProfileId"
-                    onChange={this.onLanguageProfileIdChange}
-                    {...languageProfileId}
-                  />
-                </FormGroup>
-
                 <FormGroup>
                   <FormLabel>
-                    Series Type
+                    {translate('SeriesType')}
 
                     <Popover
                       anchor={
@@ -202,7 +186,7 @@ class AddNewSeriesModalContent extends Component {
                           name={icons.INFO}
                         />
                       }
-                      title="Series Types"
+                      title={translate('SeriesTypes')}
                       body={<SeriesTypePopoverContent />}
                       position={tooltipPositions.RIGHT}
                     />
@@ -214,11 +198,12 @@ class AddNewSeriesModalContent extends Component {
                     onChange={onInputChange}
                     {...seriesType}
                     value={this.state.seriesType}
+                    helpText={translate('SeriesTypesHelpText')}
                   />
                 </FormGroup>
 
                 <FormGroup>
-                  <FormLabel>Season Folder</FormLabel>
+                  <FormLabel>{translate('SeasonFolder')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.CHECK}
@@ -229,7 +214,7 @@ class AddNewSeriesModalContent extends Component {
                 </FormGroup>
 
                 <FormGroup>
-                  <FormLabel>Tags</FormLabel>
+                  <FormLabel>{translate('Tags')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.TAG}
@@ -247,7 +232,7 @@ class AddNewSeriesModalContent extends Component {
           <div>
             <label className={styles.searchLabelContainer}>
               <span className={styles.searchLabel}>
-                Start search for missing episodes
+                {translate('AddNewSeriesSearchForMissingEpisodes')}
               </span>
 
               <CheckInput
@@ -261,7 +246,7 @@ class AddNewSeriesModalContent extends Component {
 
             <label className={styles.searchLabelContainer}>
               <span className={styles.searchLabel}>
-                Start search for cutoff unmet episodes
+                {translate('AddNewSeriesSearchForCutoffUnmetEpisodes')}
               </span>
 
               <CheckInput
@@ -280,7 +265,7 @@ class AddNewSeriesModalContent extends Component {
             isSpinning={isAdding}
             onPress={this.onAddSeriesPress}
           >
-            Add {title}
+            {translate('AddSeriesWithTitle', { title })}
           </SpinnerButton>
         </ModalFooter>
       </ModalContent>
@@ -299,14 +284,12 @@ AddNewSeriesModalContent.propTypes = {
   rootFolderPath: PropTypes.object,
   monitor: PropTypes.object.isRequired,
   qualityProfileId: PropTypes.object,
-  languageProfileId: PropTypes.object,
   seriesType: PropTypes.object.isRequired,
   seasonFolder: PropTypes.object.isRequired,
   searchForMissingEpisodes: PropTypes.object.isRequired,
   searchForCutoffUnmetEpisodes: PropTypes.object.isRequired,
   folder: PropTypes.string.isRequired,
   tags: PropTypes.object.isRequired,
-  showLanguageProfile: PropTypes.bool.isRequired,
   isSmallScreen: PropTypes.bool.isRequired,
   isWindows: PropTypes.bool.isRequired,
   onModalClose: PropTypes.func.isRequired,

frontend/src/AddSeries/AddNewSeries/AddNewSeriesModalContentConnector.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { setAddSeriesDefault, addSeries } from 'Store/Actions/addSeriesActions';
+import { addSeries, setAddSeriesDefault } from 'Store/Actions/addSeriesActions';
 import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
 import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector';
 import selectSettings from 'Store/Selectors/selectSettings';
@@ -11,10 +11,9 @@ import AddNewSeriesModalContent from './AddNewSeriesModalContent';
 function createMapStateToProps() {
   return createSelector(
     (state) => state.addSeries,
-    (state) => state.settings.languageProfiles,
     createDimensionsSelector(),
     createSystemStatusSelector(),
-    (addSeriesState, languageProfiles, dimensions, systemStatus) => {
+    (addSeriesState, dimensions, systemStatus) => {
       const {
         isAdding,
         addError,
@@ -30,7 +29,6 @@ function createMapStateToProps() {
       return {
         isAdding,
         addError,
-        showLanguageProfile: languageProfiles.items.length > 1,
         isSmallScreen: dimensions.isSmallScreen,
         validationErrors,
         validationWarnings,
@@ -53,7 +51,7 @@ class AddNewSeriesModalContentConnector extends Component {
 
   onInputChange = ({ name, value }) => {
     this.props.setAddSeriesDefault({ [name]: value });
-  }
+  };
 
   onAddSeriesPress = (seriesType) => {
     const {
@@ -61,7 +59,6 @@ class AddNewSeriesModalContentConnector extends Component {
       rootFolderPath,
       monitor,
       qualityProfileId,
-      languageProfileId,
       seasonFolder,
       searchForMissingEpisodes,
       searchForCutoffUnmetEpisodes,
@@ -73,14 +70,13 @@ class AddNewSeriesModalContentConnector extends Component {
       rootFolderPath: rootFolderPath.value,
       monitor: monitor.value,
       qualityProfileId: qualityProfileId.value,
-      languageProfileId: languageProfileId.value,
       seriesType,
       seasonFolder: seasonFolder.value,
       searchForMissingEpisodes: searchForMissingEpisodes.value,
       searchForCutoffUnmetEpisodes: searchForCutoffUnmetEpisodes.value,
       tags: tags.value
     });
-  }
+  };
 
   //
   // Render
@@ -101,7 +97,6 @@ AddNewSeriesModalContentConnector.propTypes = {
   rootFolderPath: PropTypes.object,
   monitor: PropTypes.object.isRequired,
   qualityProfileId: PropTypes.object,
-  languageProfileId: PropTypes.object,
   seriesType: PropTypes.object.isRequired,
   seasonFolder: PropTypes.object.isRequired,
   searchForMissingEpisodes: PropTypes.object.isRequired,