From a7607ac7d63504c9849c78f45186d01b48a6bc7c Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Sat, 17 Feb 2024 21:59:23 -0800
Subject: [PATCH] Fixed: Only match via TV Rage ID if TheTVDB ID is not
 available

Closes #6517
---
 .../ParserTests/ParsingServiceTests/MapFixture.cs   | 13 ++++++++++++-
 src/NzbDrone.Core/Parser/ParsingService.cs          |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/MapFixture.cs b/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/MapFixture.cs
index e0277d3e4..0aac2ecbc 100644
--- a/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/MapFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/MapFixture.cs
@@ -191,12 +191,23 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests
         {
             GivenParseResultSeriesDoesntMatchSearchCriteria();
 
-            Subject.Map(_parsedEpisodeInfo, 10, 10, _singleEpisodeSearchCriteria);
+            Subject.Map(_parsedEpisodeInfo, 0, 10, _singleEpisodeSearchCriteria);
 
             Mocker.GetMock<ISeriesService>()
                   .Verify(v => v.FindByTvRageId(It.IsAny<int>()), Times.Once());
         }
 
+        [Test]
+        public void should_not_FindByTvRageId_when_search_criteria_and_FindByTitle_matching_fails_and_tvdb_id_is_specified()
+        {
+            GivenParseResultSeriesDoesntMatchSearchCriteria();
+
+            Subject.Map(_parsedEpisodeInfo, 10, 10, _singleEpisodeSearchCriteria);
+
+            Mocker.GetMock<ISeriesService>()
+                .Verify(v => v.FindByTvRageId(It.IsAny<int>()), Times.Never());
+        }
+
         [Test]
         public void should_use_tvdbid_matching_when_alias_is_found()
         {
diff --git a/src/NzbDrone.Core/Parser/ParsingService.cs b/src/NzbDrone.Core/Parser/ParsingService.cs
index d8cd88cac..5819704f7 100644
--- a/src/NzbDrone.Core/Parser/ParsingService.cs
+++ b/src/NzbDrone.Core/Parser/ParsingService.cs
@@ -396,7 +396,7 @@ namespace NzbDrone.Core.Parser
                     return new FindSeriesResult(searchCriteria.Series, SeriesMatchType.Id);
                 }
 
-                if (tvRageId > 0 && tvRageId == searchCriteria.Series.TvRageId)
+                if (tvRageId > 0 && tvRageId == searchCriteria.Series.TvRageId && tvdbId <= 0)
                 {
                     _logger.Debug()
                            .Message("Found matching series by TVRage ID {0}, an alias may be needed for: {1}", tvRageId, parsedEpisodeInfo.SeriesTitle)
@@ -446,7 +446,7 @@ namespace NzbDrone.Core.Parser
                 }
             }
 
-            if (series == null && tvRageId > 0)
+            if (series == null && tvRageId > 0 && tvdbId <= 0)
             {
                 series = _seriesService.FindByTvRageId(tvRageId);