From 2c66793986853e90db60f5bd05a705f44e550508 Mon Sep 17 00:00:00 2001
From: TidusJar <tidusjar@gmail.com>
Date: Mon, 5 Nov 2018 08:25:06 +0000
Subject: [PATCH 1/2] Fixed #2633

---
 .../Rules/Request/ExistingTVRequestRule.cs    | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 src/Ombi.Core/Rule/Rules/Request/ExistingTVRequestRule.cs

diff --git a/src/Ombi.Core/Rule/Rules/Request/ExistingTVRequestRule.cs b/src/Ombi.Core/Rule/Rules/Request/ExistingTVRequestRule.cs
new file mode 100644
index 000000000..9942ece63
--- /dev/null
+++ b/src/Ombi.Core/Rule/Rules/Request/ExistingTVRequestRule.cs
@@ -0,0 +1,57 @@
+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.Requests;
+
+namespace Ombi.Core.Rule.Rules.Request
+{
+    public class ExistingTvRequestRule : BaseRequestRule, IRules<BaseRequest>
+    {
+        public ExistingTvRequestRule(ITvRequestRepository rv)
+        {
+            Tv = rv;
+        }
+
+        private ITvRequestRepository Tv { get; }
+
+        /// <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 tv = (ChildRequests) obj;
+                var tvRequests = Tv.GetChild();
+                var currentRequest = await tvRequests.FirstOrDefaultAsync(x => x.ParentRequest.TvDbId == tv.Id); // the Id on the child is the tvdbid at this point
+                if (currentRequest == null)
+                {
+                    return Success();
+                }
+                foreach (var season in tv.SeasonRequests)
+                {
+                    var currentSeasonRequest =
+                        currentRequest.SeasonRequests.FirstOrDefault(x => x.SeasonNumber == season.SeasonNumber);
+                    if (currentSeasonRequest == null)
+                    {
+                        continue;
+                    }
+                    foreach (var e in season.Episodes)
+                    {
+                        var hasEpisode = currentSeasonRequest.Episodes.Any(x => x.EpisodeNumber == e.EpisodeNumber);
+                        if (hasEpisode)
+                        {
+                            return Fail($"We already have episodes requested from series {tv.Title}");
+                        }
+                    }
+                }
+            }
+            return Success();
+        }
+    }
+}
\ No newline at end of file

From 46e3b878a132365be333fee08a741233c877a80f Mon Sep 17 00:00:00 2001
From: Jamie <tidusjar@gmail.com>
Date: Wed, 7 Nov 2018 19:43:35 +0000
Subject: [PATCH 2/2] Fixed #2623

---
 src/Ombi.Api.Emby/EmbyApi.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Ombi.Api.Emby/EmbyApi.cs b/src/Ombi.Api.Emby/EmbyApi.cs
index fcb989094..fa8414ac9 100644
--- a/src/Ombi.Api.Emby/EmbyApi.cs
+++ b/src/Ombi.Api.Emby/EmbyApi.cs
@@ -98,7 +98,7 @@ namespace Ombi.Api.Emby
 
             request.AddQueryString("Fields", "ProviderIds,Overview");
 
-            request.AddQueryString("VirtualItem", "False");
+            request.AddQueryString("IsVirtualItem", "False");
 
             return await Api.Request<EmbyItemContainer<EmbyMovie>>(request);
         }
@@ -149,7 +149,7 @@ namespace Ombi.Api.Emby
             request.AddQueryString("IncludeItemTypes", type);
             request.AddQueryString("Fields", includeOverview ? "ProviderIds,Overview" : "ProviderIds");
 
-            request.AddQueryString("VirtualItem", "False");
+            request.AddQueryString("IsVirtualItem", "False");
 
             AddHeaders(request, apiKey);
 
@@ -167,7 +167,7 @@ namespace Ombi.Api.Emby
             request.AddQueryString("startIndex", startIndex.ToString());
             request.AddQueryString("limit", count.ToString());
 
-            request.AddQueryString("VirtualItem", "False");
+            request.AddQueryString("IsVirtualItem", "False");
 
             AddHeaders(request, apiKey);