Fix RemoveHelpTextWarning > RemoveFromDownloadClientHelpTextWarning

(cherry picked from commit 901b6d20841bfcb2a3724fe27b0fbddf5e41d669)

.gitattributes

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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,5 @@
 name: Bug Report
-description: 'Report a new bug, if you are not 100% certain this is a bug please go to our Discord first'
+description: 'Report a new bug, if you are not 100% certain this is a bug please go to our Reddit or Discord first'
 labels: ['Type: Bug', 'Status: Needs Triage']
 body:
 - type: checkboxes

.github/ISSUE_TEMPLATE/config.yml

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

.github/workflows/support.yml

@@ -15,7 +15,8 @@ jobs:
           issue-comment: >
             :wave: @{issue-author}, we use the issue tracker exclusively
             for bug reports and feature requests. However, this issue appears
-            to be a support request. Please hop over onto our [Discord](https://readarr.com/discord).
+            to be a support request. Please hop over onto our [Discord](https://readarr.com/discord) 
+            or [Subreddit](https://reddit.com/r/readarr)
           close-issue: true
           lock-issue: false
       - uses: dessant/support-requests@v3

README.md

@@ -30,6 +30,7 @@ Note that only one type of a given book is supported. If you want both an audiob
 
 [![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/readarr)
 [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://readarr.com/discord)
+[![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60)](https://www.reddit.com/r/readarr)
 
 Note: GitHub Issues are for Bugs and Feature Requests Only
 

azure-pipelines.yml

@@ -9,13 +9,13 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '0.3.15'
+  majorVersion: '0.3.2'
   minorVersion: $[counter('minorVersion', 1)]
   readarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(readarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.417'
+  dotnetVersion: '6.0.408'
   nodeVersion: '16.X'
   innoVersion: '6.2.0'
   windowsImage: 'windows-2022'
@@ -27,10 +27,6 @@ trigger:
     include:
     - develop
     - master
-  paths:
-    exclude:
-      - .github
-      - src/Readarr.Api.*/openapi.json
 
 pr:
   branches:
@@ -38,37 +34,82 @@ pr:
     - develop
   paths:
     exclude:
-    - .github
     - src/NzbDrone.Core/Localization/Core
-    - src/Readarr.Api.*/openapi.json
 
 stages:
-  - stage: Setup
-    displayName: Setup
+
+  - stage: Build_Backend_Windows
+    displayName: Build Backend
+    dependsOn: []
     jobs:
-    - job:
-      displayName: Build Variables
+    - job: Backend
+      strategy:
+        matrix:
+          Windows:
+            osName: 'Windows'
+            imageName: ${{ variables.windowsImage }}
+            enableAnalysis: 'false'
+
       pool:
-        vmImage: ${{ variables.linuxImage }}
+        vmImage: $(imageName)
+      variables:
+        # Disable stylecop here - linting errors get caught by the analyze task
+        EnableAnalyzers: $(enableAnalysis)
       steps:
       # Set the build name properly.  The 'name' property won't recursively expand so hack here:
       - bash: echo "##vso[build.updatebuildnumber]$READARRVERSION"
         displayName: Set Build Name
+      - checkout: self
+        submodules: true
+        fetchDepth: 1
+      - task: UseDotNet@2
+        displayName: 'Install .net core'
+        inputs:
+          version: $(dotnetVersion)
       - bash: |
-          if [[ $BUILD_REASON == "PullRequest" ]]; then
-          git diff origin/develop...HEAD  --name-only | grep -E "^(src/|azure-pipelines.yml)"
-          echo $? > not_backend_update
-          else
-          echo 0 > not_backend_update
+          SDK_PATH="${AGENT_TOOLSDIRECTORY}/dotnet/sdk/${DOTNETVERSION}"
+          BUNDLEDVERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
+          
+          if ! grep -q freebsd-x64 $BUNDLEDVERSIONS; then
+            sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
           fi
-          cat not_backend_update
-        displayName: Check for Backend File Changes
-      - publish: not_backend_update
-        artifact: not_backend_update
-        displayName: Publish update type
-  - stage: Build_Backend
-    displayName: Build Backend
-    dependsOn: Setup
+        displayName: Extra Platform Support
+      - task: Cache@2
+        inputs:
+          key: 'nuget | "$(Agent.OS)" | $(Build.SourcesDirectory)/src/Directory.Packages.props'
+          path: $(nugetCacheFolder)
+        displayName: Cache NuGet packages
+      - bash: ./build.sh --backend --enable-bsd
+        displayName: Build Readarr Backend
+        env:
+          NUGET_PACKAGES: $(nugetCacheFolder)
+      - powershell: Get-ChildItem _output\net6.0*,_output\*.Update\* -Recurse | Where { $_.Fullname -notlike "*\publish\*" -and $_.attributes -notlike "*directory*" } | Remove-Item
+        displayName: Clean up intermediate output
+      - publish: $(outputFolder)
+        artifact: '$(osName)Backend'
+        displayName: Publish Backend
+      - publish: '$(testsFolder)/net6.0/win-x64/publish'
+        artifact: win-x64-tests
+        displayName: Publish win-x64 Test Package
+      - publish: '$(testsFolder)/net6.0/linux-x64/publish'
+        artifact: linux-x64-tests
+        displayName: Publish linux-x64 Test Package
+      - publish: '$(testsFolder)/net6.0/linux-x86/publish'
+        artifact: linux-x86-tests
+        displayName: Publish linux-x86 Test Package
+      - publish: '$(testsFolder)/net6.0/linux-musl-x64/publish'
+        artifact: linux-musl-x64-tests
+        displayName: Publish linux-musl-x64 Test Package
+      - publish: '$(testsFolder)/net6.0/freebsd-x64/publish'
+        artifact: freebsd-x64-tests
+        displayName: Publish freebsd-x64 Test Package
+      - publish: '$(testsFolder)/net6.0/osx-x64/publish'
+        artifact: osx-x64-tests
+        displayName: Publish osx-x64 Test Package
+
+  - stage: Build_Backend_Other
+    displayName: Build Backend (Other OS)
+    dependsOn: []
     jobs:
     - job: Backend
       strategy:
@@ -81,10 +122,6 @@ stages:
             osName: 'Mac'
             imageName: ${{ variables.macImage }}
             enableAnalysis: 'false'
-          Windows:
-            osName: 'Windows'
-            imageName: ${{ variables.windowsImage }}
-            enableAnalysis: 'false'
 
       pool:
         vmImage: $(imageName)
@@ -100,17 +137,22 @@ stages:
         inputs:
           version: $(dotnetVersion)
       - bash: |
-          BUNDLEDVERSIONS=${AGENT_TOOLSDIRECTORY}/dotnet/sdk/${DOTNETVERSION}/Microsoft.NETCoreSdk.BundledVersions.props
-          echo $BUNDLEDVERSIONS
-          if grep -q freebsd-x64 $BUNDLEDVERSIONS; then
-            echo "Extra platforms already enabled"
-          else
-            echo "Enabling extra platform support"
+          SDK_PATH="${AGENT_TOOLSDIRECTORY}/dotnet/sdk/${DOTNETVERSION}"
+          BUNDLEDVERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
+          
+          if ! grep -q freebsd-x64 $BUNDLEDVERSIONS; then
             sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
           fi
-        displayName: Enable Extra Platform Support
+        displayName: Extra Platform Support
+      - task: Cache@2
+        inputs:
+          key: 'nuget | "$(Agent.OS)" | $(Build.SourcesDirectory)/src/Directory.Packages.props'
+          path: $(nugetCacheFolder)
+        displayName: Cache NuGet packages
       - bash: ./build.sh --backend --enable-extra-platforms
         displayName: Build Readarr Backend
+        env:
+          NUGET_PACKAGES: $(nugetCacheFolder)
       - bash: |
           find ${OUTPUTFOLDER} -type f ! -path "*/publish/*" -exec rm -rf {} \;
           find ${OUTPUTFOLDER} -depth -empty -type d -exec rm -r "{}" \;
@@ -118,38 +160,10 @@ stages:
           find ${TESTSFOLDER} -depth -empty -type d -exec rm -r "{}" \;
         displayName: Clean up intermediate output
         condition: and(succeeded(), ne(variables['osName'], 'Windows'))
-      - publish: $(outputFolder)
-        artifact: '$(osName)Backend'
-        displayName: Publish Backend
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/win-x64/publish'
-        artifact: win-x64-tests
-        displayName: Publish win-x64 Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/linux-x64/publish'
-        artifact: linux-x64-tests
-        displayName: Publish linux-x64 Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/linux-x86/publish'
-        artifact: linux-x86-tests
-        displayName: Publish linux-x86 Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/linux-musl-x64/publish'
-        artifact: linux-musl-x64-tests
-        displayName: Publish linux-musl-x64 Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/freebsd-x64/publish'
-        artifact: freebsd-x64-tests
-        displayName: Publish freebsd-x64 Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/osx-x64/publish'
-        artifact: osx-x64-tests
-        displayName: Publish osx-x64 Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
 
   - stage: Build_Frontend
     displayName: Frontend
-    dependsOn: Setup
+    dependsOn: []
     jobs:
     - job: Build
       strategy:
@@ -178,6 +192,7 @@ stages:
           key: 'yarn | "$(osName)" | yarn.lock'
           restoreKeys: |
              yarn | "$(osName)"
+             yarn
           path: $(yarnCacheFolder)
         displayName: Cache Yarn packages
       - bash: ./build.sh --frontend
@@ -189,10 +204,10 @@ stages:
         artifact: '$(osName)Frontend'
         displayName: Publish Frontend
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-
+        
   - stage: Installer
     dependsOn:
-    - Build_Backend
+    - Build_Backend_Windows
     - Build_Frontend
     jobs:
     - job: Windows_Installer
@@ -216,8 +231,8 @@ stages:
         displayName: Fetch Frontend
       - bash: |
           ./build.sh --packages --installer
-          cp distribution/windows/setup/output/Readarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x64-installer.exe
-          cp distribution/windows/setup/output/Readarr.*win-x86.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x86-installer.exe
+          cp setup/output/Readarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x64-installer.exe
+          cp setup/output/Readarr.*win-x86.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x86-installer.exe
         displayName: Create Installers
       - publish: $(Build.ArtifactStagingDirectory)
         artifact: 'WindowsInstaller'
@@ -225,7 +240,7 @@ stages:
 
   - stage: Packages
     dependsOn:
-    - Build_Backend
+    - Build_Backend_Windows
     - Build_Frontend
     jobs:
     - job: Other_Packages
@@ -391,29 +406,14 @@ stages:
           SENTRY_AUTH_TOKEN: $(sentryAuthTokenServarr)
           SENTRY_ORG: $(sentryOrg)
           SENTRY_URL: $(sentryUrl)
-
+    
   - stage: Unit_Test
     displayName: Unit Tests
-    dependsOn: Build_Backend
-
+    dependsOn: Build_Backend_Windows
+    condition: succeeded()
     jobs:
-    - job: Prepare
-      pool:
-        vmImage: ${{ variables.linuxImage }}
-      steps:
-      - checkout: none
-      - task: DownloadPipelineArtifact@2
-        inputs:
-          buildType: 'current'
-          artifactName: 'not_backend_update'
-          targetPath: '.'
-      - bash: echo "##vso[task.setvariable variable=backendNotUpdated;isOutput=true]$(cat not_backend_update)"
-        name: setVar
-
     - job: Unit
       displayName: Unit Native
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       workspace:
         clean: all
 
@@ -479,8 +479,6 @@ stages:
 
     - job: Unit_Docker
       displayName: Unit Docker
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       strategy:
         matrix:
           alpine:
@@ -494,11 +492,11 @@ stages:
 
       pool:
         vmImage: ${{ variables.linuxImage }}
-
+      
       container: $[ variables['containerImage'] ]
 
       timeoutInMinutes: 10
-
+        
       steps:
       - task: UseDotNet@2
         displayName: 'Install .NET'
@@ -532,14 +530,12 @@ stages:
           testResultsFiles: '**/TestResult.xml'
           testRunTitle: '$(testName) Unit Tests'
           failTaskOnFailedTests: true
-
-    - job: Unit_LinuxCore_Postgres14
-      displayName: Unit Native LinuxCore with Postgres14 Database
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
+          
+    - job: Unit_LinuxCore_Postgres
+      displayName: Unit Native LinuxCore with Postgres Database
       variables:
         pattern: 'Readarr.*.linux-core-x64.tar.gz'
-        artifactName: linux-x64-tests
+        artifactName: LinuxCoreTests
         Readarr__Postgres__Host: 'localhost'
         Readarr__Postgres__Port: '5432'
         Readarr__Postgres__User: 'readarr'
@@ -549,7 +545,7 @@ stages:
         vmImage: ${{ variables.linuxImage }}
 
       timeoutInMinutes: 10
-
+        
       steps:
       - task: UseDotNet@2
         displayName: 'Install .net core'
@@ -560,7 +556,7 @@ stages:
         displayName: Download Test Artifact
         inputs:
           buildType: 'current'
-          artifactName: $(artifactName)
+          artifactName: 'linux-x64-Tests'
           targetPath: $(testsFolder)
       - bash: find ${TESTSFOLDER} -name "Readarr.Test.Dummy" -exec chmod a+x {} \;
         displayName: Make Test Dummy Executable
@@ -583,84 +579,15 @@ stages:
         inputs:
           testResultsFormat: 'NUnit'
           testResultsFiles: '**/TestResult.xml'
-          testRunTitle: 'LinuxCore Postgres14 Unit Tests'
-          failTaskOnFailedTests: true
-
-    - job: Unit_LinuxCore_Postgres15
-      displayName: Unit Native LinuxCore with Postgres15 Database
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-      variables:
-        pattern: 'Readarr.*.linux-core-x64.tar.gz'
-        artifactName: linux-x64-tests
-        Readarr__Postgres__Host: 'localhost'
-        Readarr__Postgres__Port: '5432'
-        Readarr__Postgres__User: 'readarr'
-        Readarr__Postgres__Password: 'readarr'
-
-      pool:
-        vmImage: ${{ variables.linuxImage }}
-
-      timeoutInMinutes: 10
-
-      steps:
-      - task: UseDotNet@2
-        displayName: 'Install .net core'
-        inputs:
-          version: $(dotnetVersion)
-      - checkout: none
-      - task: DownloadPipelineArtifact@2
-        displayName: Download Test Artifact
-        inputs:
-          buildType: 'current'
-          artifactName: $(artifactName)
-          targetPath: $(testsFolder)
-      - bash: find ${TESTSFOLDER} -name "Readarr.Test.Dummy" -exec chmod a+x {} \;
-        displayName: Make Test Dummy Executable
-        condition: and(succeeded(), ne(variables['osName'], 'Windows'))
-      - bash: |
-          docker run -d --name=postgres15 \
-          -e POSTGRES_PASSWORD=readarr \
-          -e POSTGRES_USER=readarr \
-          -p 5432:5432/tcp \
-          -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
-          postgres:15
-        displayName: Start postgres
-      - bash: |
-          chmod a+x ${TESTSFOLDER}/test.sh
-          ls -lR ${TESTSFOLDER}
-          ${TESTSFOLDER}/test.sh Linux Unit Test
-        displayName: Run Tests
-      - task: PublishTestResults@2
-        displayName: Publish Test Results
-        inputs:
-          testResultsFormat: 'NUnit'
-          testResultsFiles: '**/TestResult.xml'
-          testRunTitle: 'LinuxCore Postgres15 Unit Tests'
+          testRunTitle: 'LinuxCore Postgres Unit Tests'
           failTaskOnFailedTests: true
 
   - stage: Integration
     displayName: Integration
     dependsOn: Packages
-
     jobs:
-    - job: Prepare
-      pool:
-        vmImage: ${{ variables.linuxImage }}
-      steps:
-      - checkout: none
-      - task: DownloadPipelineArtifact@2
-        inputs:
-          buildType: 'current'
-          artifactName: 'not_backend_update'
-          targetPath: '.'
-      - bash: echo "##vso[task.setvariable variable=backendNotUpdated;isOutput=true]$(cat not_backend_update)"
-        name: setVar
-
     - job: Integration_Native
       displayName: Integration Native
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       strategy:
         matrix:
           MacCore:
@@ -681,7 +608,7 @@ stages:
 
       pool:
         vmImage: $(imageName)
-
+        
       steps:
       - task: UseDotNet@2
         displayName: 'Install .net core'
@@ -703,7 +630,7 @@ stages:
           targetPath: $(Build.ArtifactStagingDirectory)
       - task: ExtractFiles@1
         inputs:
-          archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)'
+          archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)' 
           destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
         displayName: Extract Package
       - bash: |
@@ -722,10 +649,8 @@ stages:
           failTaskOnFailedTests: true
         displayName: Publish Test Results
 
-    - job: Integration_LinuxCore_Postgres14
-      displayName: Integration Native LinuxCore with Postgres14 Database
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
+    - job: Integration_LinuxCore_Postgres
+      displayName: Integration Native LinuxCore with Postgres Database
       variables:
         pattern: 'Readarr.*.linux-core-x64.tar.gz'
         Readarr__Postgres__Host: 'localhost'
@@ -757,7 +682,7 @@ stages:
             targetPath: $(Build.ArtifactStagingDirectory)
         - task: ExtractFiles@1
           inputs:
-            archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)'
+            archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)' 
             destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
           displayName: Extract Package
         - bash: |
@@ -780,77 +705,12 @@ stages:
           inputs:
             testResultsFormat: 'NUnit'
             testResultsFiles: '**/TestResult.xml'
-            testRunTitle: 'Integration LinuxCore Postgres14 Database Integration Tests'
-            failTaskOnFailedTests: true
-          displayName: Publish Test Results
-
-
-    - job: Integration_LinuxCore_Postgres15
-      displayName: Integration Native LinuxCore with Postgres Database
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-      variables:
-        pattern: 'Readarr.*.linux-core-x64.tar.gz'
-        Readarr__Postgres__Host: 'localhost'
-        Readarr__Postgres__Port: '5432'
-        Readarr__Postgres__User: 'readarr'
-        Readarr__Postgres__Password: 'readarr'
-
-      pool:
-        vmImage: ${{ variables.linuxImage }}
-
-      steps:
-        - task: UseDotNet@2
-          displayName: 'Install .net core'
-          inputs:
-            version: $(dotnetVersion)
-        - checkout: none
-        - task: DownloadPipelineArtifact@2
-          displayName: Download Test Artifact
-          inputs:
-            buildType: 'current'
-            artifactName: 'linux-x64-tests'
-            targetPath: $(testsFolder)
-        - task: DownloadPipelineArtifact@2
-          displayName: Download Build Artifact
-          inputs:
-            buildType: 'current'
-            artifactName: Packages
-            itemPattern: '**/$(pattern)'
-            targetPath: $(Build.ArtifactStagingDirectory)
-        - task: ExtractFiles@1
-          inputs:
-            archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)'
-            destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
-          displayName: Extract Package
-        - bash: |
-            mkdir -p ./bin/
-            cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Readarr/. ./bin/
-          displayName: Move Package Contents
-        - bash: |
-            docker run -d --name=postgres15 \
-            -e POSTGRES_PASSWORD=readarr \
-            -e POSTGRES_USER=readarr \
-            -p 5432:5432/tcp \
-            -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
-            postgres:15
-          displayName: Start postgres
-        - bash: |
-            chmod a+x ${TESTSFOLDER}/test.sh
-            ${TESTSFOLDER}/test.sh Linux Integration Test
-          displayName: Run Integration Tests
-        - task: PublishTestResults@2
-          inputs:
-            testResultsFormat: 'NUnit'
-            testResultsFiles: '**/TestResult.xml'
-            testRunTitle: 'Integration LinuxCore Postgres15 Database Integration Tests'
+            testRunTitle: 'Integration LinuxCore Postgres Database Integration Tests'
             failTaskOnFailedTests: true
           displayName: Publish Test Results
 
     - job: Integration_FreeBSD
       displayName: Integration Native FreeBSD
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       workspace:
         clean: all
       variables:
@@ -895,8 +755,6 @@ stages:
 
     - job: Integration_Docker
       displayName: Integration Docker
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       strategy:
         matrix:
           alpine:
@@ -915,7 +773,7 @@ stages:
       container: $[ variables['containerImage'] ]
 
       timeoutInMinutes: 15
-
+        
       steps:
       - task: UseDotNet@2
         displayName: 'Install .NET'
@@ -943,7 +801,7 @@ stages:
           targetPath: $(Build.ArtifactStagingDirectory)
       - task: ExtractFiles@1
         inputs:
-          archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)'
+          archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)' 
           destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
         displayName: Extract Package
       - bash: |
@@ -965,7 +823,7 @@ stages:
   - stage: Automation
     displayName: Automation
     dependsOn: Packages
-
+    
     jobs:
     - job: Automation
       strategy:
@@ -975,23 +833,20 @@ stages:
             artifactName: 'linux-x64'
             imageName: ${{ variables.linuxImage }}
             pattern: 'Readarr.*.linux-core-x64.tar.gz'
-            failBuild: true
           Mac:
             osName: 'Mac'
             artifactName: 'osx-x64'
             imageName: ${{ variables.macImage }}
             pattern: 'Readarr.*.osx-core-x64.tar.gz'
-            failBuild: true
           Windows:
             osName: 'Windows'
             artifactName: 'win-x64'
             imageName: ${{ variables.windowsImage }}
             pattern: 'Readarr.*.windows-core-x64.zip'
-            failBuild: true
 
       pool:
         vmImage: $(imageName)
-
+        
       steps:
       - task: UseDotNet@2
         displayName: 'Install .net core'
@@ -1013,7 +868,7 @@ stages:
           targetPath: $(Build.ArtifactStagingDirectory)
       - task: ExtractFiles@1
         inputs:
-          archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)'
+          archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)' 
           destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
         displayName: Extract Package
       - bash: |
@@ -1033,35 +888,20 @@ stages:
           TargetFolder: '$(Build.ArtifactStagingDirectory)/screenshots'
       - publish: $(Build.ArtifactStagingDirectory)/screenshots
         artifact: '$(osName)AutomationScreenshots'
-        displayName: Publish Screenshot Bundle
         condition: and(succeeded(), eq(variables['System.JobAttempt'], '1'))
+        displayName: Publish Screenshot Bundle
       - task: PublishTestResults@2
         inputs:
           testResultsFormat: 'NUnit'
           testResultsFiles: '**/TestResult.xml'
           testRunTitle: '$(osName) Automation Tests'
-          failTaskOnFailedTests: $(failBuild)
+          failTaskOnFailedTests: true
         displayName: Publish Test Results
 
   - stage: Analyze
-    dependsOn:
-    - Setup
+    dependsOn: []
     displayName: Analyze
-
     jobs:
-    - job: Prepare
-      pool:
-        vmImage: ${{ variables.linuxImage }}
-      steps:
-      - checkout: none
-      - task: DownloadPipelineArtifact@2
-        inputs:
-          buildType: 'current'
-          artifactName: 'not_backend_update'
-          targetPath: '.'
-      - bash: echo "##vso[task.setvariable variable=backendNotUpdated;isOutput=true]$(cat not_backend_update)"
-        name: setVar
-
     - job: Lint_Frontend
       displayName: Lint Frontend
       strategy:
@@ -1087,6 +927,7 @@ stages:
           key: 'yarn | "$(osName)" | yarn.lock'
           restoreKeys: |
              yarn | "$(osName)"
+             yarn
           path: $(yarnCacheFolder)
         displayName: Cache Yarn packages
       - bash: ./build.sh --lint
@@ -1115,16 +956,11 @@ stages:
           cliProjectVersion: '$(readarrVersion)'
           cliSources: './frontend'
       - task: SonarCloudAnalyze@1
-
+      
     - job: Api_Docs
       displayName: API Docs
-      dependsOn: Prepare
       condition: |
-        and
-        (
-          and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')),
-          and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-        )
+        and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
 
       pool:
         vmImage: ${{ variables.windowsImage }}
@@ -1137,7 +973,7 @@ stages:
       - checkout: self
         submodules: true
         persistCredentials: true
-        fetchDepth: 1
+        fetchDepth: 1    
       - bash: ./docs.sh Windows
         displayName: Create openapi.json
       - bash: |
@@ -1145,9 +981,10 @@ stages:
           git config --global user.name "Servarr"
           git checkout -b api-docs
           git add .
-          if git status | grep -q modified
+          git status
+          if git status | grep modified
           then
-            git commit -am 'Automated API Docs update'
+            git commit -am 'Automated API Docs update [skip ci]'
             git push -f --set-upstream origin api-docs
             curl -X POST -H "Authorization: token ${GITHUBTOKEN}" -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/readarr/readarr/pulls -d '{"head":"api-docs","base":"develop","title":"Update API docs"}'
           else
@@ -1171,25 +1008,33 @@ stages:
 
     - job: Analyze_Backend
       displayName: Backend
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
 
       variables:
         disable.coverage.autogenerate: 'true'
-        EnableAnalyzers: 'false'
-
       pool:
-        vmImage: ${{ variables.windowsImage }}
+        vmImage: ${{ variables.linuxImage }}
 
       steps:
       - task: UseDotNet@2
-        displayName: 'Install .net core'
+        displayName: 'Install .net core 2.1'
+        inputs:
+          version: 2.1.815
+      - task: UseDotNet@2
+        displayName: 'Install .net core 3.1'
+        inputs:
+          version: 3.1.413    
+      - task: UseDotNet@2
+        displayName: 'Install .net core 5.0'
         inputs:
           version: $(dotnetVersion)
       - checkout: self # Need history for Sonar analysis
         submodules: true
-      - powershell: Set-Service SCardSvr -StartupType Manual
-        displayName: Enable Windows Test Service
+      - task: Cache@2
+        inputs:
+          key: 'nuget | "$(Agent.OS)" | $(Build.SourcesDirectory)/src/Directory.Packages.props'
+          path: $(nugetCacheFolder)
+        displayName: Cache NuGet packages
+
       - task: SonarCloudPrepare@1
         condition: eq(variables['System.PullRequest.IsFork'], 'False')
         inputs:
@@ -1200,14 +1045,16 @@ stages:
           projectName: 'Readarr'
           projectVersion: '$(readarrVersion)'
           extraProperties: |
-            sonar.exclusions=**/obj/**,**/*.dll,**/NzbDrone.Core.Test/Files/**/*,./frontend/**,**/ExternalModules/**,./src/Libraries/**
+            sonar.exclusions=**/obj/**,**/*.dll,**/NzbDrone.Core.Test/Files/**/*,./frontend/**,./src/Libraries/**
             sonar.coverage.exclusions=**/Readarr.Api.V1/**/*
             sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml
             sonar.cs.nunit.reportsPaths=$(Build.SourcesDirectory)/TestResult.xml
       - bash: |
-          ./build.sh --backend -f net6.0 -r win-x64
-          TEST_DIR=_tests/net6.0/win-x64/publish/ ./test.sh Windows Unit Coverage
+          ./build.sh --backend -f net6.0 -r linux-x64
+          TEST_DIR=_tests/net6.0/linux-x64/publish/ ./test.sh Linux Unit Coverage
         displayName: Coverage Unit Tests
+        env:
+          NUGET_PACKAGES: $(nugetCacheFolder)
       - task: SonarCloudAnalyze@1
         condition: eq(variables['System.PullRequest.IsFork'], 'False')
         displayName: Publish SonarCloud Results
@@ -1230,6 +1077,7 @@ stages:
     - Unit_Test
     - Integration
     - Automation
+    - Build_Backend_Other
     condition: eq(variables['system.pullrequest.isfork'], false)
     displayName: Build Status Report
     jobs:
@@ -1253,4 +1101,3 @@ stages:
             DISCORDCHANNELID: $(discordChannelId)
             DISCORDWEBHOOKKEY: $(discordWebhookKey)
             DISCORDTHREADID: $(discordThreadId)
-

build.sh

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

frontend/babel.config.js

@@ -4,14 +4,14 @@ module.exports = {
   plugins: [
     // Stage 1
     '@babel/plugin-proposal-export-default-from',
-    ['@babel/plugin-transform-optional-chaining', { loose }],
-    ['@babel/plugin-transform-nullish-coalescing-operator', { loose }],
+    ['@babel/plugin-proposal-optional-chaining', { loose }],
+    ['@babel/plugin-proposal-nullish-coalescing-operator', { loose }],
 
     // Stage 2
-    '@babel/plugin-transform-export-namespace-from',
+    '@babel/plugin-proposal-export-namespace-from',
 
     // Stage 3
-    ['@babel/plugin-transform-class-properties', { loose }],
+    ['@babel/plugin-proposal-class-properties', { loose }],
     '@babel/plugin-syntax-dynamic-import'
   ],
   env: {

frontend/src/Activity/Queue/Queue.js

@@ -338,8 +338,4 @@ Queue.propTypes = {
   onRemoveSelectedPress: PropTypes.func.isRequired
 };
 
-Queue.defaultProps = {
-  count: 0
-};
-
 export default Queue;

frontend/src/Activity/Queue/RemoveQueueItemModal.js

@@ -108,7 +108,7 @@ class RemoveQueueItemModal extends Component {
                     type={inputTypes.CHECK}
                     name="remove"
                     value={remove}
-                    helpTextWarning={translate('RemoveHelpTextWarning')}
+                    helpTextWarning={translate('RemoveFromDownloadClientHelpTextWarning')}
                     isDisabled={!canIgnore}
                     onChange={this.onRemoveChange}
                   />

frontend/src/App/AppUpdatedModalContent.css

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

frontend/src/App/AppUpdatedModalContent.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Button from 'Components/Link/Button';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
@@ -65,12 +64,12 @@ function AppUpdatedModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {translate('AppUpdated', { appName: 'Readarr' })}
+        Readarr Updated
       </ModalHeader>
 
       <ModalBody>
         <div>
-          <InlineMarkdown data={translate('AppUpdatedVersion', { appName: 'Readarr', version })} blockClassName={styles.version} />
+          Version <span className={styles.version}>{version}</span> of Readarr has been installed, in order to get the latest changes you'll need to reload Readarr.
         </div>
 
         {
@@ -78,14 +77,16 @@ function AppUpdatedModalContent(props) {
             <div>
               {
                 !update.changes &&
-                  <div className={styles.maintenance}>{translate('MaintenanceRelease')}</div>
+                  <div className={styles.maintenance}>
+                    {translate('MaintenanceRelease')}
+                  </div>
               }
 
               {
                 !!update.changes &&
                   <div>
                     <div className={styles.changes}>
-                      {translate('WhatsNew')}
+                      What's new?
                     </div>
 
                     <UpdateChanges
@@ -112,14 +113,14 @@ function AppUpdatedModalContent(props) {
         <Button
           onPress={onSeeChangesPress}
         >
-          {translate('RecentChanges')}
+          Recent Changes
         </Button>
 
         <Button
           kind={kinds.PRIMARY}
           onPress={onModalClose}
         >
-          {translate('Reload')}
+          Reload
         </Button>
       </ModalFooter>
     </ModalContent>

frontend/src/App/ConnectionLostModal.js

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

frontend/src/Author/AuthorImage.js

@@ -7,10 +7,13 @@ function findImage(images, coverType) {
 }
 
 function getUrl(image, coverType, size) {
-  const imageUrl = image?.url;
+  if (image) {
+    // Remove protocol
+    let url = image.url;
 
-  if (imageUrl) {
-    return imageUrl.replace(`${coverType}.jpg`, `${coverType}-${size}.jpg`);
+    url = url.replace(`${coverType}.jpg`, `${coverType}-${size}.jpg`);
+
+    return url;
   }
 }
 

frontend/src/Author/Details/AuthorDetails.css

@@ -44,10 +44,6 @@
   margin-top: 20px;
 }
 
-.filterIcon {
-  float: right;
-}
-
 .authorNavigationButtons {
   position: absolute;
   right: 0;

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

@@ -6,7 +6,6 @@ interface CssExports {
   'authorUpButton': string;
   'contentContainer': string;
   'errorMessage': string;
-  'filterIcon': string;
   'innerContentBody': string;
   'metadataMessage': string;
   'selectedTab': string;

frontend/src/Author/Details/AuthorDetails.js

@@ -239,14 +239,9 @@ class AuthorDetails extends Component {
       saveError,
       isDeleting,
       deleteError,
-      statistics = {}
+      statistics
     } = this.props;
 
-    const {
-      bookFileCount = 0,
-      totalBookCount = 0
-    } = statistics;
-
     const {
       isOrganizeModalOpen,
       isRetagModalOpen,
@@ -440,7 +435,7 @@ class AuthorDetails extends Component {
                       className={styles.tab}
                       selectedClassName={styles.selectedTab}
                     >
-                      {translate('BooksTotal', [totalBookCount])}
+                      {translate('BooksTotal', [statistics.totalBookCount])}
                     </Tab>
 
                     <Tab
@@ -468,7 +463,7 @@ class AuthorDetails extends Component {
                       className={styles.tab}
                       selectedClassName={styles.selectedTab}
                     >
-                      {translate('FilesTotal', [bookFileCount])}
+                      {translate('FilesTotal', [statistics.bookFileCount])}
                     </Tab>
 
                     {

frontend/src/Author/Details/AuthorDetailsConnector.js

@@ -155,6 +155,7 @@ function createMapStateToProps() {
       const isRefreshing = isAuthorRefreshing || allAuthorRefreshing;
       const isSearching = isCommandExecuting(findCommand(commands, { name: commandNames.AUTHOR_SEARCH, authorId: author.id }));
       const isRenamingFiles = isCommandExecuting(findCommand(commands, { name: commandNames.RENAME_FILES, authorId: author.id }));
+
       const isRenamingAuthorCommand = findCommand(commands, { name: commandNames.RENAME_AUTHOR });
       const isRenamingAuthor = (
         isCommandExecuting(isRenamingAuthorCommand) &&

frontend/src/Author/Details/AuthorDetailsHeader.css

@@ -136,9 +136,8 @@
   }
 
   .title {
-    font-weight: 300;
     font-size: 30px;
-    line-height: 30px;
+    line-height: 50px;
   }
 }
 

frontend/src/Author/Details/AuthorDetailsHeader.js

@@ -25,7 +25,12 @@ const defaultFontSize = parseInt(fonts.defaultFontSize);
 const lineHeight = parseFloat(fonts.lineHeight);
 
 function getFanartUrl(images) {
-  return images.find((x) => x.coverType === 'fanart')?.url;
+  const fanartImage = images.find((x) => x.coverType === 'fanart');
+
+  if (fanartImage) {
+    // Remove protocol
+    return fanartImage.url.replace(/^https?:/, '');
+  }
 }
 
 class AuthorDetailsHeader extends Component {

frontend/src/Author/History/AuthorHistoryModal.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import Modal from 'Components/Modal/Modal';
-import { sizes } from 'Helpers/Props';
 import AuthorHistoryContentConnector from './AuthorHistoryContentConnector';
 import AuthorHistoryModalContent from './AuthorHistoryModalContent';
 
@@ -15,7 +14,6 @@ function AuthorHistoryModal(props) {
   return (
     <Modal
       isOpen={isOpen}
-      size={sizes.EXTRA_LARGE}
       onModalClose={onModalClose}
     >
       <AuthorHistoryContentConnector

frontend/src/Author/History/AuthorHistoryModalContent.js

@@ -5,7 +5,6 @@ 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';
 import AuthorHistoryTableContent from './AuthorHistoryTableContent';
 
 class AuthorHistoryModalContent extends Component {
@@ -21,7 +20,7 @@ class AuthorHistoryModalContent extends Component {
     return (
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          {translate('History')}
+          History
         </ModalHeader>
 
         <ModalBody>
@@ -32,7 +31,7 @@ class AuthorHistoryModalContent extends Component {
 
         <ModalFooter>
           <Button onPress={onModalClose}>
-            {translate('Close')}
+            Close
           </Button>
         </ModalFooter>
       </ModalContent>

frontend/src/Author/History/AuthorHistoryRow.css

@@ -4,6 +4,7 @@
   word-break: break-word;
 }
 
+.details,
 .actions {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 

frontend/src/Author/History/AuthorHistoryRow.css.d.ts

@@ -2,6 +2,7 @@
 // Please do not change this file!
 interface CssExports {
   'actions': string;
+  'details': string;
   'sourceTitle': string;
 }
 export const cssExports: CssExports;

frontend/src/Author/History/AuthorHistoryRow.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import HistoryDetailsConnector from 'Activity/History/Details/HistoryDetailsConnector';
 import HistoryEventTypeCell from 'Activity/History/HistoryEventTypeCell';
-import BookFormats from 'Book/BookFormats';
 import BookQuality from 'Book/BookQuality';
 import Icon from 'Components/Icon';
 import IconButton from 'Components/Link/IconButton';
@@ -12,7 +11,6 @@ import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
 import Popover from 'Components/Tooltip/Popover';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
-import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import translate from 'Utilities/String/translate';
 import styles from './AuthorHistoryRow.css';
 
@@ -77,8 +75,6 @@ class AuthorHistoryRow extends Component {
       sourceTitle,
       quality,
       qualityCutoffNotMet,
-      customFormats,
-      customFormatScore,
       date,
       data,
       book
@@ -110,19 +106,11 @@ class AuthorHistoryRow extends Component {
           />
         </TableRowCell>
 
-        <TableRowCell>
-          <BookFormats formats={customFormats} />
-        </TableRowCell>
-
-        <TableRowCell>
-          {formatCustomFormatScore(customFormatScore, customFormats.length)}
-        </TableRowCell>
-
         <RelativeDateCellConnector
           date={date}
         />
 
-        <TableRowCell className={styles.actions}>
+        <TableRowCell className={styles.details}>
           <Popover
             anchor={
               <Icon
@@ -139,13 +127,14 @@ class AuthorHistoryRow extends Component {
             }
             position={tooltipPositions.LEFT}
           />
+        </TableRowCell>
 
+        <TableRowCell className={styles.actions}>
           {
             eventType === 'grabbed' &&
               <IconButton
                 title={translate('MarkAsFailed')}
                 name={icons.REMOVE}
-                size={14}
                 onPress={this.onMarkAsFailedPress}
               />
           }
@@ -171,8 +160,6 @@ AuthorHistoryRow.propTypes = {
   sourceTitle: PropTypes.string.isRequired,
   quality: PropTypes.object.isRequired,
   qualityCutoffNotMet: PropTypes.bool.isRequired,
-  customFormats: PropTypes.arrayOf(PropTypes.object),
-  customFormatScore: PropTypes.number.isRequired,
   date: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired,
   fullAuthor: PropTypes.bool.isRequired,

frontend/src/Author/History/AuthorHistoryTable.css

@@ -1,9 +0,0 @@
-.container {
-  border: 1px solid var(--borderColor);
-  border-radius: 4px;
-  background-color: var(--inputBackgroundColor);
-
-  &:last-of-type {
-    margin-bottom: 0;
-  }
-}

frontend/src/Author/History/AuthorHistoryTable.css.d.ts

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

frontend/src/Author/History/AuthorHistoryTable.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import AuthorHistoryContentConnector from 'Author/History/AuthorHistoryContentConnector';
 import AuthorHistoryTableContent from 'Author/History/AuthorHistoryTableContent';
-import styles from './AuthorHistoryTable.css';
 
 function AuthorHistoryTable(props) {
   const {
@@ -9,12 +8,10 @@ function AuthorHistoryTable(props) {
   } = props;
 
   return (
-    <div className={styles.container}>
-      <AuthorHistoryContentConnector
-        component={AuthorHistoryTableContent}
-        {...otherProps}
-      />
-    </div>
+    <AuthorHistoryContentConnector
+      component={AuthorHistoryTableContent}
+      {...otherProps}
+    />
   );
 }
 

frontend/src/Author/History/AuthorHistoryTableContent.css

@@ -1,5 +0,0 @@
-.blankpad {
-  padding-top: 10px;
-  padding-bottom: 10px;
-  padding-left: 2em;
-}

frontend/src/Author/History/AuthorHistoryTableContent.css.d.ts

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

frontend/src/Author/History/AuthorHistoryTableContent.js

@@ -1,14 +1,12 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Alert from 'Components/Alert';
-import Icon from 'Components/Icon';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
-import { icons, kinds } from 'Helpers/Props';
+import { kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import AuthorHistoryRowConnector from './AuthorHistoryRowConnector';
-import styles from './AuthorHistoryTableContent.css';
 
 const columns = [
   {
@@ -17,41 +15,32 @@ const columns = [
   },
   {
     name: 'book',
-    label: () => translate('Book'),
+    label: 'Book',
     isVisible: true
   },
   {
     name: 'sourceTitle',
-    label: () => translate( 'SourceTitle'),
+    label: 'Source Title',
     isVisible: true
   },
   {
     name: 'quality',
-    label: () => translate('Quality'),
-    isVisible: true
-  },
-  {
-    name: 'customFormats',
-    label: () => translate('CustomFormats'),
-    isSortable: false,
-    isVisible: true
-  },
-  {
-    name: 'customFormatScore',
-    label: React.createElement(Icon, {
-      name: icons.SCORE,
-      title: () => translate('CustomFormatScore')
-    }),
-    isSortable: true,
+    label: 'Quality',
     isVisible: true
   },
   {
     name: 'date',
-    label: () => translate('Date'),
+    label: 'Date',
+    isVisible: true
+  },
+  {
+    name: 'details',
+    label: 'Details',
     isVisible: true
   },
   {
     name: 'actions',
+    label: 'Actions',
     isVisible: true
   }
 ];
@@ -75,7 +64,7 @@ class AuthorHistoryTableContent extends Component {
     const hasItems = !!items.length;
 
     return (
-      <div>
+      <>
         {
           isFetching &&
             <LoadingIndicator />
@@ -90,7 +79,7 @@ class AuthorHistoryTableContent extends Component {
 
         {
           isPopulated && !hasItems && !error &&
-            <div className={styles.blankpad}>
+            <div>
               {translate('NoHistory')}
             </div>
         }
@@ -114,7 +103,7 @@ class AuthorHistoryTableContent extends Component {
               </TableBody>
             </Table>
         }
-      </div>
+      </>
     );
   }
 }

frontend/src/Author/Index/AuthorIndexConnector.js

@@ -16,7 +16,7 @@ import AuthorIndex from './AuthorIndex';
 function createMapStateToProps() {
   return createSelector(
     createAuthorClientSideCollectionItemsSelector('authorIndex'),
-    createCommandExecutingSelector(commandNames.BULK_REFRESH_AUTHOR),
+    createCommandExecutingSelector(commandNames.REFRESH_AUTHOR),
     createCommandExecutingSelector(commandNames.RSS_SYNC),
     createCommandExecutingSelector(commandNames.RENAME_AUTHOR),
     createCommandExecutingSelector(commandNames.RETAG_AUTHOR),
@@ -24,17 +24,17 @@ function createMapStateToProps() {
     (
       author,
       isRefreshingAuthor,
-      isRssSyncExecuting,
       isOrganizingAuthor,
       isRetaggingAuthor,
+      isRssSyncExecuting,
       dimensionsState
     ) => {
       return {
         ...author,
         isRefreshingAuthor,
-        isRssSyncExecuting,
         isOrganizingAuthor,
         isRetaggingAuthor,
+        isRssSyncExecuting,
         isSmallScreen: dimensionsState.isSmallScreen
       };
     }

frontend/src/Book/BookQuality.js

@@ -3,7 +3,6 @@ import React from 'react';
 import Label from 'Components/Label';
 import { kinds } from 'Helpers/Props';
 import formatBytes from 'Utilities/Number/formatBytes';
-import translate from 'Utilities/String/translate';
 
 function getTooltip(title, quality, size, isMonitored, isCutoffNotMet) {
   const revision = quality.revision;
@@ -29,36 +28,6 @@ function getTooltip(title, quality, size, isMonitored, isCutoffNotMet) {
   return title;
 }
 
-function revisionLabel(className, quality, showRevision) {
-  if (!showRevision) {
-    return;
-  }
-
-  if (quality.revision.isRepack) {
-    return (
-      <Label
-        className={className}
-        kind={kinds.PRIMARY}
-        title={translate('Repack')}
-      >
-        R
-      </Label>
-    );
-  }
-
-  if (quality.revision.version && quality.revision.version > 1) {
-    return (
-      <Label
-        className={className}
-        kind={kinds.PRIMARY}
-        title={translate('Proper')}
-      >
-        P
-      </Label>
-    );
-  }
-}
-
 function BookQuality(props) {
   const {
     className,
@@ -66,8 +35,7 @@ function BookQuality(props) {
     quality,
     size,
     isMonitored,
-    isCutoffNotMet,
-    showRevision
+    isCutoffNotMet
   } = props;
 
   let kind = kinds.DEFAULT;
@@ -82,15 +50,13 @@ function BookQuality(props) {
   }
 
   return (
-    <span>
-      <Label
-        className={className}
-        kind={kind}
-        title={getTooltip(title, quality, size, isMonitored, isCutoffNotMet)}
-      >
-        {quality.quality.name}
-      </Label>{revisionLabel(className, quality, showRevision)}
-    </span>
+    <Label
+      className={className}
+      kind={kind}
+      title={getTooltip(title, quality, size, isMonitored, isCutoffNotMet)}
+    >
+      {quality.quality.name}
+    </Label>
   );
 }
 
@@ -100,14 +66,12 @@ BookQuality.propTypes = {
   quality: PropTypes.object.isRequired,
   size: PropTypes.number,
   isMonitored: PropTypes.bool,
-  isCutoffNotMet: PropTypes.bool,
-  showRevision: PropTypes.bool
+  isCutoffNotMet: PropTypes.bool
 };
 
 BookQuality.defaultProps = {
   title: '',
-  isMonitored: true,
-  showRevision: false
+  isMonitored: true
 };
 
 export default BookQuality;

frontend/src/Book/Details/BookDetails.js

@@ -99,14 +99,9 @@ class BookDetails extends Component {
       nextBook,
       isSearching,
       onRefreshPress,
-      onSearchPress,
-      statistics = {}
+      onSearchPress
     } = this.props;
 
-    const {
-      bookFileCount = 0
-    } = statistics;
-
     const {
       isOrganizeModalOpen,
       isRetagModalOpen,
@@ -243,21 +238,21 @@ class BookDetails extends Component {
                   className={styles.tab}
                   selectedClassName={styles.selectedTab}
                 >
-                  {translate('History')}
+                  History
                 </Tab>
 
                 <Tab
                   className={styles.tab}
                   selectedClassName={styles.selectedTab}
                 >
-                  {translate('Search')}
+                  Search
                 </Tab>
 
                 <Tab
                   className={styles.tab}
                   selectedClassName={styles.selectedTab}
                 >
-                  {translate('FilesTotal', [bookFileCount])}
+                  Files
                 </Tab>
 
                 {
@@ -340,7 +335,6 @@ BookDetails.propTypes = {
   ratings: PropTypes.object.isRequired,
   images: PropTypes.arrayOf(PropTypes.object).isRequired,
   links: PropTypes.arrayOf(PropTypes.object).isRequired,
-  statistics: PropTypes.object.isRequired,
   monitored: PropTypes.bool.isRequired,
   shortDateFormat: PropTypes.string.isRequired,
   isSaving: PropTypes.bool.isRequired,

frontend/src/Book/Details/BookDetailsConnector.js

@@ -69,21 +69,16 @@ function createMapStateToProps() {
 
       const previousBook = sortedBooks[bookIndex - 1] || _.last(sortedBooks);
       const nextBook = sortedBooks[bookIndex + 1] || _.first(sortedBooks);
-      const isRefreshingCommand = findCommand(commands, { name: commandNames.REFRESH_BOOK });
-      const isRefreshing = (
-        isCommandExecuting(isRefreshingCommand) &&
-        isRefreshingCommand.body.bookId === book.id
-      );
       const isSearchingCommand = findCommand(commands, { name: commandNames.BOOK_SEARCH });
       const isSearching = (
         isCommandExecuting(isSearchingCommand) &&
         isSearchingCommand.body.bookIds.indexOf(book.id) > -1
       );
-      const isRenamingFiles = isCommandExecuting(findCommand(commands, { name: commandNames.RENAME_FILES, authorId: author.id }));
-      const isRenamingAuthorCommand = findCommand(commands, { name: commandNames.RENAME_AUTHOR });
-      const isRenamingAuthor = (
-        isCommandExecuting(isRenamingAuthorCommand) &&
-        isRenamingAuthorCommand.body.authorIds.indexOf(author.id) > -1
+
+      const isRefreshingCommand = findCommand(commands, { name: commandNames.REFRESH_BOOK });
+      const isRefreshing = (
+        isCommandExecuting(isRefreshingCommand) &&
+        isRefreshingCommand.body.bookId === book.id
       );
 
       const isFetching = isBookFilesFetching || editions.isFetching;
@@ -95,8 +90,6 @@ function createMapStateToProps() {
         author,
         isRefreshing,
         isSearching,
-        isRenamingFiles,
-        isRenamingAuthor,
         isFetching,
         isPopulated,
         bookFilesError,
@@ -132,27 +125,9 @@ class BookDetailsConnector extends Component {
   }
 
   componentDidUpdate(prevProps) {
-    const {
-      id,
-      anyReleaseOk,
-      isRenamingFiles,
-      isRenamingAuthor
-    } = this.props;
-
-    if (
-      (prevProps.isRenamingFiles && !isRenamingFiles) ||
-      (prevProps.isRenamingAuthor && !isRenamingAuthor) ||
+    if (prevProps.id !== this.props.id ||
       !_.isEqual(getMonitoredEditions(prevProps), getMonitoredEditions(this.props)) ||
-      (prevProps.anyReleaseOk === false && anyReleaseOk === true)
-    ) {
-      this.unpopulate();
-      this.populate();
-    }
-
-    // If the id has changed we need to clear the book
-    // files and fetch from the server.
-
-    if (prevProps.id !== id) {
+        (prevProps.anyReleaseOk === false && this.props.anyReleaseOk === true)) {
       this.unpopulate();
       this.populate();
     }
@@ -222,8 +197,6 @@ class BookDetailsConnector extends Component {
 BookDetailsConnector.propTypes = {
   id: PropTypes.number,
   anyReleaseOk: PropTypes.bool,
-  isRenamingFiles: PropTypes.bool.isRequired,
-  isRenamingAuthor: PropTypes.bool.isRequired,
   isBookFetching: PropTypes.bool,
   isBookPopulated: PropTypes.bool,
   titleSlug: PropTypes.string.isRequired,

frontend/src/Book/Details/BookDetailsHeader.css

@@ -117,9 +117,8 @@
   }
 
   .title {
-    font-weight: 300;
     font-size: 30px;
-    line-height: 30px;
+    line-height: 50px;
   }
 }
 

frontend/src/Book/Details/BookDetailsHeader.js

@@ -21,7 +21,12 @@ const defaultFontSize = parseInt(fonts.defaultFontSize);
 const lineHeight = parseFloat(fonts.lineHeight);
 
 function getFanartUrl(images) {
-  return images.find((x) => x.coverType === 'fanart')?.url;
+  const fanartImage = images.find((x) => x.coverType === 'fanart');
+
+  if (fanartImage) {
+    // Remove protocol
+    return fanartImage.url.replace(/^https?:/, '');
+  }
 }
 
 class BookDetailsHeader extends Component {

frontend/src/Book/Index/BookIndexConnector.js

@@ -16,8 +16,8 @@ import BookIndex from './BookIndex';
 function createMapStateToProps() {
   return createSelector(
     createBookClientSideCollectionItemsSelector('bookIndex'),
-    createCommandExecutingSelector(commandNames.BULK_REFRESH_AUTHOR),
-    createCommandExecutingSelector(commandNames.BULK_REFRESH_BOOK),
+    createCommandExecutingSelector(commandNames.REFRESH_AUTHOR),
+    createCommandExecutingSelector(commandNames.REFRESH_BOOK),
     createCommandExecutingSelector(commandNames.RSS_SYNC),
     createCommandExecutingSelector(commandNames.CUTOFF_UNMET_BOOK_SEARCH),
     createCommandExecutingSelector(commandNames.MISSING_BOOK_SEARCH),

frontend/src/Book/Index/Table/BookIndexRow.js

@@ -229,6 +229,7 @@ class BookIndexRow extends Component {
                   className={styles[name]}
                 >
                   {bookFileCount}
+
                 </VirtualTableRowCell>
               );
             }

frontend/src/BookFile/Editor/BookFileEditorTable.css

@@ -1,9 +0,0 @@
-.container {
-  border: 1px solid var(--borderColor);
-  border-radius: 4px;
-  background-color: var(--inputBackgroundColor);
-
-  &:last-of-type {
-    margin-bottom: 0;
-  }
-}

frontend/src/BookFile/Editor/BookFileEditorTable.css.d.ts

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

frontend/src/BookFile/Editor/BookFileEditorTable.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import BookFileEditorTableContentConnector from './BookFileEditorTableContentConnector';
-import styles from './BookFileEditorTable.css';
 
 function BookFileEditorTable(props) {
   const {
@@ -8,11 +7,9 @@ function BookFileEditorTable(props) {
   } = props;
 
   return (
-    <div className={styles.container}>
-      <BookFileEditorTableContentConnector
-        {...otherProps}
-      />
-    </div>
+    <BookFileEditorTableContentConnector
+      {...otherProps}
+    />
   );
 }
 

frontend/src/BookFile/Editor/BookFileEditorTableContent.css

@@ -1,6 +1,6 @@
 .filesTable {
-  margin: 10px;
-  padding-top: 5px;
+  margin-bottom: 20px;
+  padding-top: 15px;
   border: 1px solid var(--borderColor);
   border-top: 1px solid var(--borderColor);
   border-radius: 4px;
@@ -13,15 +13,9 @@
 
 .actions {
   display: flex;
-  margin: 10px;
+  margin-right: auto;
 }
 
 .selectInput {
   margin-left: 10px;
 }
-
-.blankpad {
-  padding-top: 10px;
-  padding-bottom: 10px;
-  padding-left: 2em;
-}

frontend/src/BookFile/Editor/BookFileEditorTableContent.css.d.ts

@@ -2,7 +2,6 @@
 // Please do not change this file!
 interface CssExports {
   'actions': string;
-  'blankpad': string;
   'filesTable': string;
   'selectInput': string;
 }

frontend/src/BookFile/Editor/BookFileEditorTableContent.js

@@ -1,7 +1,6 @@
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Alert from 'Components/Alert';
 import SelectInput from 'Components/Form/SelectInput';
 import SpinnerButton from 'Components/Link/SpinnerButton';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
@@ -121,7 +120,7 @@ class BookFileEditorTableContent extends Component {
     const hasSelectedFiles = this.getSelectedIds().length > 0;
 
     return (
-      <div>
+      <>
         {
           isFetching && !isPopulated ?
             <LoadingIndicator /> :
@@ -130,13 +129,13 @@ class BookFileEditorTableContent extends Component {
 
         {
           !isFetching && error ?
-            <Alert kind={kinds.DANGER}>{error}</Alert> :
+            <div>{error}</div> :
             null
         }
 
         {
           isPopulated && !items.length ?
-            <div className={styles.blankpad}>
+            <div>
               No book files to manage.
             </div> :
             null
@@ -174,30 +173,26 @@ class BookFileEditorTableContent extends Component {
             null
         }
 
-        {
-          isPopulated && items.length ? (
-            <div className={styles.actions}>
-              <SpinnerButton
-                kind={kinds.DANGER}
-                isSpinning={isDeleting}
-                isDisabled={!hasSelectedFiles}
-                onPress={this.onDeletePress}
-              >
-                {translate('Delete')}
-              </SpinnerButton>
+        <div className={styles.actions}>
+          <SpinnerButton
+            kind={kinds.DANGER}
+            isSpinning={isDeleting}
+            isDisabled={!hasSelectedFiles}
+            onPress={this.onDeletePress}
+          >
+            Delete
+          </SpinnerButton>
 
-              <div className={styles.selectInput}>
-                <SelectInput
-                  name="quality"
-                  value="selectQuality"
-                  values={qualityOptions}
-                  isDisabled={!hasSelectedFiles}
-                  onChange={this.onQualityChange}
-                />
-              </div>
-            </div>
-          ) : null
-        }
+          <div className={styles.selectInput}>
+            <SelectInput
+              name="quality"
+              value="selectQuality"
+              values={qualityOptions}
+              isDisabled={!hasSelectedFiles}
+              onChange={this.onQualityChange}
+            />
+          </div>
+        </div>
 
         <ConfirmModal
           isOpen={isConfirmDeleteModalOpen}
@@ -208,7 +203,7 @@ class BookFileEditorTableContent extends Component {
           onConfirm={this.onConfirmDelete}
           onCancel={this.onConfirmDeleteModalClose}
         />
-      </div>
+      </>
     );
   }
 }

frontend/src/Bookshelf/BookshelfFooter.js

@@ -143,7 +143,7 @@ class BookshelfFooter extends Component {
 
         <div>
           <div className={styles.label}>
-            {translate('CountAuthorsSelected', { selectedCount })}
+            {selectedCount} Author(s) Selected
           </div>
 
           <SpinnerButton

frontend/src/Calendar/CalendarConnector.js

@@ -47,7 +47,7 @@ class CalendarConnector extends Component {
       gotoCalendarToday
     } = this.props;
 
-    registerPagePopulator(this.repopulate, ['bookFileUpdated', 'bookFileDeleted']);
+    registerPagePopulator(this.repopulate);
 
     if (useCurrentPage) {
       fetchCalendar();

frontend/src/Components/DescriptionList/DescriptionListItemDescription.css

@@ -1,7 +1,9 @@
+.description {
+  line-height: $lineHeight;
+}
+
 .description {
   margin-left: 0;
-  line-height: $lineHeight;
-  overflow-wrap: break-word;
 }
 
 @media (min-width: 768px) {

frontend/src/Components/Error/ErrorBoundaryError.css

@@ -25,10 +25,6 @@
   white-space: pre-wrap;
 }
 
-.version {
-  margin-top: 20px;
-}
-
 @media only screen and (max-width: $breakpointMedium) {
   .image {
     height: 250px;

frontend/src/Components/Error/ErrorBoundaryError.css.d.ts

@@ -6,7 +6,6 @@ interface CssExports {
   'image': string;
   'imageContainer': string;
   'message': string;
-  'version': string;
 }
 export const cssExports: CssExports;
 export default cssExports;

frontend/src/Components/Error/ErrorBoundaryError.js

@@ -0,0 +1,60 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import styles from './ErrorBoundaryError.css';
+
+function ErrorBoundaryError(props) {
+  const {
+    className,
+    messageClassName,
+    detailsClassName,
+    message,
+    error,
+    info
+  } = props;
+
+  return (
+    <div className={className}>
+      <div className={messageClassName}>
+        {message}
+      </div>
+
+      <div className={styles.imageContainer}>
+        <img
+          className={styles.image}
+          src={`${window.Readarr.urlBase}/Content/Images/error.png`}
+        />
+      </div>
+
+      <details className={detailsClassName}>
+        {
+          error &&
+            <div>
+              {error.toString()}
+            </div>
+        }
+
+        <div className={styles.info}>
+          {info.componentStack}
+        </div>
+      </details>
+    </div>
+  );
+}
+
+ErrorBoundaryError.propTypes = {
+  className: PropTypes.string.isRequired,
+  messageClassName: PropTypes.string.isRequired,
+  detailsClassName: PropTypes.string.isRequired,
+  message: PropTypes.string.isRequired,
+  error: PropTypes.object.isRequired,
+  info: PropTypes.object.isRequired
+};
+
+ErrorBoundaryError.defaultProps = {
+  className: styles.container,
+  messageClassName: styles.message,
+  detailsClassName: styles.details,
+  message: 'There was an error loading this content'
+};
+
+export default ErrorBoundaryError;

frontend/src/Components/Error/ErrorBoundaryError.tsx

@@ -1,77 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import StackTrace from 'stacktrace-js';
-import translate from 'Utilities/String/translate';
-import styles from './ErrorBoundaryError.css';
-
-interface ErrorBoundaryErrorProps {
-  className: string;
-  messageClassName: string;
-  detailsClassName: string;
-  message: string;
-  error: Error;
-  info: {
-    componentStack: string;
-  };
-}
-
-function ErrorBoundaryError(props: ErrorBoundaryErrorProps) {
-  const {
-    className = styles.container,
-    messageClassName = styles.message,
-    detailsClassName = styles.details,
-    message = translate('ErrorLoadingContent'),
-    error,
-    info,
-  } = props;
-
-  const [detailedError, setDetailedError] = useState<
-    StackTrace.StackFrame[] | null
-  >(null);
-
-  useEffect(() => {
-    if (error) {
-      StackTrace.fromError(error).then((de) => {
-        setDetailedError(de);
-      });
-    } else {
-      setDetailedError(null);
-    }
-  }, [error, setDetailedError]);
-
-  return (
-    <div className={className}>
-      <div className={messageClassName}>{message}</div>
-
-      <div className={styles.imageContainer}>
-        <img
-          className={styles.image}
-          src={`${window.Readarr.urlBase}/Content/Images/error.png`}
-        />
-      </div>
-
-      <details className={detailsClassName}>
-        {error ? <div>{error.message}</div> : null}
-
-        {detailedError ? (
-          detailedError.map((d, index) => {
-            return (
-              <div key={index}>
-                {`  at ${d.functionName} (${d.fileName}:${d.lineNumber}:${d.columnNumber})`}
-              </div>
-            );
-          })
-        ) : (
-          <div>{info.componentStack}</div>
-        )}
-
-        {
-          <div className={styles.version}>
-            Version: {window.Readarr.version}
-          </div>
-        }
-      </details>
-    </div>
-  );
-}
-
-export default ErrorBoundaryError;

frontend/src/Components/Form/EnhancedSelectInputOption.css

@@ -9,10 +9,6 @@
   &:hover {
     background-color: var(--inputHoverBackgroundColor);
   }
-
-  &.isDisabled {
-    cursor: not-allowed;
-  }
 }
 
 .optionCheck {

frontend/src/Components/Form/FormLabel.css

@@ -2,10 +2,8 @@
   display: flex;
   justify-content: flex-end;
   margin-right: $formLabelRightMarginWidth;
-  padding-top: 8px;
-  min-height: 35px;
-  text-align: end;
   font-weight: bold;
+  line-height: 35px;
 }
 
 .hasError {

frontend/src/Components/Form/NumberInput.js

@@ -41,7 +41,7 @@ class NumberInput extends Component {
   componentDidUpdate(prevProps, prevState) {
     const { value } = this.props;
 
-    if (!isNaN(value) && value !== prevProps.value && !this.state.isFocused) {
+    if (value !== prevProps.value && !this.state.isFocused) {
       this.setState({
         value: value == null ? '' : value.toString()
       });

frontend/src/Components/Link/SpinnerErrorButton.js

@@ -97,7 +97,6 @@ class SpinnerErrorButton extends Component {
 
   render() {
     const {
-      kind,
       isSpinning,
       error,
       children,
@@ -113,7 +112,7 @@ class SpinnerErrorButton extends Component {
     const showIcon = wasSuccessful || hasWarning || hasError;
 
     let iconName = icons.CHECK;
-    let iconKind = kind === kinds.PRIMARY ? kinds.DEFAULT : kinds.SUCCESS;
+    let iconKind = kinds.SUCCESS;
 
     if (hasWarning) {
       iconName = icons.WARNING;
@@ -127,7 +126,6 @@ class SpinnerErrorButton extends Component {
 
     return (
       <SpinnerButton
-        kind={kind}
         isSpinning={isSpinning}
         {...otherProps}
       >
@@ -156,7 +154,6 @@ class SpinnerErrorButton extends Component {
 }
 
 SpinnerErrorButton.propTypes = {
-  kind: PropTypes.oneOf(kinds.all),
   isSpinning: PropTypes.bool.isRequired,
   error: PropTypes.object,
   children: PropTypes.node.isRequired

frontend/src/Components/Markdown/InlineMarkdown.js

@@ -10,8 +10,7 @@ class InlineMarkdown extends Component {
   render() {
     const {
       className,
-      data,
-      blockClassName
+      data
     } = this.props;
 
     // For now only replace links or code blocks (not both)
@@ -48,7 +47,7 @@ class InlineMarkdown extends Component {
           markdownBlocks.push(data.substr(endIndex, match.index - endIndex));
         }
 
-        markdownBlocks.push(<code key={`code-${match.index}`} className={blockClassName ?? null}>{match[0].substring(1, match[0].length - 1)}</code>);
+        markdownBlocks.push(<code key={`code-${match.index}`}>{match[0].substring(1, match[0].length - 1)}</code>);
         endIndex = match.index + match[0].length;
       }
 
@@ -67,8 +66,7 @@ class InlineMarkdown extends Component {
 
 InlineMarkdown.propTypes = {
   className: PropTypes.string,
-  data: PropTypes.string,
-  blockClassName: PropTypes.string
+  data: PropTypes.string
 };
 
 export default InlineMarkdown;

frontend/src/Components/SignalRConnector.js

@@ -202,8 +202,6 @@ class SignalRConnector extends Component {
       this.props.dispatchUpdateItem({ section, ...body.resource });
     } else if (body.action === 'deleted') {
       this.props.dispatchRemoveItem({ section, id: body.resource.id });
-
-      repopulatePage('bookFileDeleted');
     }
 
     // Repopulate the page to handle recently imported file

frontend/src/Content/Images/Icons/manifest.json

@@ -15,5 +15,5 @@
     "start_url": "../../../../",
     "theme_color": "#3a3f51",
     "background_color": "#3a3f51",
-    "display": "minimal-ui"
+    "display": "standalone"
 }

frontend/src/Diag/ConsoleApi.js

@@ -1,120 +0,0 @@
-import createAjaxRequest from 'Utilities/createAjaxRequest';
-
-// This file contains some helpers for power users in a browser console
-
-let hasWarned = false;
-
-function checkActivationWarning() {
-  if (!hasWarned) {
-    console.log('Activated ReadarrApi console helpers.');
-    console.warn('Be warned: There will be no further confirmation checks.');
-    hasWarned = true;
-  }
-}
-
-function attachAsyncActions(promise) {
-  promise.filter = function() {
-    const args = arguments;
-    const res = this.then((d) => d.filter(...args));
-    attachAsyncActions(res);
-    return res;
-  };
-
-  promise.map = function() {
-    const args = arguments;
-    const res = this.then((d) => d.map(...args));
-    attachAsyncActions(res);
-    return res;
-  };
-
-  promise.all = function() {
-    const res = this.then((d) => Promise.all(d));
-    attachAsyncActions(res);
-    return res;
-  };
-
-  promise.forEach = function(action) {
-    const res = this.then((d) => Promise.all(d.map(action)));
-    attachAsyncActions(res);
-    return res;
-  };
-}
-
-class ResourceApi {
-  constructor(api, url) {
-    this.api = api;
-    this.url = url;
-  }
-
-  single(id) {
-    return this.api.fetch(`${this.url}/${id}`);
-  }
-
-  all() {
-    return this.api.fetch(this.url);
-  }
-
-  filter(pred) {
-    return this.all().filter(pred);
-  }
-
-  update(resource) {
-    return this.api.fetch(`${this.url}/${resource.id}`, { method: 'PUT', data: resource });
-  }
-
-  delete(resource) {
-    if (typeof resource === 'object' && resource !== null && resource.id) {
-      resource = resource.id;
-    }
-
-    if (!resource || !Number.isInteger(resource)) {
-      throw Error('Invalid resource', resource);
-    }
-
-    return this.api.fetch(`${this.url}/${resource}`, { method: 'DELETE' });
-  }
-
-  fetch(url, options) {
-    return this.api.fetch(`${this.url}${url}`, options);
-  }
-}
-
-class ConsoleApi {
-  constructor() {
-    this.author = new ResourceApi(this, '/author');
-  }
-
-  resource(url) {
-    return new ResourceApi(this, url);
-  }
-
-  fetch(url, options) {
-    checkActivationWarning();
-
-    options = options || {};
-
-    const req = {
-      url,
-      method: options.method || 'GET'
-    };
-
-    if (options.data) {
-      req.dataType = 'json';
-      req.data = JSON.stringify(options.data);
-    }
-
-    const promise = createAjaxRequest(req).request;
-
-    promise.fail((xhr) => {
-      console.error(`Failed to fetch ${url}`, xhr);
-    });
-
-    attachAsyncActions(promise);
-
-    return promise;
-  }
-}
-
-window.ReadarrApi = new ConsoleApi();
-
-export default ConsoleApi;

frontend/src/Helpers/Props/inputTypes.js

@@ -6,7 +6,6 @@ export const BOOKSHELF = 'bookshelf';
 export const KEY_VALUE_LIST = 'keyValueList';
 export const MONITOR_BOOKS_SELECT = 'monitorBooksSelect';
 export const MONITOR_NEW_ITEMS_SELECT = 'monitorNewItemsSelect';
-export const FLOAT = 'float';
 export const NUMBER = 'number';
 export const OAUTH = 'oauth';
 export const PASSWORD = 'password';
@@ -35,7 +34,6 @@ export const all = [
   KEY_VALUE_LIST,
   MONITOR_BOOKS_SELECT,
   MONITOR_NEW_ITEMS_SELECT,
-  FLOAT,
   NUMBER,
   OAUTH,
   PASSWORD,

frontend/src/InteractiveSearch/InteractiveSearch.js

@@ -1,11 +1,10 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import Alert from 'Components/Alert';
 import Icon from 'Components/Icon';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
-import { icons, kinds, sortDirections } from 'Helpers/Props';
+import { icons, sortDirections } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import InteractiveSearchRow from './InteractiveSearchRow';
 import styles from './InteractiveSearch.css';
@@ -113,17 +112,17 @@ function InteractiveSearch(props) {
 
       {
         !isFetching && isPopulated && !totalReleasesCount ?
-          <Alert kind={kinds.INFO}>
-            {translate('NoResultsFound')}
-          </Alert> :
+          <div className={styles.blankpad}>
+            No results found
+          </div> :
           null
       }
 
       {
         !!totalReleasesCount && isPopulated && !items.length ?
-          <Alert kind={kinds.WARNING}>
-            {translate('AllResultsAreHiddenByTheAppliedFilter')}
-          </Alert> :
+          <div className={styles.blankpad}>
+            All results are hidden by the applied filter
+          </div> :
           null
       }
 
@@ -158,7 +157,7 @@ function InteractiveSearch(props) {
       {
         totalReleasesCount !== items.length && !!items.length ?
           <div className={styles.filteredMessage}>
-            {translate('SomeResultsAreHiddenByTheAppliedFilter')}
+            Some results are hidden by the applied filter
           </div> :
           null
       }

frontend/src/InteractiveSearch/InteractiveSearchRow.css

@@ -28,10 +28,6 @@
   text-align: center;
 }
 
-.quality {
-  white-space: nowrap;
-}
-
 .customFormatScore {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 

frontend/src/InteractiveSearch/InteractiveSearchRow.js

@@ -178,7 +178,7 @@ class InteractiveSearchRow extends Component {
         </TableRowCell>
 
         <TableRowCell className={styles.quality}>
-          <BookQuality quality={quality} showRevision={true} />
+          <BookQuality quality={quality} />
         </TableRowCell>
 
         <TableRowCell className={styles.customFormatScore}>

frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js

@@ -152,7 +152,7 @@ class CustomFormat extends Component {
           isOpen={this.state.isDeleteCustomFormatModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteCustomFormat')}
-          message={translate('DeleteCustomFormatMessageText', { name })}
+          message={translate('DeleteCustomFormatMessageText', [name])}
           confirmLabel={translate('Delete')}
           isSpinning={isDeleting}
           onConfirm={this.onConfirmDeleteCustomFormat}

frontend/src/Settings/CustomFormats/CustomFormats/Specifications/Specification.js

@@ -115,7 +115,7 @@ class Specification extends Component {
           isOpen={this.state.isDeleteSpecificationModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteCondition')}
-          message={translate('DeleteConditionMessageText', { name })}
+          message={translate('DeleteConditionMessageText', [name])}
           confirmLabel={translate('Delete')}
           onConfirm={this.onConfirmDeleteSpecification}
           onCancel={this.onDeleteSpecificationModalClose}

frontend/src/Settings/DownloadClients/DownloadClients/DownloadClient.js

@@ -113,7 +113,7 @@ class DownloadClient extends Component {
           isOpen={this.state.isDeleteDownloadClientModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteDownloadClient')}
-          message={translate('DeleteDownloadClientMessageText', { name })}
+          message={translate('DeleteDownloadClientMessageText', [name])}
           confirmLabel={translate('Delete')}
           onConfirm={this.onConfirmDeleteDownloadClient}
           onCancel={this.onDeleteDownloadClientModalClose}

frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModalContent.tsx

@@ -180,7 +180,7 @@ function ManageDownloadClientsEditModalContent(
 
       <ModalFooter className={styles.modalFooter}>
         <div className={styles.selected}>
-          {translate('CountDownloadClientsSelected', { selectedCount })}
+          {translate('CountDownloadClientsSelected', [selectedCount])}
         </div>
 
         <div>

frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx

@@ -14,11 +14,9 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import useSelectState from 'Helpers/Hooks/useSelectState';
 import { kinds } from 'Helpers/Props';
-import SortDirection from 'Helpers/Props/SortDirection';
 import {
   bulkDeleteDownloadClients,
   bulkEditDownloadClients,
-  setManageDownloadClientsSort,
 } from 'Store/Actions/settingsActions';
 import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
 import { SelectStateInputProps } from 'typings/props';
@@ -82,8 +80,6 @@ const COLUMNS = [
 
 interface ManageDownloadClientsModalContentProps {
   onModalClose(): void;
-  sortKey?: string;
-  sortDirection?: SortDirection;
 }
 
 function ManageDownloadClientsModalContent(
@@ -98,8 +94,6 @@ function ManageDownloadClientsModalContent(
     isSaving,
     error,
     items,
-    sortKey,
-    sortDirection,
   }: DownloadClientAppState = useSelector(
     createClientSideCollectionSelector('settings.downloadClients')
   );
@@ -120,13 +114,6 @@ function ManageDownloadClientsModalContent(
 
   const selectedCount = selectedIds.length;
 
-  const onSortPress = useCallback(
-    (value: string) => {
-      dispatch(setManageDownloadClientsSort({ sortKey: value }));
-    },
-    [dispatch]
-  );
-
   const onDeletePress = useCallback(() => {
     setIsDeleteModalOpen(true);
   }, [setIsDeleteModalOpen]);
@@ -232,9 +219,6 @@ function ManageDownloadClientsModalContent(
             allSelected={allSelected}
             allUnselected={allUnselected}
             onSelectAllChange={onSelectAllChange}
-            sortKey={sortKey}
-            sortDirection={sortDirection}
-            onSortPress={onSortPress}
           >
             <TableBody>
               {items.map((item) => {
@@ -302,9 +286,9 @@ function ManageDownloadClientsModalContent(
         isOpen={isDeleteModalOpen}
         kind={kinds.DANGER}
         title={translate('DeleteSelectedDownloadClients')}
-        message={translate('DeleteSelectedDownloadClientsMessageText', {
-          count: selectedIds.length,
-        })}
+        message={translate('DeleteSelectedDownloadClientsMessageText', [
+          selectedIds.length,
+        ])}
         confirmLabel={translate('Delete')}
         onConfirm={onConfirmDelete}
         onCancel={onDeleteModalClose}

frontend/src/Settings/DownloadClients/Options/DownloadClientOptions.js

@@ -61,12 +61,8 @@ function DownloadClientOptions(props) {
               legend={translate('FailedDownloadHandling')}
             >
               <Form>
-                <FormGroup
-                  advancedSettings={advancedSettings}
-                  isAdvanced={true}
-                  size={sizes.MEDIUM}
-                >
-                  <FormLabel>{translate('AutoRedownloadFailed')}</FormLabel>
+                <FormGroup size={sizes.MEDIUM}>
+                  <FormLabel>{translate('RedownloadFailed')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.CHECK}
@@ -76,28 +72,7 @@ function DownloadClientOptions(props) {
                     {...settings.autoRedownloadFailed}
                   />
                 </FormGroup>
-
-                {
-                  settings.autoRedownloadFailed.value ?
-                    <FormGroup
-                      advancedSettings={advancedSettings}
-                      isAdvanced={true}
-                      size={sizes.MEDIUM}
-                    >
-                      <FormLabel>{translate('AutoRedownloadFailedFromInteractiveSearch')}</FormLabel>
-
-                      <FormInputGroup
-                        type={inputTypes.CHECK}
-                        name="autoRedownloadFailedFromInteractiveSearch"
-                        helpText={translate('AutoRedownloadFailedFromInteractiveSearchHelpText')}
-                        onChange={onInputChange}
-                        {...settings.autoRedownloadFailedFromInteractiveSearch}
-                      />
-                    </FormGroup> :
-                    null
-                }
               </Form>
-
               <Alert kind={kinds.INFO}>
                 {translate('RemoveDownloadsAlert')}
               </Alert>

frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.js

@@ -1,12 +1,10 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Alert from 'Components/Alert';
 import FieldSet from 'Components/FieldSet';
 import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
-import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import PageSectionContent from 'Components/Page/PageSectionContent';
-import { icons, kinds } from 'Helpers/Props';
+import { icons } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import EditRemotePathMappingModalConnector from './EditRemotePathMappingModalConnector';
 import RemotePathMapping from './RemotePathMapping';
@@ -52,11 +50,6 @@ class RemotePathMappings extends Component {
           errorMessage={translate('UnableToLoadRemotePathMappings')}
           {...otherProps}
         >
-
-          <Alert kind={kinds.INFO}>
-            <InlineMarkdown data={translate('RemotePathMappingsInfo', { app: 'Readarr', wikiLink: 'https://wiki.servarr.com/readarr/settings#remote-path-mappings' })} />
-          </Alert>
-
           <div className={styles.remotePathMappingsHeader}>
             <div className={styles.host}>
               {translate('Host')}

frontend/src/Settings/General/GeneralSettings.js

@@ -103,6 +103,7 @@ class GeneralSettings extends Component {
       isResettingApiKey,
       isWindows,
       isWindowsService,
+      isDocker,
       mode,
       packageUpdateMechanism,
       onInputChange,
@@ -170,6 +171,7 @@ class GeneralSettings extends Component {
                   settings={settings}
                   isWindows={isWindows}
                   packageUpdateMechanism={packageUpdateMechanism}
+                  isDocker={isDocker}
                   onInputChange={onInputChange}
                 />
 
@@ -212,6 +214,7 @@ GeneralSettings.propTypes = {
   hasSettings: PropTypes.bool.isRequired,
   isWindows: PropTypes.bool.isRequired,
   isWindowsService: PropTypes.bool.isRequired,
+  isDocker: PropTypes.bool.isRequired,
   mode: PropTypes.string.isRequired,
   packageUpdateMechanism: PropTypes.string.isRequired,
   onInputChange: PropTypes.func.isRequired,

frontend/src/Settings/General/GeneralSettingsConnector.js

@@ -26,6 +26,7 @@ function createMapStateToProps() {
         isResettingApiKey,
         isWindows: systemStatus.isWindows,
         isWindowsService: systemStatus.isWindows && systemStatus.mode === 'service',
+        isDocker: systemStatus.isDocker,
         mode: systemStatus.mode,
         packageUpdateMechanism: systemStatus.packageUpdateMechanism,
         ...sectionSettings

frontend/src/Settings/General/UpdateSettings.js

@@ -8,17 +8,12 @@ import { inputTypes, sizes } from 'Helpers/Props';
 import titleCase from 'Utilities/String/titleCase';
 import translate from 'Utilities/String/translate';
 
-const branchValues = [
-  'master',
-  'develop',
-  'nightly'
-];
-
 function UpdateSettings(props) {
   const {
     advancedSettings,
     settings,
     isWindows,
+    isDocker,
     packageUpdateMechanism,
     onInputChange
   } = props;
@@ -49,21 +44,32 @@ function UpdateSettings(props) {
 
   updateOptions.push({ key: 'script', value: 'Script' });
 
+  if (isDocker) {
+    return (
+      <FieldSet legend={translate('Updates')}>
+        <div>
+          {translate('UpdatingIsDisabledInsideADockerContainerUpdateTheContainerImageInstead')}
+        </div>
+      </FieldSet>
+    );
+  }
+
   return (
     <FieldSet legend={translate('Updates')}>
       <FormGroup
         advancedSettings={advancedSettings}
         isAdvanced={true}
       >
-        <FormLabel>{translate('Branch')}</FormLabel>
+        <FormLabel>
+          {translate('Branch')}
+        </FormLabel>
 
         <FormInputGroup
-          type={inputTypes.AUTO_COMPLETE}
+          type={inputTypes.TEXT}
           name="branch"
           helpText={usingExternalUpdateMechanism ? translate('UsingExternalUpdateMechanismBranchUsedByExternalUpdateMechanism') : translate('UsingExternalUpdateMechanismBranchToUseToUpdateReadarr')}
           helpLink="https://wiki.servarr.com/readarr/faq#how-do-I-update-my-readarr"
           {...branch}
-          values={branchValues}
           onChange={onInputChange}
           readOnly={usingExternalUpdateMechanism}
         />
@@ -77,13 +83,14 @@ function UpdateSettings(props) {
               isAdvanced={true}
               size={sizes.MEDIUM}
             >
-              <FormLabel>{translate('Automatic')}</FormLabel>
+              <FormLabel>
+                {translate('Automatic')}
+              </FormLabel>
 
               <FormInputGroup
                 type={inputTypes.CHECK}
                 name="updateAutomatically"
                 helpText={translate('UpdateAutomaticallyHelpText')}
-                helpTextWarning={updateMechanism.value === 'docker' ? translate('AutomaticUpdatesDisabledDocker', { appName: 'Readarr' }) : undefined}
                 onChange={onInputChange}
                 {...updateAutomatically}
               />
@@ -93,7 +100,9 @@ function UpdateSettings(props) {
               advancedSettings={advancedSettings}
               isAdvanced={true}
             >
-              <FormLabel>{translate('Mechanism')}</FormLabel>
+              <FormLabel>
+                {translate('Mechanism')}
+              </FormLabel>
 
               <FormInputGroup
                 type={inputTypes.SELECT}
@@ -112,7 +121,9 @@ function UpdateSettings(props) {
                   advancedSettings={advancedSettings}
                   isAdvanced={true}
                 >
-                  <FormLabel>{translate('ScriptPath')}</FormLabel>
+                  <FormLabel>
+                    {translate('ScriptPath')}
+                  </FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.TEXT}
@@ -133,6 +144,7 @@ UpdateSettings.propTypes = {
   advancedSettings: PropTypes.bool.isRequired,
   settings: PropTypes.object.isRequired,
   isWindows: PropTypes.bool.isRequired,
+  isDocker: PropTypes.bool.isRequired,
   packageUpdateMechanism: PropTypes.string.isRequired,
   onInputChange: PropTypes.func.isRequired
 };

frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css

@@ -8,13 +8,11 @@
 }
 
 .name {
-  @add-mixin truncate;
-
-  flex: 0 1 600px;
+  flex: 1 0 300px;
 }
 
 .foreignId {
-  flex: 0 0 100px;
+  flex: 0 0 200px;
 }
 
 .actions {

frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css

@@ -4,12 +4,12 @@
   font-weight: bold;
 }
 
-.name {
-  flex: 0 1 600px;
+.foreignId {
+  flex: 0 0 200px;
 }
 
-.foreignId {
-  flex: 0 0 100px;
+.name {
+  flex: 1 0 300px;
 }
 
 .addImportListExclusion {

frontend/src/Settings/ImportLists/ImportLists/ImportList.js

@@ -107,7 +107,7 @@ class ImportList extends Component {
           isOpen={this.state.isDeleteImportListModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteImportList')}
-          message={translate('DeleteImportListMessageText', { name })}
+          message={translate('DeleteImportListMessageText', [name])}
           confirmLabel={translate('Delete')}
           onConfirm={this.onConfirmDeleteImportList}
           onCancel={this.onDeleteImportListModalClose}

frontend/src/Settings/ImportLists/ImportLists/Manage/Edit/ManageImportListsEditModalContent.tsx

@@ -184,7 +184,7 @@ function ManageImportListsEditModalContent(
 
       <ModalFooter className={styles.modalFooter}>
         <div className={styles.selected}>
-          {translate('CountImportListsSelected', { selectedCount })}
+          {translate('CountImportListsSelected', [selectedCount])}
         </div>
 
         <div>

frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalContent.tsx

@@ -283,9 +283,9 @@ function ManageImportListsModalContent(
         isOpen={isDeleteModalOpen}
         kind={kinds.DANGER}
         title={translate('DeleteSelectedImportLists')}
-        message={translate('DeleteSelectedImportListsMessageText', {
-          count: selectedIds.length,
-        })}
+        message={translate('DeleteSelectedImportListsMessageText', [
+          selectedIds.length,
+        ])}
         confirmLabel={translate('Delete')}
         onConfirm={onConfirmDelete}
         onCancel={onDeleteModalClose}

frontend/src/Settings/Indexers/Indexers/Indexer.js

@@ -152,7 +152,7 @@ class Indexer extends Component {
           isOpen={this.state.isDeleteIndexerModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteIndexer')}
-          message={translate('DeleteIndexerMessageText', { name })}
+          message={translate('DeleteIndexerMessageText', [name])}
           confirmLabel={translate('Delete')}
           onConfirm={this.onConfirmDeleteIndexer}
           onCancel={this.onDeleteIndexerModalClose}

frontend/src/Settings/Indexers/Indexers/Manage/Edit/ManageIndexersEditModalContent.tsx

@@ -178,7 +178,7 @@ function ManageIndexersEditModalContent(
 
       <ModalFooter className={styles.modalFooter}>
         <div className={styles.selected}>
-          {translate('CountIndexersSelected', { selectedCount })}
+          {translate('CountIndexersSelected', [selectedCount])}
         </div>
 
         <div>

frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx

@@ -14,11 +14,9 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import useSelectState from 'Helpers/Hooks/useSelectState';
 import { kinds } from 'Helpers/Props';
-import SortDirection from 'Helpers/Props/SortDirection';
 import {
   bulkDeleteIndexers,
   bulkEditIndexers,
-  setManageIndexersSort,
 } from 'Store/Actions/settingsActions';
 import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
 import { SelectStateInputProps } from 'typings/props';
@@ -82,8 +80,6 @@ const COLUMNS = [
 
 interface ManageIndexersModalContentProps {
   onModalClose(): void;
-  sortKey?: string;
-  sortDirection?: SortDirection;
 }
 
 function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
@@ -96,8 +92,6 @@ function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
     isSaving,
     error,
     items,
-    sortKey,
-    sortDirection,
   }: IndexerAppState = useSelector(
     createClientSideCollectionSelector('settings.indexers')
   );
@@ -118,13 +112,6 @@ function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
 
   const selectedCount = selectedIds.length;
 
-  const onSortPress = useCallback(
-    (value: string) => {
-      dispatch(setManageIndexersSort({ sortKey: value }));
-    },
-    [dispatch]
-  );
-
   const onDeletePress = useCallback(() => {
     setIsDeleteModalOpen(true);
   }, [setIsDeleteModalOpen]);
@@ -227,9 +214,6 @@ function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
             allSelected={allSelected}
             allUnselected={allUnselected}
             onSelectAllChange={onSelectAllChange}
-            sortKey={sortKey}
-            sortDirection={sortDirection}
-            onSortPress={onSortPress}
           >
             <TableBody>
               {items.map((item) => {
@@ -297,9 +281,9 @@ function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
         isOpen={isDeleteModalOpen}
         kind={kinds.DANGER}
         title={translate('DeleteSelectedIndexers')}
-        message={translate('DeleteSelectedIndexersMessageText', {
-          count: selectedIds.length,
-        })}
+        message={translate('DeleteSelectedIndexersMessageText', [
+          selectedIds.length,
+        ])}
         confirmLabel={translate('Delete')}
         onConfirm={onConfirmDelete}
         onCancel={onDeleteModalClose}

frontend/src/Settings/MediaManagement/MediaManagement.js

@@ -212,24 +212,26 @@ class MediaManagement extends Component {
                       </FormGroup>
 
                       {
-                        settings.importExtraFiles.value ?
+                        settings.importExtraFiles.value &&
                           <FormGroup
                             advancedSettings={advancedSettings}
                             isAdvanced={true}
                           >
-                            <FormLabel>{translate('ImportExtraFiles')}</FormLabel>
+                            <FormLabel>
+                              {translate('ImportExtraFiles')}
+                            </FormLabel>
 
                             <FormInputGroup
                               type={inputTypes.TEXT}
                               name="extraFileExtensions"
                               helpTexts={[
-                                translate('ExtraFileExtensionsHelpText'),
-                                translate('ExtraFileExtensionsHelpTextsExamples')
+                                translate('ExtraFileExtensionsHelpTexts1'),
+                                translate('ExtraFileExtensionsHelpTexts2')
                               ]}
                               onChange={onInputChange}
                               {...settings.extraFileExtensions}
                             />
-                          </FormGroup> : null
+                          </FormGroup>
                       }
                     </FieldSet>
                 }

frontend/src/Settings/MediaManagement/RootFolder/RootFolder.js

@@ -95,7 +95,7 @@ class RootFolder extends Component {
           isOpen={this.state.isDeleteRootFolderModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteRootFolder')}
-          message={translate('DeleteRootFolderMessageText', { name })}
+          message={translate('DeleteRootFolderMessageText', [name])}
           confirmLabel={translate('Delete')}
           onConfirm={this.onConfirmDeleteRootFolder}
           onCancel={this.onDeleteRootFolderModalClose}

frontend/src/Settings/Notifications/Notifications/Notification.js

@@ -60,7 +60,6 @@ class Notification extends Component {
       onReleaseImport,
       onUpgrade,
       onRename,
-      onAuthorAdded,
       onAuthorDelete,
       onBookDelete,
       onBookFileDelete,
@@ -74,7 +73,6 @@ class Notification extends Component {
       supportsOnReleaseImport,
       supportsOnUpgrade,
       supportsOnRename,
-      supportsOnAuthorAdded,
       supportsOnAuthorDelete,
       supportsOnBookDelete,
       supportsOnBookFileDelete,
@@ -138,14 +136,6 @@ class Notification extends Component {
             null
         }
 
-        {
-          supportsOnAuthorAdded && onAuthorAdded ?
-            <Label kind={kinds.SUCCESS}>
-              {translate('OnAuthorAdded')}
-            </Label> :
-            null
-        }
-
         {
           supportsOnAuthorDelete && onAuthorDelete ?
             <Label kind={kinds.SUCCESS}>
@@ -237,7 +227,7 @@ class Notification extends Component {
           isOpen={this.state.isDeleteNotificationModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteNotification')}
-          message={translate('DeleteNotificationMessageText', { name })}
+          message={translate('DeleteNotificationMessageText', [name])}
           confirmLabel={translate('Delete')}
           onConfirm={this.onConfirmDeleteNotification}
           onCancel={this.onDeleteNotificationModalClose}
@@ -254,7 +244,6 @@ Notification.propTypes = {
   onReleaseImport: PropTypes.bool.isRequired,
   onUpgrade: PropTypes.bool.isRequired,
   onRename: PropTypes.bool.isRequired,
-  onAuthorAdded: PropTypes.bool.isRequired,
   onAuthorDelete: PropTypes.bool.isRequired,
   onBookDelete: PropTypes.bool.isRequired,
   onBookFileDelete: PropTypes.bool.isRequired,
@@ -268,7 +257,6 @@ Notification.propTypes = {
   supportsOnReleaseImport: PropTypes.bool.isRequired,
   supportsOnUpgrade: PropTypes.bool.isRequired,
   supportsOnRename: PropTypes.bool.isRequired,
-  supportsOnAuthorAdded: PropTypes.bool.isRequired,
   supportsOnAuthorDelete: PropTypes.bool.isRequired,
   supportsOnBookDelete: PropTypes.bool.isRequired,
   supportsOnBookFileDelete: PropTypes.bool.isRequired,

frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js

@@ -19,7 +19,6 @@ function NotificationEventItems(props) {
     onReleaseImport,
     onUpgrade,
     onRename,
-    onAuthorAdded,
     onAuthorDelete,
     onBookDelete,
     onBookFileDelete,
@@ -33,7 +32,6 @@ function NotificationEventItems(props) {
     supportsOnReleaseImport,
     supportsOnUpgrade,
     supportsOnRename,
-    supportsOnAuthorAdded,
     supportsOnAuthorDelete,
     supportsOnBookDelete,
     supportsOnBookFileDelete,
@@ -125,17 +123,6 @@ function NotificationEventItems(props) {
             />
           </div>
 
-          <div>
-            <FormInputGroup
-              type={inputTypes.CHECK}
-              name="onAuthorAdded"
-              helpText={translate('OnAuthorAddedHelpText')}
-              isDisabled={!supportsOnAuthorAdded.value}
-              {...onAuthorAdded}
-              onChange={onInputChange}
-            />
-          </div>
-
           <div>
             <FormInputGroup
               type={inputTypes.CHECK}

frontend/src/Settings/Profiles/Metadata/MetadataProfile.js

@@ -144,7 +144,7 @@ class MetadataProfile extends Component {
           isOpen={this.state.isDeleteMetadataProfileModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteMetadataProfile')}
-          message={translate('DeleteMetadataProfileMessageText', { name })}
+          message={translate('DeleteMetadataProfileMessageText', [name])}
           confirmLabel={translate('Delete')}
           isSpinning={isDeleting}
           onConfirm={this.onConfirmDeleteMetadataProfile}

frontend/src/Settings/Profiles/Quality/QualityProfile.js

@@ -162,7 +162,7 @@ class QualityProfile extends Component {
           isOpen={this.state.isDeleteQualityProfileModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteQualityProfile')}
-          message={translate('DeleteQualityProfileMessageText', { name })}
+          message={translate('DeleteQualityProfileMessageText', [name])}
           confirmLabel={translate('Delete')}
           isSpinning={isDeleting}
           onConfirm={this.onConfirmDeleteQualityProfile}

frontend/src/Settings/UI/UISettings.js

@@ -223,13 +223,6 @@ class UISettings extends Component {
                       helpTextWarning={translate('UILanguageHelpTextWarning')}
                       onChange={onInputChange}
                       {...settings.uiLanguage}
-                      errors={
-                        languages.some((language) => language.key === settings.uiLanguage.value) ?
-                          settings.uiLanguage.errors :
-                          [
-                            ...settings.uiLanguage.errors,
-                            { message: translate('InvalidUILanguage') }
-                          ]}
                     />
                   </FormGroup>
                 </FieldSet>

frontend/src/Store/Actions/Settings/downloadClients.js

@@ -1,5 +1,4 @@
 import { createAction } from 'redux-actions';
-import { sortDirections } from 'Helpers/Props';
 import createBulkEditItemHandler from 'Store/Actions/Creators/createBulkEditItemHandler';
 import createBulkRemoveItemHandler from 'Store/Actions/Creators/createBulkRemoveItemHandler';
 import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
@@ -8,7 +7,6 @@ import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHand
 import createSaveProviderHandler, { createCancelSaveProviderHandler } from 'Store/Actions/Creators/createSaveProviderHandler';
 import createTestAllProvidersHandler from 'Store/Actions/Creators/createTestAllProvidersHandler';
 import createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler';
-import createSetClientSideCollectionSortReducer from 'Store/Actions/Creators/Reducers/createSetClientSideCollectionSortReducer';
 import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer';
 import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
 import { createThunk } from 'Store/thunks';
@@ -35,7 +33,6 @@ export const CANCEL_TEST_DOWNLOAD_CLIENT = 'settings/downloadClients/cancelTestD
 export const TEST_ALL_DOWNLOAD_CLIENTS = 'settings/downloadClients/testAllDownloadClients';
 export const BULK_EDIT_DOWNLOAD_CLIENTS = 'settings/downloadClients/bulkEditDownloadClients';
 export const BULK_DELETE_DOWNLOAD_CLIENTS = 'settings/downloadClients/bulkDeleteDownloadClients';
-export const SET_MANAGE_DOWNLOAD_CLIENTS_SORT = 'settings/downloadClients/setManageDownloadClientsSort';
 
 //
 // Action Creators
@@ -52,7 +49,6 @@ export const cancelTestDownloadClient = createThunk(CANCEL_TEST_DOWNLOAD_CLIENT)
 export const testAllDownloadClients = createThunk(TEST_ALL_DOWNLOAD_CLIENTS);
 export const bulkEditDownloadClients = createThunk(BULK_EDIT_DOWNLOAD_CLIENTS);
 export const bulkDeleteDownloadClients = createThunk(BULK_DELETE_DOWNLOAD_CLIENTS);
-export const setManageDownloadClientsSort = createAction(SET_MANAGE_DOWNLOAD_CLIENTS_SORT);
 
 export const setDownloadClientValue = createAction(SET_DOWNLOAD_CLIENT_VALUE, (payload) => {
   return {
@@ -92,9 +88,7 @@ export default {
     isTesting: false,
     isTestingAll: false,
     items: [],
-    pendingChanges: {},
-    sortKey: 'name',
-    sortDirection: sortDirections.DESCENDING
+    pendingChanges: {}
   },
 
   //
@@ -127,10 +121,7 @@ export default {
 
         return selectedSchema;
       });
-    },
-
-    [SET_MANAGE_DOWNLOAD_CLIENTS_SORT]: createSetClientSideCollectionSortReducer(section)
-
+    }
   }
 
 };

frontend/src/Store/Actions/Settings/indexers.js

@@ -1,5 +1,4 @@
 import { createAction } from 'redux-actions';
-import { sortDirections } from 'Helpers/Props';
 import createBulkEditItemHandler from 'Store/Actions/Creators/createBulkEditItemHandler';
 import createBulkRemoveItemHandler from 'Store/Actions/Creators/createBulkRemoveItemHandler';
 import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
@@ -8,7 +7,6 @@ import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHand
 import createSaveProviderHandler, { createCancelSaveProviderHandler } from 'Store/Actions/Creators/createSaveProviderHandler';
 import createTestAllProvidersHandler from 'Store/Actions/Creators/createTestAllProvidersHandler';
 import createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler';
-import createSetClientSideCollectionSortReducer from 'Store/Actions/Creators/Reducers/createSetClientSideCollectionSortReducer';
 import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer';
 import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
 import { createThunk } from 'Store/thunks';
@@ -38,7 +36,6 @@ export const CANCEL_TEST_INDEXER = 'settings/indexers/cancelTestIndexer';
 export const TEST_ALL_INDEXERS = 'settings/indexers/testAllIndexers';
 export const BULK_EDIT_INDEXERS = 'settings/indexers/bulkEditIndexers';
 export const BULK_DELETE_INDEXERS = 'settings/indexers/bulkDeleteIndexers';
-export const SET_MANAGE_INDEXERS_SORT = 'settings/indexers/setManageIndexersSort';
 
 //
 // Action Creators
@@ -56,7 +53,6 @@ export const cancelTestIndexer = createThunk(CANCEL_TEST_INDEXER);
 export const testAllIndexers = createThunk(TEST_ALL_INDEXERS);
 export const bulkEditIndexers = createThunk(BULK_EDIT_INDEXERS);
 export const bulkDeleteIndexers = createThunk(BULK_DELETE_INDEXERS);
-export const setManageIndexersSort = createAction(SET_MANAGE_INDEXERS_SORT);
 
 export const setIndexerValue = createAction(SET_INDEXER_VALUE, (payload) => {
   return {
@@ -96,9 +92,7 @@ export default {
     isTesting: false,
     isTestingAll: false,
     items: [],
-    pendingChanges: {},
-    sortKey: 'name',
-    sortDirection: sortDirections.DESCENDING
+    pendingChanges: {}
   },
 
   //
@@ -157,10 +151,7 @@ export default {
       };
 
       return updateSectionState(state, section, newState);
-    },
-
-    [SET_MANAGE_INDEXERS_SORT]: createSetClientSideCollectionSortReducer(section)
-
+    }
   }
 
 };

frontend/src/Store/Actions/Settings/notifications.js

@@ -106,7 +106,6 @@ export default {
         selectedSchema.onReleaseImport = selectedSchema.supportsOnReleaseImport;
         selectedSchema.onUpgrade = selectedSchema.supportsOnUpgrade;
         selectedSchema.onRename = selectedSchema.supportsOnRename;
-        selectedSchema.onAuthorAdded = selectedSchema.supportsOnAuthorAdded;
         selectedSchema.onAuthorDelete = selectedSchema.supportsOnAuthorDelete;
         selectedSchema.onBookDelete = selectedSchema.supportsOnBookDelete;
         selectedSchema.onBookFileDelete = selectedSchema.supportsOnBookFileDelete;

frontend/src/Store/Actions/Settings/rootFolders.js

@@ -4,8 +4,6 @@ import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHand
 import createSaveProviderHandler, { createCancelSaveProviderHandler } from 'Store/Actions/Creators/createSaveProviderHandler';
 import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
 import { createThunk } from 'Store/thunks';
-import monitorNewItemsOptions from 'Utilities/Author/monitorNewItemsOptions';
-import monitorOptions from 'Utilities/Author/monitorOptions';
 
 //
 // Variables
@@ -53,10 +51,6 @@ export default {
       port: 8080,
       useSsl: false,
       outputProfile: 'default',
-      defaultQualityProfileId: 0,
-      defaultMetadataProfileId: 0,
-      defaultMonitorOption: monitorOptions[0].key,
-      defaultNewItemMonitorOption: monitorNewItemsOptions[0].key,
       defaultTags: []
     },
     isSaving: false,

frontend/src/Store/Actions/bookFileActions.js

@@ -41,14 +41,6 @@ export const defaultState = {
   },
 
   columns: [
-    {
-      name: 'select',
-      columnLabel: 'Select',
-      isSortable: false,
-      isVisible: true,
-      isModifiable: false,
-      isHidden: true
-    },
     {
       name: 'path',
       label: 'Path',

frontend/src/Store/Actions/bookIndexActions.js

@@ -158,7 +158,7 @@ export const defaultState = {
     bookFileCount: function(item) {
       const { statistics = {} } = item;
 
-      return statistics.bookFileCount || 0;
+      return statistics.bookCount || 0;
     },
 
     ratings: function(item) {

frontend/src/Store/Actions/historyActions.js

@@ -84,6 +84,11 @@ export const defaultState = {
       label: 'Source Title',
       isVisible: false
     },
+    {
+      name: 'sourceTitle',
+      label: 'Source Title',
+      isVisible: false
+    },
     {
       name: 'customFormatScore',
       columnLabel: 'Custom Format Score',

frontend/src/Store/Actions/interactiveImportActions.js

@@ -5,7 +5,6 @@ import { sortDirections } from 'Helpers/Props';
 import { createThunk, handleThunks } from 'Store/thunks';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
 import updateSectionState from 'Utilities/State/updateSectionState';
-import naturalExpansion from 'Utilities/String/naturalExpansion';
 import { set, update, updateItem } from './baseActions';
 import createFetchHandler from './Creators/createFetchHandler';
 import createHandleActions from './Creators/createHandleActions';
@@ -18,7 +17,6 @@ export const section = 'interactiveImport';
 
 const booksSection = `${section}.books`;
 const bookFilesSection = `${section}.bookFiles`;
-let abortCurrentFetchRequest = null;
 let abortCurrentRequest = null;
 let currentIds = [];
 
@@ -34,17 +32,15 @@ export const defaultState = {
   error: null,
   items: [],
   pendingChanges: {},
-  sortKey: 'path',
-  sortDirection: sortDirections.ASCENDING,
-  secondarySortKey: 'path',
-  secondarySortDirection: sortDirections.ASCENDING,
+  sortKey: 'quality',
+  sortDirection: sortDirections.DESCENDING,
   recentFolders: [],
   importMode: 'chooseImportMode',
   sortPredicates: {
     path: function(item, direction) {
       const path = item.path;
 
-      return naturalExpansion(path.toLowerCase());
+      return path.toLowerCase();
     },
 
     author: function(item, direction) {
@@ -78,8 +74,6 @@ export const defaultState = {
 };
 
 export const persistState = [
-  'interactiveImport.sortKey',
-  'interactiveImport.sortDirection',
   'interactiveImport.recentFolders',
   'interactiveImport.importMode'
 ];
@@ -128,11 +122,6 @@ export const clearInteractiveImportBookFiles = createAction(CLEAR_INTERACTIVE_IM
 // Action Handlers
 export const actionHandlers = handleThunks({
   [FETCH_INTERACTIVE_IMPORT_ITEMS]: function(getState, payload, dispatch) {
-    if (abortCurrentFetchRequest) {
-      abortCurrentFetchRequest();
-      abortCurrentFetchRequest = null;
-    }
-
     if (!payload.downloadId && !payload.folder) {
       dispatch(set({ section, error: { message: '`downloadId` or `folder` is required.' } }));
       return;
@@ -140,14 +129,12 @@ export const actionHandlers = handleThunks({
 
     dispatch(set({ section, isFetching: true }));
 
-    const { request, abortRequest } = createAjaxRequest({
+    const promise = createAjaxRequest({
       url: '/manualimport',
       data: payload
-    });
+    }).request;
 
-    abortCurrentFetchRequest = abortRequest;
-
-    request.done((data) => {
+    promise.done((data) => {
       dispatch(batchActions([
         update({ section, data }),
 
@@ -160,11 +147,7 @@ export const actionHandlers = handleThunks({
       ]));
     });
 
-    request.fail((xhr) => {
-      if (xhr.aborted) {
-        return;
-      }
-
+    promise.fail((xhr) => {
       dispatch(set({
         section,
         isFetching: false,

frontend/src/System/Backup/BackupRow.js

@@ -138,7 +138,7 @@ class BackupRow extends Component {
           isOpen={isConfirmDeleteModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteBackup')}
-          message={translate('DeleteBackupMessageText', { name })}
+          message={translate('DeleteBackupMessageText', [name])}
           confirmLabel={translate('Delete')}
           onConfirm={this.onConfirmDeletePress}
           onCancel={this.onConfirmDeleteModalClose}

frontend/src/System/Backup/RestoreBackupModalContent.js

@@ -146,7 +146,7 @@ class RestoreBackupModalContent extends Component {
 
         <ModalBody>
           {
-            !!id && translate('WouldYouLikeToRestoreBackup', { name })
+            !!id && `Would you like to restore the backup '${name}'?`
           }
 
           {

frontend/src/System/Status/Health/Health.js

@@ -39,14 +39,6 @@ function getInternalLink(source) {
           to="/settings/downloadclients"
         />
       );
-    case 'NotificationStatusCheck':
-      return (
-        <IconButton
-          name={icons.SETTINGS}
-          title={translate('Settings')}
-          to="/settings/connect"
-        />
-      );
     case 'RootFolderCheck':
       return (
         <IconButton
@@ -71,7 +63,6 @@ function getInternalLink(source) {
 function getTestLink(source, props) {
   switch (source) {
     case 'IndexerStatusCheck':
-    case 'IndexerLongTermStatusCheck':
       return (
         <SpinnerIconButton
           name={icons.TEST}