Fixed: Parsing of queued specials from download client queue

src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs

@@ -48,8 +48,8 @@ public void should_track_downloads_using_the_source_title_if_it_cannot_be_found_
             };
 
             Mocker.GetMock<IParsingService>()
-               .Setup(s => s.Map(It.Is<ParsedEpisodeInfo>(i => i.SeasonNumber == 1 && i.SeriesTitle == "TV Series"), It.IsAny<int>(), It.IsAny<IEnumerable<int>>()))
+                  .Setup(s => s.Map(It.Is<ParsedEpisodeInfo>(i => i.SeasonNumber == 1 && i.SeriesTitle == "TV Series"), It.IsAny<int>(), It.IsAny<IEnumerable<int>>()))
-               .Returns(remoteEpisode);
+                  .Returns(remoteEpisode);
 
             var client = new DownloadClientDefinition()
             {
@@ -72,5 +72,61 @@ public void should_track_downloads_using_the_source_title_if_it_cannot_be_found_
             trackedDownload.RemoteEpisode.Episodes.First().Id.Should().Be(4);
             trackedDownload.RemoteEpisode.ParsedEpisodeInfo.SeasonNumber.Should().Be(1);
         }
+
+        [Test]
+        public void should_parse_as_special_when_source_title_parsing_fails()
+        {
+            var remoteEpisode = new RemoteEpisode
+            {
+                Series = new Series() { Id = 5 },
+                Episodes = new List<Episode> { new Episode { Id = 4 } },
+                ParsedEpisodeInfo = new ParsedEpisodeInfo()
+                {
+                    SeriesTitle = "TV Series",
+                    SeasonNumber = 0,
+                    EpisodeNumbers = new []{ 1 }
+                }
+            };
+
+            Mocker.GetMock<IHistoryService>()
+                .Setup(s => s.FindByDownloadId(It.Is<string>(sr => sr == "35238")))
+                .Returns(new List<History.History>(){
+                 new History.History(){
+                     DownloadId = "35238",
+                     SourceTitle = "TV Series Special",
+                     SeriesId = 5,
+                     EpisodeId = 4
+                 }
+                });
+
+            Mocker.GetMock<IParsingService>()
+                  .Setup(s => s.Map(It.Is<ParsedEpisodeInfo>(i => i.SeasonNumber == 0 && i.SeriesTitle == "TV Series"), It.IsAny<int>(), It.IsAny<IEnumerable<int>>()))
+                  .Returns(remoteEpisode);
+
+            Mocker.GetMock<IParsingService>()
+                  .Setup(s => s.ParseSpecialEpisodeTitle(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>(), null))
+                  .Returns(remoteEpisode.ParsedEpisodeInfo);
+
+            var client = new DownloadClientDefinition()
+            {
+                Id = 1,
+                Protocol = DownloadProtocol.Torrent
+            };
+
+            var item = new DownloadClientItem()
+            {
+                Title = "The torrent release folder",
+                DownloadId = "35238",
+            };
+
+            var trackedDownload = Subject.TrackDownload(client, item);
+
+            trackedDownload.Should().NotBeNull();
+            trackedDownload.RemoteEpisode.Should().NotBeNull();
+            trackedDownload.RemoteEpisode.Series.Should().NotBeNull();
+            trackedDownload.RemoteEpisode.Series.Id.Should().Be(5);
+            trackedDownload.RemoteEpisode.Episodes.First().Id.Should().Be(4);
+            trackedDownload.RemoteEpisode.ParsedEpisodeInfo.SeasonNumber.Should().Be(0);
+        }
     }
 }

src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs

@@ -75,7 +75,10 @@ public TrackedDownload TrackDownload(DownloadClientDefinition downloadClient, Do
                         trackedDownload.RemoteEpisode.Series == null ||
                         trackedDownload.RemoteEpisode.Episodes.Empty())
                     {
-                        parsedEpisodeInfo = Parser.Parser.ParseTitle(firstHistoryItem.SourceTitle);
+                        // Try parsing the original source title and if that fails, try parsing it as a special
+                        // TODO: Pass the TVDB ID and TVRage IDs in as well so we have a better chance for finding the item
+                        parsedEpisodeInfo = Parser.Parser.ParseTitle(firstHistoryItem.SourceTitle) ?? _parsingService.ParseSpecialEpisodeTitle(firstHistoryItem.SourceTitle, 0, 0);
+
                         if (parsedEpisodeInfo != null)
                         {
                             trackedDownload.RemoteEpisode = _parsingService.Map(parsedEpisodeInfo, firstHistoryItem.SeriesId, historyItems.Where(v => v.EventType == HistoryEventType.Grabbed).Select(h => h.EpisodeId).Distinct());

src/NzbDrone.Core/Parser/ParsingService.cs

@@ -305,14 +305,17 @@ public ParsedEpisodeInfo ParseSpecialEpisodeTitle(string title, int tvdbId, int
             }
 
             var series = GetSeries(title);
+
             if (series == null)
             {
                 series = _seriesService.FindByTitleInexact(title);
             }
+
             if (series == null && tvdbId > 0)
             {
                 series = _seriesService.FindByTvdbId(tvdbId);
             }
+
             if (series == null && tvRageId > 0)
             {
                 series = _seriesService.FindByTvRageId(tvRageId);