Merge branch 'develop' into feature/request-queue

src/Ombi.Core/Engine/TvRequestEngine.cs

@@ -116,6 +116,7 @@ namespace Ombi.Core.Engine
                     }
 
                 // Remove the ID since this is a new child
+                // This was a TVDBID for the request rules to run
                 tvBuilder.ChildRequest.Id = 0;
                 if (!tvBuilder.ChildRequest.SeasonRequests.Any())
                 {

src/Ombi.Core/Helpers/TvShowRequestBuilder.cs

@@ -41,7 +41,7 @@ namespace Ombi.Core.Helpers
             ShowInfo = await TvApi.ShowLookupByTheTvDbId(id);
             Results = await MovieDbApi.SearchTv(ShowInfo.name);
             foreach (TvSearchResult result in Results) {
-                if (result.Name == ShowInfo.name)
+                if (result.Name.Equals(ShowInfo.name, StringComparison.InvariantCultureIgnoreCase))
                 {                  
                     var showIds = await MovieDbApi.GetTvExternals(result.Id);
                     ShowInfo.externals.imdb = showIds.imdb_id;
@@ -64,14 +64,15 @@ namespace Ombi.Core.Helpers
         {
             ChildRequest = new ChildRequests
             {
-                Id = model.TvDbId,
+                Id = model.TvDbId, // This is set to 0 after the request rules have run, the request rules needs it to identify the request
                 RequestType = RequestType.TvShow,
                 RequestedDate = DateTime.UtcNow,
                 Approved = false,
                 RequestedUserId = userId,
                 SeasonRequests = new List<SeasonRequests>(),
                 Title = ShowInfo.name,
-                SeriesType = ShowInfo.genres.Any( s => s.Equals("Anime", StringComparison.OrdinalIgnoreCase)) ? SeriesType.Anime : SeriesType.Standard
+                ReleaseYear = FirstAir,
+                SeriesType = ShowInfo.genres.Any( s => s.Equals("Anime", StringComparison.InvariantCultureIgnoreCase)) ? SeriesType.Anime : SeriesType.Standard
             };
 
             return this;

src/Ombi.Core/Rule/Rules/Request/ExistingPlexRequestRule.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Ombi.Core.Rule.Interfaces;
+using Ombi.Store.Entities;
+using Ombi.Store.Entities.Requests;
+using Ombi.Store.Repository;
+
+namespace Ombi.Core.Rule.Rules.Request
+{
+    public class ExistingPlexRequestRule : BaseRequestRule, IRules<BaseRequest>
+    {
+        public ExistingPlexRequestRule(IPlexContentRepository rv)
+        {
+            _plexContent = rv;
+        }
+
+        private readonly IPlexContentRepository _plexContent;
+
+        /// <summary>
+        /// We check if the request exists, if it does then we don't want to re-request it.
+        /// </summary>
+        /// <param name="obj">The object.</param>
+        /// <returns></returns>
+        public async Task<RuleResult> Execute(BaseRequest obj)
+        {
+            if (obj.RequestType == RequestType.TvShow)
+            {
+                var tvRequest = (ChildRequests) obj;
+
+                var tvContent = _plexContent.GetAll().Where(x => x.Type == PlexMediaTypeEntity.Show);
+                // We need to do a check on the TVDBId
+                var anyTvDbMatches = await tvContent.Include(x => x.Episodes).FirstOrDefaultAsync(x => x.HasTvDb && x.TvDbId.Equals(tvRequest.Id.ToString())); // the Id on the child is the tvdbid at this point
+                if (anyTvDbMatches == null)
+                {
+                    // So we do not have a TVDB Id, that really sucks.
+                    // Let's try and match on the title and year of the show
+                    var titleAndYearMatch = await tvContent.Include(x=> x.Episodes).FirstOrDefaultAsync(x =>
+                        x.Title.Equals(tvRequest.Title, StringComparison.InvariantCultureIgnoreCase)
+                        && x.ReleaseYear == tvRequest.ReleaseYear.Year.ToString());
+                    if (titleAndYearMatch != null)
+                    {
+                        // We have a match! Suprise Motherfucker
+                        return CheckExistingContent(tvRequest, titleAndYearMatch);
+                    }
+
+                    // We do not have this
+                    return Success();
+                }
+                // looks like we have a match on the TVDbID
+                return CheckExistingContent(tvRequest, anyTvDbMatches);
+            }
+            return Success();
+        }
+
+
+        private RuleResult CheckExistingContent(ChildRequests child, PlexServerContent content)
+        {
+            foreach (var season in child.SeasonRequests)
+            {
+                var currentSeasonRequest =
+                    content.Episodes.Where(x => x.SeasonNumber == season.SeasonNumber).ToList();
+                if (!currentSeasonRequest.Any())
+                {
+                    continue;
+                }
+                foreach (var e in season.Episodes)
+                {
+                    var hasEpisode = currentSeasonRequest.Any(x => x.EpisodeNumber == e.EpisodeNumber);
+                    if (hasEpisode)
+                    {
+                        return Fail($"We already have episodes requested from series {child.Title}");
+                    }
+                }
+            }
+
+            return Success();
+        }
+    }
+}

src/Ombi.Core/Senders/MovieSender.cs

@@ -129,13 +129,17 @@ namespace Ombi.Core.Senders
             var profiles = await _userProfiles.GetAll().FirstOrDefaultAsync(x => x.UserId == model.RequestedUserId);
             if (profiles != null)
             {
-                if (profiles.SonarrRootPathAnime > 0)
-                {
-                    rootFolderPath = await RadarrRootPath(profiles.SonarrRootPathAnime, settings);
+                if (profiles.RadarrRootPath > 0)
+                { 
+                    var tempPath = await RadarrRootPath(profiles.RadarrRootPath, settings);
+                    if (tempPath.HasValue())
+                    {
+                        rootFolderPath = tempPath;
+                    }
                 }
-                if (profiles.SonarrQualityProfileAnime > 0)
+                if (profiles.RadarrQualityProfile > 0)
                 {
-                    qualityToUse = profiles.SonarrQualityProfileAnime;
+                    qualityToUse = profiles.RadarrQualityProfile;
                 }
             }
 
@@ -191,7 +195,7 @@ namespace Ombi.Core.Senders
         {
             var paths = await RadarrApi.GetRootFolders(settings.ApiKey, settings.FullUri);
             var selectedPath = paths.FirstOrDefault(x => x.id == overrideId);
-            return selectedPath.path;
+            return selectedPath?.path ?? String.Empty;
         }
     }
 }

src/Ombi.Core/Senders/TvSender.cs

@@ -21,11 +21,12 @@ namespace Ombi.Core.Senders
 {
     public class TvSender : ITvSender
     {
-        public TvSender(ISonarrApi sonarrApi, ILogger<TvSender> log, ISettingsService<SonarrSettings> sonarrSettings,
+        public TvSender(ISonarrApi sonarrApi, ISonarrV3Api sonarrV3Api, ILogger<TvSender> log, ISettingsService<SonarrSettings> sonarrSettings,
             ISettingsService<DogNzbSettings> dog, IDogNzbApi dogApi, ISettingsService<SickRageSettings> srSettings,
             ISickRageApi srApi, IRepository<UserQualityProfiles> userProfiles, IRepository<RequestQueue> requestQueue, INotificationHelper notify)
         {
             SonarrApi = sonarrApi;
+            SonarrV3Api = sonarrV3Api;
             Logger = log;
             SonarrSettings = sonarrSettings;
             DogNzbSettings = dog;
@@ -38,6 +39,7 @@ namespace Ombi.Core.Senders
         }
 
         private ISonarrApi SonarrApi { get; }
+        private ISonarrV3Api SonarrV3Api { get; }
         private IDogNzbApi DogNzbApi { get; }
         private ISickRageApi SickRageApi { get; }
         private ILogger<TvSender> Logger { get; }
@@ -211,6 +213,10 @@ namespace Ombi.Core.Senders
             {
                 qualityToUse = model.ParentRequest.QualityOverride.Value;
             }
+      
+            // Are we using v3 sonarr?
+            var sonarrV3 = s.V3;
+            var languageProfileId = s.LanguageProfile;
 
             try
             {
@@ -241,6 +247,11 @@ namespace Ombi.Core.Senders
                         }
                     };
 
+                    if (sonarrV3)
+                    {
+                        newSeries.languageProfileId = languageProfileId;
+                    }
+
                     // Montitor the correct seasons,
                     // If we have that season in the model then it's monitored!
                     var seasonsToAdd = GetSeasonsToCreate(model);
@@ -392,7 +403,7 @@ namespace Ombi.Core.Senders
                 var sea = new Season
                 {
                     seasonNumber = i,
-                    monitored = model.SeasonRequests.Any(x => x.SeasonNumber == index && x.SeasonNumber != 0)
+                    monitored = false
                 };
                 seasonsToUpdate.Add(sea);
             }