From 37c393a65923aaa65b2e4d27d25ddcb19c619e9b Mon Sep 17 00:00:00 2001
From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com>
Date: Tue, 15 Mar 2022 14:38:27 -0500
Subject: [PATCH] New: (Lidarr/Radarr/Readarr/Sonarr) Improved Errors

---
 .../Applications/Lidarr/LidarrV1Proxy.cs             |  6 ++++++
 .../Applications/Radarr/RadarrV3Proxy.cs             |  6 ++++++
 .../Applications/Readarr/ReadarrV1Proxy.cs           |  6 ++++++
 .../Applications/Sonarr/SonarrV3Proxy.cs             | 12 ++++++++++++
 .../Applications/Whisparr/WhisparrV3Proxy.cs         |  6 ++++++
 5 files changed, 36 insertions(+)

diff --git a/src/NzbDrone.Core/Applications/Lidarr/LidarrV1Proxy.cs b/src/NzbDrone.Core/Applications/Lidarr/LidarrV1Proxy.cs
index 449ce6236..e46c603ea 100644
--- a/src/NzbDrone.Core/Applications/Lidarr/LidarrV1Proxy.cs
+++ b/src/NzbDrone.Core/Applications/Lidarr/LidarrV1Proxy.cs
@@ -116,6 +116,12 @@ namespace NzbDrone.Core.Applications.Lidarr
                     return new ValidationFailure("ProwlarrUrl", "Prowlarr url is invalid, Lidarr cannot connect to Prowlarr");
                 }
 
+                if (ex.Response.StatusCode == HttpStatusCode.SeeOther)
+                {
+                    _logger.Error(ex, "Lidarr returned redirect and is invalid");
+                    return new ValidationFailure("BaseUrl", "Lidarr url is invalid, Prowlarr cannot connect to Lidarr - are you missing a url base?");
+                }
+
                 _logger.Error(ex, "Unable to send test message");
                 return new ValidationFailure("BaseUrl", "Unable to complete application test");
             }
diff --git a/src/NzbDrone.Core/Applications/Radarr/RadarrV3Proxy.cs b/src/NzbDrone.Core/Applications/Radarr/RadarrV3Proxy.cs
index fc1fd76c4..c5445c7d0 100644
--- a/src/NzbDrone.Core/Applications/Radarr/RadarrV3Proxy.cs
+++ b/src/NzbDrone.Core/Applications/Radarr/RadarrV3Proxy.cs
@@ -116,6 +116,12 @@ namespace NzbDrone.Core.Applications.Radarr
                     return new ValidationFailure("ProwlarrUrl", "Prowlarr url is invalid, Radarr cannot connect to Prowlarr");
                 }
 
+                if (ex.Response.StatusCode == HttpStatusCode.SeeOther)
+                {
+                    _logger.Error(ex, "Radarr returned redirect and is invalid");
+                    return new ValidationFailure("BaseUrl", "Radarr url is invalid, Prowlarr cannot connect to Radarr - are you missing a url base?");
+                }
+
                 _logger.Error(ex, "Unable to send test message");
                 return new ValidationFailure("BaseUrl", "Unable to complete application test");
             }
diff --git a/src/NzbDrone.Core/Applications/Readarr/ReadarrV1Proxy.cs b/src/NzbDrone.Core/Applications/Readarr/ReadarrV1Proxy.cs
index 11c764d4a..0a5319a47 100644
--- a/src/NzbDrone.Core/Applications/Readarr/ReadarrV1Proxy.cs
+++ b/src/NzbDrone.Core/Applications/Readarr/ReadarrV1Proxy.cs
@@ -116,6 +116,12 @@ namespace NzbDrone.Core.Applications.Readarr
                     return new ValidationFailure("ProwlarrUrl", "Prowlarr url is invalid, Readarr cannot connect to Prowlarr");
                 }
 
+                if (ex.Response.StatusCode == HttpStatusCode.SeeOther)
+                {
+                    _logger.Error(ex, "Readarr returned redirect and is invalid");
+                    return new ValidationFailure("BaseUrl", "Readarr url is invalid, Prowlarr cannot connect to Readarr - are you missing a url base?");
+                }
+
                 _logger.Error(ex, "Unable to send test message");
                 return new ValidationFailure("BaseUrl", "Unable to complete application test");
             }
diff --git a/src/NzbDrone.Core/Applications/Sonarr/SonarrV3Proxy.cs b/src/NzbDrone.Core/Applications/Sonarr/SonarrV3Proxy.cs
index 47c06f71a..9e8436f56 100644
--- a/src/NzbDrone.Core/Applications/Sonarr/SonarrV3Proxy.cs
+++ b/src/NzbDrone.Core/Applications/Sonarr/SonarrV3Proxy.cs
@@ -116,6 +116,18 @@ namespace NzbDrone.Core.Applications.Sonarr
                     return new ValidationFailure("ProwlarrUrl", "Prowlarr url is invalid, Sonarr cannot connect to Prowlarr");
                 }
 
+                if (ex.Response.StatusCode == HttpStatusCode.SeeOther)
+                {
+                    _logger.Error(ex, "Sonarr returned redirect and is invalid");
+                    return new ValidationFailure("BaseUrl", "Sonarr url is invalid, Prowlarr cannot connect to Sonarr - are you missing a url base?");
+                }
+
+                if (ex.Response.StatusCode == HttpStatusCode.NotFound)
+                {
+                    _logger.Error(ex, "Sonarr not found");
+                    return new ValidationFailure("BaseUrl", "Sonarr url is invalid, Prowlarr cannot connect to Sonarr. Is Sonarr running and accessible? Sonarr v2 is not supported.");
+                }
+
                 _logger.Error(ex, "Unable to send test message");
                 return new ValidationFailure("BaseUrl", "Unable to complete application test");
             }
diff --git a/src/NzbDrone.Core/Applications/Whisparr/WhisparrV3Proxy.cs b/src/NzbDrone.Core/Applications/Whisparr/WhisparrV3Proxy.cs
index cedd8fc29..cd3a715de 100644
--- a/src/NzbDrone.Core/Applications/Whisparr/WhisparrV3Proxy.cs
+++ b/src/NzbDrone.Core/Applications/Whisparr/WhisparrV3Proxy.cs
@@ -116,6 +116,12 @@ namespace NzbDrone.Core.Applications.Whisparr
                     return new ValidationFailure("ProwlarrUrl", "Prowlarr url is invalid, Whisparr cannot connect to Prowlarr");
                 }
 
+               if (ex.Response.StatusCode == HttpStatusCode.SeeOther)
+                {
+                    _logger.Error(ex, "Whisparr returned redirect and is invalid");
+                    return new ValidationFailure("BaseUrl", "Whisparr url is invalid, Prowlarr cannot connect to Whisparr - are you missing a url base?");
+                }
+
                 _logger.Error(ex, "Unable to send test message");
                 return new ValidationFailure("BaseUrl", "Unable to complete application test");
             }