The beginning of grabbing Sonarr root folders and approving requests with sepecific root folders

PlexRequests.Api.Interfaces/ISonarrApi.cs

@@ -35,7 +35,10 @@ public interface ISonarrApi
     {
         List<SonarrProfile> GetProfiles(string apiKey, Uri baseUrl);
 
+        List<SonarrRootFolder> GetRootFolders(string apiKey, Uri baseUrl);
+
         SonarrAddSeries AddSeries(int tvdbId, string title, int qualityId, bool seasonFolders, string rootPath,
+            int rootFolderId,
             int seasonCount, int[] seasons, string apiKey, Uri baseUrl, bool monitor = true,
             bool searchForMissingEpisodes = false);
 

PlexRequests.Api.Models/PlexRequests.Api.Models.csproj

@@ -89,6 +89,7 @@
     <Compile Include="Sonarr\SonarrEpisodes.cs" />
     <Compile Include="Sonarr\SonarrError.cs" />
     <Compile Include="Sonarr\SonarrProfile.cs" />
+    <Compile Include="Sonarr\SonarrRootFolder.cs" />
     <Compile Include="Sonarr\SystemStatus.cs" />
     <Compile Include="Tv\Authentication.cs" />
     <Compile Include="Tv\TvMazeEpisodes.cs" />

PlexRequests.Api.Models/Sonarr/SonarrRootFolder.cs

@@ -0,0 +1,38 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: SonarrProfile.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  ************************************************************************/
+#endregion
+
+using System.Collections.Generic;
+
+namespace PlexRequests.Api.Models.Sonarr
+{
+    public class SonarrRootFolder
+    {
+        public int id { get; set; }
+        public string path { get; set; }
+        public long freespace { get; set; }
+    }
+}

PlexRequests.Api/SonarrApi.cs

@@ -64,7 +64,24 @@ public List<SonarrProfile> GetProfiles(string apiKey, Uri baseUrl)
             return obj;
         }
 
-        public SonarrAddSeries AddSeries(int tvdbId, string title, int qualityId, bool seasonFolders, string rootPath, int seasonCount, int[] seasons, string apiKey, Uri baseUrl, bool monitor = true, bool searchForMissingEpisodes = false)
+
+        public List<SonarrRootFolder> GetRootFolders(string apiKey, Uri baseUrl)
+        {
+            var request = new RestRequest { Resource = "/api/rootfolder", Method = Method.GET };
+
+            request.AddHeader("X-Api-Key", apiKey);
+            var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetRootFolders for Sonarr, Retrying {0}", timespan), new TimeSpan[] {
+                TimeSpan.FromSeconds (2),
+                TimeSpan.FromSeconds(5),
+                TimeSpan.FromSeconds(10)
+            });
+
+            var obj = policy.Execute(() => Api.ExecuteJson<List<SonarrRootFolder>>(request, baseUrl));
+
+            return obj;
+        }
+
+        public SonarrAddSeries AddSeries(int tvdbId, string title, int qualityId, bool seasonFolders, string rootPath, int rootFolderId, int seasonCount, int[] seasons, string apiKey, Uri baseUrl, bool monitor = true, bool searchForMissingEpisodes = false)
         {
             Log.Debug("Adding series {0}", title);
             Log.Debug("Seasons = {0}, out of {1} seasons", seasons.DumpJson(), seasonCount);

PlexRequests.Core/CacheKeys.cs

@@ -37,6 +37,7 @@ public struct TimeFrameMinutes
         public const string PlexEpisodes = nameof(PlexEpisodes);
         public const string TvDbToken = nameof(TvDbToken);
         public const string SonarrQualityProfiles = nameof(SonarrQualityProfiles);
+        public const string SonarrRootFolders = nameof(SonarrRootFolders);
         public const string SonarrQueued = nameof(SonarrQueued);
         public const string SickRageQualityProfiles = nameof(SickRageQualityProfiles);
         public const string SickRageQueued = nameof(SickRageQueued);

PlexRequests.Core/SettingModels/SonarrSettings.cs

@@ -31,8 +31,10 @@ public sealed class SonarrSettings : ExternalSettings
         public bool Enabled { get; set; }
         public string ApiKey { get; set; }
         public string QualityProfile { get; set; }
-        public bool SeasonFolders { get; set; }
+        public string RootFolder { get; set; }
         public string RootPath { get; set; }
+        public bool SeasonFolders { get; set; }
+
 
     }
 }

PlexRequests.Core/Setup.cs

@@ -135,6 +135,20 @@ public void CacheQualityProfiles()
             }
         }
 
+        public void CacheRootFolders()
+        {
+            var mc = new MemoryCacheProvider();
+
+            try
+            {
+                Task.Run(() => { CacheSonarrRootFolders(mc); });
+            }
+            catch (Exception)
+            {
+                Log.Error("Failed to cache quality profiles on startup!");
+            }
+        }
+
         private void CacheSonarrQualityProfiles(MemoryCacheProvider cacheProvider)
         {
             try
@@ -157,6 +171,28 @@ private void CacheSonarrQualityProfiles(MemoryCacheProvider cacheProvider)
             }
         }
 
+        private void CacheSonarrRootFolders(MemoryCacheProvider cacheProvider)
+        {
+            try
+            {
+                Log.Info("Executing GetSettings call to Sonarr for root folders");
+                var sonarrSettingsService = new SettingsServiceV2<SonarrSettings>(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider()));
+                var sonarrSettings = sonarrSettingsService.GetSettings();
+                if (sonarrSettings.Enabled)
+                {
+                    Log.Info("Begin executing GetSettings call to Sonarr for root folders");
+                    SonarrApi sonarrApi = new SonarrApi();
+                    var rootFolders = sonarrApi.GetRootFolders(sonarrSettings.ApiKey, sonarrSettings.FullUri);
+                    cacheProvider.Set(CacheKeys.SonarrRootFolders, rootFolders);
+                    Log.Info("Finished executing GetSettings call to Sonarr for root folders");
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Failed to cache Sonarr quality profiles!");
+            }
+        }
+
         private void CacheCouchPotatoQualityProfiles(MemoryCacheProvider cacheProvider)
         {
             try

PlexRequests.UI.Tests/TvSenderTests.cs

@@ -76,6 +76,7 @@ public async Task HappyPathSendSeriesToSonarr()
                     It.IsAny<bool>(),
                     It.IsAny<string>(),
                     It.IsAny<int>(),
+                    It.IsAny<int>(),
                     It.IsAny<int[]>(),
                     It.IsAny<string>(),
                     It.IsAny<Uri>(),
@@ -93,6 +94,7 @@ public async Task HappyPathSendSeriesToSonarr()
                     It.IsAny<bool>(),
                     It.IsAny<string>(),
                     It.IsAny<int>(),
+                    It.IsAny<int>(),
                     It.IsAny<int[]>(),
                     It.IsAny<string>(),
                     It.IsAny<Uri>(),
@@ -113,6 +115,7 @@ public async Task HappyPathSendEpisodeWithExistingSeriesToSonarr()
                     It.IsAny<bool>(),
                     It.IsAny<string>(),
                     It.IsAny<int>(),
+                    It.IsAny<int>(),
                     It.IsAny<int[]>(),
                     It.IsAny<string>(),
                     It.IsAny<Uri>(),
@@ -142,19 +145,23 @@ public async Task HappyPathSendEpisodeWithExistingSeriesToSonarr()
             var model = F.Build<RequestedModel>().With(x => x.ProviderId, 1)
                 .With(x => x.Episodes, episodes).Create();
 
-            var result = await Sender.SendToSonarr(GetSonarrSettings(), model, "2");
+            var result = await Sender.SendToSonarr(GetSonarrSettings(), model, "2", "1");
 
             Assert.That(result, Is.EqualTo(seriesResult));
-            SonarrMock.Verify(x => x.AddSeries(It.IsAny<int>(),
+            SonarrMock.Verify(x => x.AddSeries(
+                    It.IsAny<int>(),
                     It.IsAny<string>(),
                     It.IsAny<int>(),
                     It.IsAny<bool>(),
                     It.IsAny<string>(),
+                    It.IsAny<int>(), // rootFolderId
                     It.IsAny<int>(),
                     It.IsAny<int[]>(),
                     It.IsAny<string>(),
                     It.IsAny<Uri>(),
-                    true, It.IsAny<bool>()), Times.Once);
+                    true,
+                    It.IsAny<bool>()
+            ), Times.Once);
         }
 
         [Test]

PlexRequests.UI/Helpers/TvSender.cs

@@ -55,10 +55,10 @@ public TvSender(ISonarrApi sonarrApi, ISickRageApi srApi)
 
         public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, RequestedModel model)
         {
-            return await SendToSonarr(sonarrSettings, model, string.Empty);
+            return await SendToSonarr(sonarrSettings, model, string.Empty, string.Empty);
         }
 
-        public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, RequestedModel model, string qualityId)
+        public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, RequestedModel model, string qualityId, string rootFolderId)
         {
             var qualityProfile = 0;
             var episodeRequest = model.Episodes.Any();
@@ -72,6 +72,17 @@ public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, R
                 int.TryParse(sonarrSettings.QualityProfile, out qualityProfile);
             }
 
+            var rootFolder = 0;
+            if (!string.IsNullOrEmpty(rootFolderId))
+            {
+                int.TryParse(qualityId, out rootFolder);
+            }
+
+            if (rootFolder <= 0)
+            {
+                int.TryParse(sonarrSettings.RootFolder, out rootFolder);
+            }
+
             var series = await GetSonarrSeries(sonarrSettings, model.ProviderId);
 
             if (episodeRequest)
@@ -88,7 +99,9 @@ public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, R
 
                 // Series doesn't exist, need to add it as unmonitored.
                 var addResult = await Task.Run(() => SonarrApi.AddSeries(model.ProviderId, model.Title, qualityProfile,
-                    sonarrSettings.SeasonFolders, sonarrSettings.RootPath, 0, new int[0], sonarrSettings.ApiKey,
+                    sonarrSettings.SeasonFolders, sonarrSettings.RootPath, 
+                    1, // rootFolderId
+                    0, new int[0], sonarrSettings.ApiKey,
                     sonarrSettings.FullUri, false));
 
 
@@ -160,7 +173,9 @@ public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, R
 
 
             var result = SonarrApi.AddSeries(model.ProviderId, model.Title, qualityProfile,
-                sonarrSettings.SeasonFolders, sonarrSettings.RootPath, model.SeasonCount, model.SeasonList, sonarrSettings.ApiKey,
+                sonarrSettings.SeasonFolders, sonarrSettings.RootPath, 
+                rootFolder,
+                model.SeasonCount, model.SeasonList, sonarrSettings.ApiKey,
                 sonarrSettings.FullUri, true, true);
 
             return result;

PlexRequests.UI/ModelDataProviders/SonarrSettingsDataProvider.cs

@@ -50,6 +50,7 @@ public SwaggerModelData GetModelData()
                     with.Property(x => x.SubDir).Description("Subdir/BaseUrl of Sonarr").Required(false);
                     with.Property(x => x.ApiKey).Description("Sonarr's API key").Required(true);
                     with.Property(x => x.QualityProfile).Description("Sonarr's quality profile").Required(true);
+                    with.Property(x => x.RootFolder).Description("Sonarr's root folder").Required(true);
 
                     with.Property(x => x.SeasonFolders).Description("Sonarr's season folders").Required(false);
 

PlexRequests.UI/Models/RequestViewModel.cs

@@ -53,6 +53,7 @@ public class RequestViewModel
         public string TvSeriesRequestType { get; set; }
         public string MusicBrainzId { get; set; }
         public QualityModel[] Qualities { get; set; }
+        public RootFolderModel[] RootFolders { get; set; }
         public string ArtistName { get; set; }
         public Store.EpisodesModel[] Episodes { get; set; }
         public bool Denied { get; set; }

PlexRequests.UI/Models/RootFolderModel.cs

@@ -0,0 +1,10 @@
+namespace PlexRequests.UI.Models
+{
+    public class RootFolderModel
+    {
+        public string Id { get; set; }
+        public string Path { get; set; }
+        public long FreeSpace { get; set; }
+    }
+}
+

PlexRequests.UI/Modules/AdminModule.cs

@@ -170,6 +170,7 @@ public AdminModule(ISettingsService<PlexRequestSettings> prService,
             Post["/sickrage"] = _ => SaveSickrage();
 
             Post["/sonarrprofiles"] = _ => GetSonarrQualityProfiles();
+            Post["/sonarrrootfolders"] = _ => GetSonarrRootFolders();
             Post["/cpprofiles", true] = async (x, ct) => await GetCpProfiles();
             Post["/cpapikey"] = x => GetCpApiKey();
 
@@ -470,6 +471,19 @@ private Response GetSonarrQualityProfiles()
             return Response.AsJson(profiles);
         }
 
+        private Response GetSonarrRootFolders()
+        {
+            var settings = this.Bind<SonarrSettings>();
+            var rootFolders = SonarrApi.GetRootFolders(settings.ApiKey, settings.FullUri);
+
+            // set the cache
+            if (rootFolders != null)
+            {
+                Cache.Set(CacheKeys.SonarrRootFolders, rootFolders);
+            }
+
+            return Response.AsJson(rootFolders);
+        }
 
         private Negotiator EmailNotifications()
         {

PlexRequests.UI/Modules/ApprovalModule.cs

@@ -64,7 +64,7 @@ public ApprovalModule(IRequestService service, ISettingsService<CouchPotatoSetti
             HeadphonesSettings = hpSettings;
             HeadphoneApi = hpApi;
 
-            Post["/approve", true] = async (x, ct) => await Approve((int)Request.Form.requestid, (string)Request.Form.qualityId);
+            Post["/approve", true] = async (x, ct) => await Approve((int)Request.Form.requestid, (string)Request.Form.qualityId, (string)Request.Form.rootFolderId);
             Post["/deny", true] = async (x, ct) => await DenyRequest((int)Request.Form.requestid, (string)Request.Form.reason);
             Post["/approveall", true] = async (x, ct) => await ApproveAll();
             Post["/approveallmovies", true] = async (x, ct) => await ApproveAllMovies();
@@ -91,7 +91,7 @@ public ApprovalModule(IRequestService service, ISettingsService<CouchPotatoSetti
         /// </summary>
         /// <param name="requestId">The request identifier.</param>
         /// <returns></returns>
-        private async Task<Response> Approve(int requestId, string qualityId)
+        private async Task<Response> Approve(int requestId, string qualityId, string rootFolderId)
         {
             Log.Info("approving request {0}", requestId);
 
@@ -109,23 +109,23 @@ private async Task<Response> Approve(int requestId, string qualityId)
                 case RequestType.Movie:
                     return await RequestMovieAndUpdateStatus(request, qualityId);
                 case RequestType.TvShow:
-                    return await RequestTvAndUpdateStatus(request, qualityId);
+                    return await RequestTvAndUpdateStatus(request, qualityId, rootFolderId);
                 case RequestType.Album:
                     return await RequestAlbumAndUpdateStatus(request);
                 default:
                     throw new ArgumentOutOfRangeException(nameof(request));
             }
         }
 
-        private async Task<Response> RequestTvAndUpdateStatus(RequestedModel request, string qualityId)
+        private async Task<Response> RequestTvAndUpdateStatus(RequestedModel request, string qualityId, string rootFolderId)
         {
             var sender = new TvSender(SonarrApi, SickRageApi);
 
             var sonarrSettings = await SonarrSettings.GetSettingsAsync();
             if (sonarrSettings.Enabled)
             {
                 Log.Trace("Sending to Sonarr");
-                var result = await sender.SendToSonarr(sonarrSettings, request, qualityId);
+                var result = await sender.SendToSonarr(sonarrSettings, request, qualityId, rootFolderId);
                 Log.Trace("Sonarr Result: ");
                 Log.Trace(result.DumpJson());
                 if (!string.IsNullOrEmpty(result.title))