Finished #535 #445 #170

Ombi-app · Jan 23, 2017 · 7fc26df · 7fc26df
1 parent 9121af0
commit 7fc26df
Show file tree

Hide file tree

Showing 19 changed files with 263 additions and 129 deletions.
diff --git a/Ombi.Api.Interfaces/ISonarrApi.cs b/Ombi.Api.Interfaces/ISonarrApi.cs
@@ -36,12 +36,11 @@ public interface ISonarrApi
         List<SonarrProfile> GetProfiles(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);
 
         SonarrAddSeries AddSeriesNew(int tvdbId, string title, int qualityId, bool seasonFolders, string rootPath,
-            int rootFolderId, int[] seasons, string apiKey, Uri baseUrl, bool monitor = true,
+             int[] seasons, string apiKey, Uri baseUrl, bool monitor = true,
     bool searchForMissingEpisodes = false);
 
         SystemStatus SystemStatus(string apiKey, Uri baseUrl);

diff --git a/Ombi.Api/SonarrApi.cs b/Ombi.Api/SonarrApi.cs
@@ -78,7 +78,7 @@ public List<SonarrRootFolder> GetRootFolders(string apiKey, Uri 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)
+        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)
         {
             Log.Debug("Adding series {0}", title);
             Log.Debug("Seasons = {0}, out of {1} seasons", seasons.DumpJson(), seasonCount);
@@ -148,7 +148,7 @@ public SonarrAddSeries AddSeries(int tvdbId, string title, int qualityId, bool s
             return result;
         }
 
-        public SonarrAddSeries AddSeriesNew(int tvdbId, string title, int qualityId, bool seasonFolders, string rootPath, int rootFolderId, int[] seasons, string apiKey, Uri baseUrl, bool monitor = true, bool searchForMissingEpisodes = false)
+        public SonarrAddSeries AddSeriesNew(int tvdbId, string title, int qualityId, bool seasonFolders, string rootPath, int[] seasons, string apiKey, Uri baseUrl, bool monitor = true, bool searchForMissingEpisodes = false)
         {
             var request = new RestRequest
             {

diff --git a/Ombi.Core/SettingModels/SonarrSettings.cs b/Ombi.Core/SettingModels/SonarrSettings.cs
@@ -33,7 +33,5 @@ public sealed class SonarrSettings : ExternalSettings
         public string QualityProfile { get; set; }
         public bool SeasonFolders { get; set; }
         public string RootPath { get; set; }
-        public string RootFolder { get; set; }
-
     }
 }
diff --git a/Ombi.Core/TvSender.cs b/Ombi.Core/TvSender.cs
@@ -34,24 +34,27 @@
 using Ombi.Api.Models.SickRage;
 using Ombi.Api.Models.Sonarr;
 using Ombi.Core.SettingModels;
+using Ombi.Helpers;
 using Ombi.Store;
 
 namespace Ombi.Core
 {
     public class TvSender
     {
-        public TvSender(ISonarrApi sonarrApi, ISickRageApi srApi)
+        public TvSender(ISonarrApi sonarrApi, ISickRageApi srApi, ICacheProvider cache)
         {
             SonarrApi = sonarrApi;
             SickrageApi = srApi;
+            Cache = cache;
         }
         private ISonarrApi SonarrApi { get; }
         private ISickRageApi SickrageApi { get; }
+        private ICacheProvider Cache { get; }
         private static Logger Log = LogManager.GetCurrentClassLogger();
 
         public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, RequestedModel model)
         {
-            return await SendToSonarr(sonarrSettings, model, string.Empty, string.Empty);
+            return await SendToSonarr(sonarrSettings, model, string.Empty);
         }
 
         /// <summary>
@@ -61,7 +64,7 @@ public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, R
         /// <param name="model"></param>
         /// <param name="qualityId"></param>
         /// <returns></returns>
-        public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, RequestedModel model, string qualityId, string rootFolderId)
+        public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, RequestedModel model, string qualityId)
         {
             var qualityProfile = 0;
             var episodeRequest = model.Episodes.Any();
@@ -82,16 +85,7 @@ public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, R
             var latest = model.SeasonsRequested?.Equals("Latest", StringComparison.CurrentCultureIgnoreCase);
             var specificSeasonRequest = model.SeasonList?.Any();
 
-            var rootFolder = 0;
-            if (!string.IsNullOrEmpty(rootFolderId))
-            {
-                int.TryParse(qualityId, out rootFolder);
-            }
-
-            if (rootFolder <= 0)
-            {
-                int.TryParse(sonarrSettings.RootFolder, out rootFolder);
-            }
+            var rootFolderPath = model.RootFolderSelected <= 0 ? sonarrSettings.RootPath : await GetRootPath(model.RootFolderSelected, sonarrSettings);
 
             if (episodeRequest)
             {
@@ -107,7 +101,7 @@ 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, rootFolder, new int[0], sonarrSettings.ApiKey,
+                    sonarrSettings.SeasonFolders, rootFolderPath, 0, new int[0], sonarrSettings.ApiKey,
                     sonarrSettings.FullUri, false));
 
 
@@ -136,7 +130,7 @@ public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, R
             {
                 // Set the series as monitored with a season count as 0 so it doesn't search for anything
                 SonarrApi.AddSeriesNew(model.ProviderId, model.Title, qualityProfile,
-                    sonarrSettings.SeasonFolders, sonarrSettings.RootPath, rootFolder, new int[] {1,2,3,4,5,6,7,8,9,10,11,12,13}, sonarrSettings.ApiKey,
+                    sonarrSettings.SeasonFolders, rootFolderPath, new int[] {1,2,3,4,5,6,7,8,9,10,11,12,13}, sonarrSettings.ApiKey,
                     sonarrSettings.FullUri);
 
                 await Task.Delay(TimeSpan.FromSeconds(1));
@@ -383,5 +377,20 @@ private async Task<Series> GetSonarrSeries(SonarrSettings sonarrSettings, int sh
 
             return selectedSeries;
         }
+
+        private async Task<string> GetRootPath(int pathId, SonarrSettings sonarrSettings)
+        {
+            var rootFoldersResult = await Cache.GetOrSetAsync(CacheKeys.SonarrRootFolders, async () =>
+            {
+                return await Task.Run(() => SonarrApi.GetRootFolders(sonarrSettings.ApiKey, sonarrSettings.FullUri));
+            });
+
+            foreach (var r in rootFoldersResult.Where(r => r.id == pathId))
+            {
+                return r.path;
+            }
+            return string.Empty;
+        }
+
     }
 }
diff --git a/Ombi.Core/TvSenderOld.cs b/Ombi.Core/TvSenderOld.cs
@@ -34,27 +34,30 @@
 using Ombi.Api.Models.SickRage;
 using Ombi.Api.Models.Sonarr;
 using Ombi.Core.SettingModels;
+using Ombi.Helpers;
 using Ombi.Store;
 
 namespace Ombi.Core
 {
     public class TvSenderOld
     {
-        public TvSenderOld(ISonarrApi sonarrApi, ISickRageApi srApi)
+        public TvSenderOld(ISonarrApi sonarrApi, ISickRageApi srApi, ICacheProvider cache)
         {
             SonarrApi = sonarrApi;
             SickrageApi = srApi;
+            Cache = cache;
         }
         private ISonarrApi SonarrApi { get; }
         private ISickRageApi SickrageApi { get; }
+        private ICacheProvider Cache { get; }
         private static Logger Log = LogManager.GetCurrentClassLogger();
 
-        public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, RequestedModel model, string rootFolderId = null)
+        public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, RequestedModel model)
         {
-            return await SendToSonarr(sonarrSettings, model, string.Empty, rootFolderId);
+            return await SendToSonarr(sonarrSettings, model, string.Empty);
         }
 
-        public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, RequestedModel model, string qualityId, string rootFolderId)
+        public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, RequestedModel model, string qualityId)
         {
             var qualityProfile = 0;
             var episodeRequest = model.Episodes.Any();
@@ -67,16 +70,7 @@ 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 rootFolderPath = model.RootFolderSelected <= 0 ? sonarrSettings.RootPath : await GetRootPath(model.RootFolderSelected, sonarrSettings);
 
 
             var series = await GetSonarrSeries(sonarrSettings, model.ProviderId);
@@ -95,7 +89,7 @@ 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, rootFolder, 0, new int[0], sonarrSettings.ApiKey,
+                    sonarrSettings.SeasonFolders, rootFolderPath, 0, new int[0], sonarrSettings.ApiKey,
                     sonarrSettings.FullUri, false));
 
 
@@ -167,7 +161,7 @@ public async Task<SonarrAddSeries> SendToSonarr(SonarrSettings sonarrSettings, R
 
 
             var result = SonarrApi.AddSeries(model.ProviderId, model.Title, qualityProfile,
-                sonarrSettings.SeasonFolders, sonarrSettings.RootPath, rootFolder, model.SeasonCount, model.SeasonList, sonarrSettings.ApiKey,
+                sonarrSettings.SeasonFolders, rootFolderPath, model.SeasonCount, model.SeasonList, sonarrSettings.ApiKey,
                 sonarrSettings.FullUri, true, true);
 
             return result;
@@ -309,5 +303,20 @@ private async Task<Series> GetSonarrSeries(SonarrSettings sonarrSettings, int sh
 
             return selectedSeries;
         }
+
+
+        private async Task<string> GetRootPath(int pathId, SonarrSettings sonarrSettings)
+        {
+            var rootFoldersResult = await Cache.GetOrSetAsync(CacheKeys.SonarrRootFolders, async () =>
+            {
+                return await Task.Run(() => SonarrApi.GetRootFolders(sonarrSettings.ApiKey, sonarrSettings.FullUri));
+            });
+
+            foreach (var r in rootFoldersResult.Where(r => r.id == pathId))
+            {
+                return r.path;
+            }
+            return string.Empty;
+        }
     }
 }
diff --git a/Ombi.Services/Jobs/FaultQueueHandler.cs b/Ombi.Services/Jobs/FaultQueueHandler.cs
@@ -53,7 +53,7 @@ public FaultQueueHandler(IJobRecord record, IRepository<RequestQueue> repo, ISon
             ISickRageApi srApi, ISettingsService<SonarrSettings> sonarrSettings, ISettingsService<SickRageSettings> srSettings,
             ICouchPotatoApi cpApi, ISettingsService<CouchPotatoSettings> cpsettings, IRequestService requestService,
             ISettingsService<HeadphonesSettings> hpSettings, IHeadphonesApi headphonesApi, ISettingsService<PlexRequestSettings> prSettings,
-            ISecurityExtensions security, IMovieSender movieSender)
+            ISecurityExtensions security, IMovieSender movieSender, ICacheProvider cache)
         {
             Record = record;
             Repo = repo;
@@ -71,13 +71,16 @@ public FaultQueueHandler(IJobRecord record, IRepository<RequestQueue> repo, ISon
             Security = security;
             PrSettings = prSettings.GetSettings();
             MovieSender = movieSender;
+
+            Cache = cache;
         }
 
         private IMovieSender MovieSender { get; }
         private IRepository<RequestQueue> Repo { get; }
         private IJobRecord Record { get; }
         private ISonarrApi SonarrApi { get; }
         private ISickRageApi SrApi { get; }
+        private ICacheProvider Cache { get; }
         private ICouchPotatoApi CpApi { get; }
         private IHeadphonesApi HpApi { get; }
         private IRequestService RequestService { get; }
@@ -163,7 +166,7 @@ private bool ProcessTvShow(RequestedModel tvModel, SonarrSettings sonarr, SickRa
             try
             {
 
-                var sender = new TvSenderOld(SonarrApi, SrApi);
+                var sender = new TvSenderOld(SonarrApi, SrApi, Cache);
                 if (sonarr.Enabled)
                 {
                     var task = sender.SendToSonarr(sonarr, tvModel, sonarr.QualityProfile);

diff --git a/Ombi.Services/Jobs/PlexAvailabilityChecker.cs b/Ombi.Services/Jobs/PlexAvailabilityChecker.cs
@@ -79,6 +79,7 @@ public PlexAvailabilityChecker(ISettingsService<PlexSettings> plexSettings, IReq
 
         public void CheckAndUpdateAll()
         {
+
             var plexSettings = Plex.GetSettings();
 
             if (!ValidateSettings(plexSettings))

diff --git a/Ombi.Store/RequestedModel.cs b/Ombi.Store/RequestedModel.cs
@@ -46,6 +46,13 @@ public RequestedModel()
         public List<EpisodesModel> Episodes { get; set; }
         public bool Denied { get; set; }
         public string DeniedReason { get; set; }
+        /// <summary>
+        /// For TV Shows with a custom root folder
+        /// </summary>
+        /// <value>
+        /// The root folder selected.
+        /// </value>
+        public int RootFolderSelected { get; set; }
 
         [JsonIgnore]
         public List<string> AllUsers

diff --git a/Ombi.UI.Tests/TvSenderTests.cs b/Ombi.UI.Tests/TvSenderTests.cs
@@ -35,6 +35,7 @@
 using Ombi.Api.Models.Sonarr;
 using Ombi.Core;
 using Ombi.Core.SettingModels;
+using Ombi.Helpers;
 using Ombi.Store;
 using Ploeh.AutoFixture;
 
@@ -49,14 +50,16 @@ public class TvSenderTests
 
         private TvSender Sender { get; set; }
         private Fixture F { get; set; }
+        private Mock<ICacheProvider> Cache { get; set; }
 
         [SetUp]
         public void Setup()
         {
             F = new Fixture();
             SonarrMock = new Mock<ISonarrApi>();
             SickrageMock = new Mock<ISickRageApi>();
-            Sender = new TvSender(SonarrMock.Object, SickrageMock.Object);
+            Cache = new Mock<ICacheProvider>();
+            Sender = new TvSender(SonarrMock.Object, SickrageMock.Object, Cache.Object);
         }
 
         [Test]
@@ -66,7 +69,7 @@ public async Task HappyPathSendSeriesToSonarrAllSeason()
             var seriesResult = new SonarrAddSeries() { title = "ABC"};
             SonarrMock.Setup(x => x.GetSeries(It.IsAny<string>(), It.IsAny<Uri>())).Returns(F.Build<Series>().With(x => x.tvdbId, 1).With(x => x.title, "ABC").CreateMany().ToList());
 
-            Sender = new TvSender(SonarrMock.Object, SickrageMock.Object);
+            Sender = new TvSender(SonarrMock.Object, SickrageMock.Object, Cache.Object);
 
             var request = new RequestedModel {SeasonsRequested = "All", ProviderId = 1, Title = "ABC"};
 
@@ -79,7 +82,6 @@ public async Task HappyPathSendSeriesToSonarrAllSeason()
                     It.IsAny<bool>(),
                     It.IsAny<string>(),
                     It.IsAny<int>(),
-                    It.IsAny<int>(),
                     It.IsAny<int[]>(),
                     It.IsAny<string>(),
                     It.IsAny<Uri>(),
@@ -100,7 +102,6 @@ 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>(),
@@ -118,7 +119,7 @@ public async Task HappyPathSendEpisodeWithExistingSeriesToSonarr()
             SonarrMock.Setup(x => x.GetEpisodes(It.IsAny<string>(), It.IsAny<string>(),
                 It.IsAny<Uri>())).Returns(F.CreateMany<SonarrEpisodes>());
 
-            Sender = new TvSender(SonarrMock.Object, SickrageMock.Object);
+            Sender = new TvSender(SonarrMock.Object, SickrageMock.Object, Cache.Object);
             var episodes = new List<EpisodesModel>
             {
                 new EpisodesModel
@@ -130,7 +131,7 @@ 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", string.Empty);
+            var result = await Sender.SendToSonarr(GetSonarrSettings(), model, "2");
 
             Assert.That(result, Is.EqualTo(seriesResult));
             SonarrMock.Verify(x => x.AddSeries(It.IsAny<int>(),
@@ -139,7 +140,6 @@ 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>(),
-Original file line number
+Diff line change
@@ Expand Up @@
             public void CheckAndUpdateAll()
             {
                 var plexSettings = Plex.GetSettings();
                 if (!ValidateSettings(plexSettings))
@@ Expand Down @@