From 5e33088a6d29441fd2ddb5582ffd44a982f7c66a Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Tue, 8 Jun 2021 08:07:49 +0100
Subject: [PATCH] Removed the V3 switch from Radarr, no one is using V2 Radarr
 anymore.

---
 src/Ombi.Core/Senders/MovieSender.cs          | 65 +++++--------------
 .../Models/External/RadarrSettings.cs         |  1 -
 .../ClientApp/src/app/interfaces/ISettings.ts |  1 -
 .../app/settings/radarr/radarr.component.html |  3 -
 .../app/settings/radarr/radarr.component.ts   |  3 +-
 .../V1/External/RadarrController.cs           | 24 ++-----
 src/Ombi/Properties/launchSettings.json       |  2 +-
 7 files changed, 21 insertions(+), 78 deletions(-)

diff --git a/src/Ombi.Core/Senders/MovieSender.cs b/src/Ombi.Core/Senders/MovieSender.cs
index 33d6afd25..87d686d35 100644
--- a/src/Ombi.Core/Senders/MovieSender.cs
+++ b/src/Ombi.Core/Senders/MovieSender.cs
@@ -125,7 +125,6 @@ namespace Ombi.Core.Senders
 
         private async Task<SenderResult> SendToRadarr(MovieRequests model, RadarrSettings settings)
         {
-            var v3 = settings.V3;
             var qualityToUse = int.Parse(settings.DefaultQualityProfile);
 
             var rootFolderPath = settings.DefaultRootPath;
@@ -159,30 +158,16 @@ namespace Ombi.Core.Senders
 
             List<MovieResponse> movies;
             // Check if the movie already exists? Since it could be unmonitored
-            if (settings.V3)
-            {
-                movies = await _radarrV3Api.GetMovies(settings.ApiKey, settings.FullUri);
-            }
-            else
-            {
-                movies = await _radarrV2Api.GetMovies(settings.ApiKey, settings.FullUri);
-            }
+
+            movies = await _radarrV3Api.GetMovies(settings.ApiKey, settings.FullUri);
+
             var existingMovie = movies.FirstOrDefault(x => x.tmdbId == model.TheMovieDbId);
             if (existingMovie == null)
             {
-                RadarrAddMovie result;
-                if (v3)
-                {
-                    result = await _radarrV3Api.AddMovie(model.TheMovieDbId, model.Title, model.ReleaseDate.Year,
-                        qualityToUse, rootFolderPath, settings.ApiKey, settings.FullUri, !settings.AddOnly,
-                        settings.MinimumAvailability);
-                }
-                else
-                {
-                    result = await _radarrV2Api.AddMovie(model.TheMovieDbId, model.Title, model.ReleaseDate.Year,
-                        qualityToUse, rootFolderPath, settings.ApiKey, settings.FullUri, !settings.AddOnly,
-                        settings.MinimumAvailability);
-                }
+                var result = await _radarrV3Api.AddMovie(model.TheMovieDbId, model.Title, model.ReleaseDate.Year,
+                    qualityToUse, rootFolderPath, settings.ApiKey, settings.FullUri, !settings.AddOnly,
+                    settings.MinimumAvailability);
+
                 if (!string.IsNullOrEmpty(result.Error?.message))
                 {
                     _log.LogError(LoggingEvents.RadarrCacher, result.Error.message);
@@ -199,23 +184,12 @@ namespace Ombi.Core.Senders
             {
                 // let's set it to monitored and search for it
                 existingMovie.monitored = true;
-                if (v3)
+
+                await _radarrV3Api.UpdateMovie(existingMovie, settings.ApiKey, settings.FullUri);
+                // Search for it
+                if (!settings.AddOnly)
                 {
-                    await _radarrV3Api.UpdateMovie(existingMovie, settings.ApiKey, settings.FullUri);
-                    // Search for it
-                    if (!settings.AddOnly)
-                    {
-                        await _radarrV3Api.MovieSearch(new[] { existingMovie.id }, settings.ApiKey, settings.FullUri);
-                    }
-                }
-                else
-                {
-                    await _radarrV2Api.UpdateMovie(existingMovie, settings.ApiKey, settings.FullUri);
-                    // Search for it
-                    if (!settings.AddOnly)
-                    {
-                        await _radarrV2Api.MovieSearch(new[] { existingMovie.id }, settings.ApiKey, settings.FullUri);
-                    }
+                    await _radarrV3Api.MovieSearch(new[] { existingMovie.id }, settings.ApiKey, settings.FullUri);
                 }
 
                 return new SenderResult { Success = true, Sent = true };
@@ -226,18 +200,9 @@ namespace Ombi.Core.Senders
 
         private async Task<string> RadarrRootPath(int overrideId, RadarrSettings settings)
         {
-            if (settings.V3)
-            {
-                var paths = await _radarrV3Api.GetRootFolders(settings.ApiKey, settings.FullUri);
-                var selectedPath = paths.FirstOrDefault(x => x.id == overrideId);
-                return selectedPath?.path ?? string.Empty;
-            }
-            else
-            {
-                var paths = await _radarrV2Api.GetRootFolders(settings.ApiKey, settings.FullUri);
-                var selectedPath = paths.FirstOrDefault(x => x.id == overrideId);
-                return selectedPath?.path ?? string.Empty;
-            }
+            var paths = await _radarrV3Api.GetRootFolders(settings.ApiKey, settings.FullUri);
+            var selectedPath = paths.FirstOrDefault(x => x.id == overrideId);
+            return selectedPath?.path ?? string.Empty;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Settings/Settings/Models/External/RadarrSettings.cs b/src/Ombi.Settings/Settings/Models/External/RadarrSettings.cs
index ca9bd266f..b074e28d6 100644
--- a/src/Ombi.Settings/Settings/Models/External/RadarrSettings.cs
+++ b/src/Ombi.Settings/Settings/Models/External/RadarrSettings.cs
@@ -3,7 +3,6 @@
     public class RadarrSettings : ExternalSettings
     {
         public bool Enabled { get; set; }
-        public bool V3 { get; set; }
         public string ApiKey { get; set; }
         public string DefaultQualityProfile { get; set; }
         public string DefaultRootPath { get; set; }
diff --git a/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts b/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
index 5dfaa3e15..910f440f3 100644
--- a/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
+++ b/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
@@ -116,7 +116,6 @@ export interface IRadarrSettings extends IExternalSettings {
   addOnly: boolean;
   minimumAvailability: string;
   scanForAvailability: boolean;
-  v3: boolean;
 }
 
 export interface ILidarrSettings extends IExternalSettings {
diff --git a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
index 45963b1e8..cb5324048 100644
--- a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
@@ -10,9 +10,6 @@
                         <div class="md-form-field">
                             <mat-slide-toggle formControlName="enabled" id="enable">Enable</mat-slide-toggle>
                         </div>
-                        <div class="md-form-field">
-                            <mat-slide-toggle formControlName="v3">V3</mat-slide-toggle>
-                        </div>
                         <div class="md-form-field">
                             <mat-slide-toggle formControlName="scanForAvailability">Scan for Availability</mat-slide-toggle>
                         </div>
diff --git a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts
index 256f0a75e..dd702eae4 100644
--- a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts
+++ b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts
@@ -42,8 +42,7 @@ export class RadarrComponent implements OnInit {
                     port: [x.port, [Validators.required]],
                     addOnly: [x.addOnly],
                     minimumAvailability: [x.minimumAvailability, [Validators.required]],
-                    scanForAvailability: [x.scanForAvailability],
-                    v3: [x.v3 ?? true]
+                    scanForAvailability: [x.scanForAvailability]
                 });
 
                 if (x.defaultQualityProfile) {
diff --git a/src/Ombi/Controllers/V1/External/RadarrController.cs b/src/Ombi/Controllers/V1/External/RadarrController.cs
index 993b37d41..6c50b7df4 100644
--- a/src/Ombi/Controllers/V1/External/RadarrController.cs
+++ b/src/Ombi/Controllers/V1/External/RadarrController.cs
@@ -40,11 +40,7 @@ namespace Ombi.Controllers.V1.External
         [PowerUser]
         public async Task<IActionResult> GetProfiles([FromBody] RadarrSettings settings)
         {
-            if (settings.V3)
-            {
-                return Ok(await _radarrV3Api.GetProfiles(settings.ApiKey, settings.FullUri));
-            }
-            return Ok(await _radarrApi.GetProfiles(settings.ApiKey, settings.FullUri));
+            return Ok(await _radarrV3Api.GetProfiles(settings.ApiKey, settings.FullUri));
         }
 
         [HttpGet("enabled")]
@@ -64,11 +60,7 @@ namespace Ombi.Controllers.V1.External
         [PowerUser]
         public async Task<IEnumerable<RadarrRootFolder>> GetRootFolders([FromBody] RadarrSettings settings)
         {
-            if (settings.V3)
-            {
-                return await _radarrV3Api.GetRootFolders(settings.ApiKey, settings.FullUri);
-            }
-            return await _radarrApi.GetRootFolders(settings.ApiKey, settings.FullUri);
+            return await _radarrV3Api.GetRootFolders(settings.ApiKey, settings.FullUri);
         }
 
         /// <summary>
@@ -83,11 +75,7 @@ namespace Ombi.Controllers.V1.External
             var settings = await _radarrSettings.GetSettingsAsync();
             if (settings.Enabled)
             {
-                if (settings.V3)
-                {
-                    return Ok(await _radarrV3Api.GetProfiles(settings.ApiKey, settings.FullUri));
-                }
-                return Ok(await _radarrApi.GetProfiles(settings.ApiKey, settings.FullUri));
+                return Ok(await _radarrV3Api.GetProfiles(settings.ApiKey, settings.FullUri));
             }
             return null;
         }
@@ -104,11 +92,7 @@ namespace Ombi.Controllers.V1.External
             var settings = await _radarrSettings.GetSettingsAsync();
             if (settings.Enabled)
             {
-                if (settings.V3)
-                {
-                    return await _radarrV3Api.GetRootFolders(settings.ApiKey, settings.FullUri);
-                }
-                return await _radarrApi.GetRootFolders(settings.ApiKey, settings.FullUri);
+                return await _radarrV3Api.GetRootFolders(settings.ApiKey, settings.FullUri);
             }
             return null;
         }
diff --git a/src/Ombi/Properties/launchSettings.json b/src/Ombi/Properties/launchSettings.json
index b3899f8c3..213b92518 100644
--- a/src/Ombi/Properties/launchSettings.json
+++ b/src/Ombi/Properties/launchSettings.json
@@ -22,7 +22,7 @@
     },
     "Ombi": {
       "commandName": "Project",
-      "commandLineArgs": "--host http://localhost:3577",
+      "commandLineArgs": "--host http://localhost:3577 --demo true",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },