From 8af12cc4e7f71cf169392cd86ccf0eb81f6b375c Mon Sep 17 00:00:00 2001 From: kephasdev <160031725+kephasdev@users.noreply.github.com> Date: Sun, 18 Aug 2024 22:00:55 -0400 Subject: [PATCH] Fixed: Calculating Custom Formats with languages in queue --- .../Aggregators/AggregateLanguagesFixture.cs | 83 ++++++++++++++++++- .../TrackedDownloadServiceFixture.cs | 76 +++++++++++++++++ .../Indexers/IndexerRepositoryFixture.cs | 44 ++++++++++ .../Aggregators/AggregateLanguages.cs | 13 ++- .../TrackedDownloadService.cs | 17 ++-- src/NzbDrone.Core/Indexers/IndexerFactory.cs | 8 ++ .../Indexers/IndexerRepository.cs | 9 +- 7 files changed, 240 insertions(+), 10 deletions(-) create mode 100644 src/NzbDrone.Core.Test/Indexers/IndexerRepositoryFixture.cs diff --git a/src/NzbDrone.Core.Test/Download/Aggregation/Aggregators/AggregateLanguagesFixture.cs b/src/NzbDrone.Core.Test/Download/Aggregation/Aggregators/AggregateLanguagesFixture.cs index 50d09a154..6a41dc76e 100644 --- a/src/NzbDrone.Core.Test/Download/Aggregation/Aggregators/AggregateLanguagesFixture.cs +++ b/src/NzbDrone.Core.Test/Download/Aggregation/Aggregators/AggregateLanguagesFixture.cs @@ -2,6 +2,7 @@ using System.Linq; using FizzWare.NBuilder; using FluentAssertions; +using Moq; using NUnit.Framework; using NzbDrone.Core.Download.Aggregation.Aggregators; using NzbDrone.Core.Indexers; @@ -65,11 +66,12 @@ public void should_return_parsed_language() } [Test] - public void should_return_multi_languages_when_indexer_has_multi_languages_configuration() + public void should_return_multi_languages_when_indexer_id_has_multi_languages_configuration() { var releaseTitle = "Series.Title.S01E01.MULTi.1080p.WEB.H265-RlsGroup"; var indexerDefinition = new IndexerDefinition { + Id = 1, Settings = new TorrentRssIndexerSettings { MultiLanguages = new List { Language.Original.Id, Language.French.Id } } }; Mocker.GetMock() @@ -81,6 +83,67 @@ public void should_return_multi_languages_when_indexer_has_multi_languages_confi _remoteEpisode.Release.Title = releaseTitle; Subject.Aggregate(_remoteEpisode).Languages.Should().BeEquivalentTo(new List { _series.OriginalLanguage, Language.French }); + Mocker.GetMock().Verify(c => c.Get(1), Times.Once()); + Mocker.GetMock().VerifyNoOtherCalls(); + } + + [Test] + public void should_return_multi_languages_from_indexer_with_id_when_indexer_id_and_name_are_set() + { + var releaseTitle = "Series.Title.S01E01.MULTi.1080p.WEB.H265-RlsGroup"; + var indexerDefinition1 = new IndexerDefinition + { + Id = 1, + Name = "MyIndexer1", + Settings = new TorrentRssIndexerSettings { MultiLanguages = new List { Language.Original.Id, Language.French.Id } } + }; + var indexerDefinition2 = new IndexerDefinition + { + Id = 2, + Name = "MyIndexer2", + Settings = new TorrentRssIndexerSettings { MultiLanguages = new List { Language.Original.Id, Language.German.Id } } + }; + + Mocker.GetMock() + .Setup(v => v.Get(1)) + .Returns(indexerDefinition1); + + Mocker.GetMock() + .Setup(v => v.All()) + .Returns(new List() { indexerDefinition1, indexerDefinition2 }); + + _remoteEpisode.ParsedEpisodeInfo = GetParsedEpisodeInfo(new List { }, releaseTitle); + _remoteEpisode.Release.IndexerId = 1; + _remoteEpisode.Release.Indexer = "MyIndexer2"; + _remoteEpisode.Release.Title = releaseTitle; + + Subject.Aggregate(_remoteEpisode).Languages.Should().BeEquivalentTo(new List { _series.OriginalLanguage, Language.French }); + Mocker.GetMock().Verify(c => c.Get(1), Times.Once()); + Mocker.GetMock().VerifyNoOtherCalls(); + } + + [Test] + public void should_return_multi_languages_when_indexer_name_has_multi_languages_configuration() + { + var releaseTitle = "Series.Title.S01E01.MULTi.1080p.WEB.H265-RlsGroup"; + var indexerDefinition = new IndexerDefinition + { + Id = 1, + Name = "MyIndexer (Prowlarr)", + Settings = new TorrentRssIndexerSettings { MultiLanguages = new List { Language.Original.Id, Language.French.Id } } + }; + + Mocker.GetMock() + .Setup(v => v.FindByName("MyIndexer (Prowlarr)")) + .Returns(indexerDefinition); + + _remoteEpisode.ParsedEpisodeInfo = GetParsedEpisodeInfo(new List { }, releaseTitle); + _remoteEpisode.Release.Indexer = "MyIndexer (Prowlarr)"; + _remoteEpisode.Release.Title = releaseTitle; + + Subject.Aggregate(_remoteEpisode).Languages.Should().BeEquivalentTo(new List { _series.OriginalLanguage, Language.French }); + Mocker.GetMock().Verify(c => c.FindByName("MyIndexer (Prowlarr)"), Times.Once()); + Mocker.GetMock().VerifyNoOtherCalls(); } [Test] @@ -89,6 +152,7 @@ public void should_return_multi_languages_when_release_as_unknown_as_default_lan var releaseTitle = "Series.Title.S01E01.MULTi.1080p.WEB.H265-RlsGroup"; var indexerDefinition = new IndexerDefinition { + Id = 1, Settings = new TorrentRssIndexerSettings { MultiLanguages = new List { Language.Original.Id, Language.French.Id } } }; Mocker.GetMock() @@ -100,6 +164,8 @@ public void should_return_multi_languages_when_release_as_unknown_as_default_lan _remoteEpisode.Release.Title = releaseTitle; Subject.Aggregate(_remoteEpisode).Languages.Should().BeEquivalentTo(new List { _series.OriginalLanguage, Language.French }); + Mocker.GetMock().Verify(c => c.Get(1), Times.Once()); + Mocker.GetMock().VerifyNoOtherCalls(); } [Test] @@ -108,6 +174,7 @@ public void should_return_original_when_indexer_has_no_multi_languages_configura var releaseTitle = "Series.Title.S01E01.MULTi.1080p.WEB.H265-RlsGroup"; var indexerDefinition = new IndexerDefinition { + Id = 1, Settings = new TorrentRssIndexerSettings { } }; Mocker.GetMock() @@ -119,6 +186,20 @@ public void should_return_original_when_indexer_has_no_multi_languages_configura _remoteEpisode.Release.Title = releaseTitle; Subject.Aggregate(_remoteEpisode).Languages.Should().BeEquivalentTo(new List { _series.OriginalLanguage }); + Mocker.GetMock().Verify(c => c.Get(1), Times.Once()); + Mocker.GetMock().VerifyNoOtherCalls(); + } + + [Test] + public void should_return_original_when_no_indexer_value() + { + var releaseTitle = "Series.Title.S01E01.MULTi.1080p.WEB.H265-RlsGroup"; + + _remoteEpisode.ParsedEpisodeInfo = GetParsedEpisodeInfo(new List { }, releaseTitle); + _remoteEpisode.Release.Title = releaseTitle; + + Subject.Aggregate(_remoteEpisode).Languages.Should().BeEquivalentTo(new List { _series.OriginalLanguage }); + Mocker.GetMock().VerifyNoOtherCalls(); } [Test] diff --git a/src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs b/src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs index 3e541c404..0c07b6386 100644 --- a/src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs +++ b/src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs @@ -7,6 +7,8 @@ using NzbDrone.Core.Download.TrackedDownloads; using NzbDrone.Core.History; using NzbDrone.Core.Indexers; +using NzbDrone.Core.Indexers.TorrentRss; +using NzbDrone.Core.Languages; using NzbDrone.Core.Parser; using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Test.Framework; @@ -84,6 +86,80 @@ public void should_track_downloads_using_the_source_title_if_it_cannot_be_found_ trackedDownload.RemoteEpisode.MappedSeasonNumber.Should().Be(1); } + [Test] + public void should_set_indexer() + { + var episodeHistory = new EpisodeHistory() + { + DownloadId = "35238", + SourceTitle = "TV Series S01", + SeriesId = 5, + EpisodeId = 4, + EventType = EpisodeHistoryEventType.Grabbed, + }; + episodeHistory.Data.Add("indexer", "MyIndexer (Prowlarr)"); + Mocker.GetMock() + .Setup(s => s.FindByDownloadId(It.Is(sr => sr == "35238"))) + .Returns(new List() + { + episodeHistory + }); + + var indexerDefinition = new IndexerDefinition + { + Id = 1, + Name = "MyIndexer (Prowlarr)", + Settings = new TorrentRssIndexerSettings { MultiLanguages = new List { Language.Original.Id, Language.French.Id } } + }; + Mocker.GetMock() + .Setup(v => v.Get(indexerDefinition.Id)) + .Returns(indexerDefinition); + Mocker.GetMock() + .Setup(v => v.All()) + .Returns(new List() { indexerDefinition }); + + var remoteEpisode = new RemoteEpisode + { + Series = new Series() { Id = 5 }, + Episodes = new List { new Episode { Id = 4 } }, + ParsedEpisodeInfo = new ParsedEpisodeInfo() + { + SeriesTitle = "TV Series", + SeasonNumber = 1 + }, + MappedSeasonNumber = 1 + }; + + Mocker.GetMock() + .Setup(s => s.Map(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), null)) + .Returns(remoteEpisode); + + var client = new DownloadClientDefinition() + { + Id = 1, + Protocol = DownloadProtocol.Torrent + }; + + var item = new DownloadClientItem() + { + Title = "TV.Series.S01.MULTi.1080p.WEB.H265-RlsGroup", + DownloadId = "35238", + DownloadClientInfo = new DownloadClientItemClientInfo + { + Protocol = client.Protocol, + Id = client.Id, + Name = client.Name + } + }; + + var trackedDownload = Subject.TrackDownload(client, item); + + trackedDownload.Should().NotBeNull(); + trackedDownload.RemoteEpisode.Should().NotBeNull(); + trackedDownload.RemoteEpisode.Release.Should().NotBeNull(); + trackedDownload.RemoteEpisode.Release.Indexer.Should().Be("MyIndexer (Prowlarr)"); + } + [Test] public void should_parse_as_special_when_source_title_parsing_fails() { diff --git a/src/NzbDrone.Core.Test/Indexers/IndexerRepositoryFixture.cs b/src/NzbDrone.Core.Test/Indexers/IndexerRepositoryFixture.cs new file mode 100644 index 000000000..ebc8fb4c8 --- /dev/null +++ b/src/NzbDrone.Core.Test/Indexers/IndexerRepositoryFixture.cs @@ -0,0 +1,44 @@ +using FizzWare.NBuilder; +using FluentAssertions; +using NUnit.Framework; +using NzbDrone.Core.Indexers; +using NzbDrone.Core.Test.Framework; + +namespace NzbDrone.Core.Test.Indexers +{ + [TestFixture] + public class IndexerRepositoryFixture : DbTest + { + private void GivenIndexers() + { + var indexers = Builder.CreateListOfSize(2) + .All() + .With(c => c.Id = 0) + .TheFirst(1) + .With(x => x.Name = "MyIndexer (Prowlarr)") + .TheNext(1) + .With(x => x.Name = "My Second Indexer (Prowlarr)") + .BuildList(); + + Subject.InsertMany(indexers); + } + + [Test] + public void should_finds_with_name() + { + GivenIndexers(); + var found = Subject.FindByName("MyIndexer (Prowlarr)"); + found.Should().NotBeNull(); + found.Name.Should().Be("MyIndexer (Prowlarr)"); + found.Id.Should().Be(1); + } + + [Test] + public void should_not_find_with_incorrect_case_name() + { + GivenIndexers(); + var found = Subject.FindByName("myindexer (prowlarr)"); + found.Should().BeNull(); + } + } +} diff --git a/src/NzbDrone.Core/Download/Aggregation/Aggregators/AggregateLanguages.cs b/src/NzbDrone.Core/Download/Aggregation/Aggregators/AggregateLanguages.cs index 77c9c9170..2baf81907 100644 --- a/src/NzbDrone.Core/Download/Aggregation/Aggregators/AggregateLanguages.cs +++ b/src/NzbDrone.Core/Download/Aggregation/Aggregators/AggregateLanguages.cs @@ -76,9 +76,18 @@ public RemoteEpisode Aggregate(RemoteEpisode remoteEpisode) languages = languages.Except(languagesToRemove).ToList(); } - if ((languages.Count == 0 || (languages.Count == 1 && languages.First() == Language.Unknown)) && releaseInfo is { IndexerId: > 0 } && releaseInfo.Title.IsNotNullOrWhiteSpace()) + if ((languages.Count == 0 || (languages.Count == 1 && languages.First() == Language.Unknown)) && releaseInfo?.Title?.IsNotNullOrWhiteSpace() == true) { - var indexer = _indexerFactory.Get(releaseInfo.IndexerId); + IndexerDefinition indexer = null; + + if (releaseInfo is { IndexerId: > 0 }) + { + indexer = _indexerFactory.Get(releaseInfo.IndexerId); + } + else if (releaseInfo.Indexer?.IsNotNullOrWhiteSpace() == true) + { + indexer = _indexerFactory.FindByName(releaseInfo.Indexer); + } if (indexer?.Settings is IIndexerSettings settings && settings.MultiLanguages.Any() && Parser.Parser.HasMultipleLanguages(releaseInfo.Title)) { diff --git a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs index 608221e70..bf5eda8f5 100644 --- a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs +++ b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs @@ -120,8 +120,6 @@ public TrackedDownload TrackDownload(DownloadClientDefinition downloadClient, Do if (parsedEpisodeInfo != null) { trackedDownload.RemoteEpisode = _parsingService.Map(parsedEpisodeInfo, 0, 0, null); - - _aggregationService.Augment(trackedDownload.RemoteEpisode); } var downloadHistory = _downloadHistoryService.GetLatestDownloadHistoryItem(downloadItem.DownloadId); @@ -158,17 +156,24 @@ public TrackedDownload TrackDownload(DownloadClientDefinition downloadClient, Do } } - if (trackedDownload.RemoteEpisode != null && - Enum.TryParse(grabbedEvent?.Data?.GetValueOrDefault("indexerFlags"), true, out IndexerFlags flags)) + if (trackedDownload.RemoteEpisode != null) { trackedDownload.RemoteEpisode.Release ??= new ReleaseInfo(); - trackedDownload.RemoteEpisode.Release.IndexerFlags = flags; + trackedDownload.RemoteEpisode.Release.Indexer = trackedDownload.Indexer; + trackedDownload.RemoteEpisode.Release.Title = trackedDownload.RemoteEpisode.ParsedEpisodeInfo?.ReleaseTitle; + + if (Enum.TryParse(grabbedEvent?.Data?.GetValueOrDefault("indexerFlags"), true, out IndexerFlags flags)) + { + trackedDownload.RemoteEpisode.Release.IndexerFlags = flags; + } } } - // Calculate custom formats if (trackedDownload.RemoteEpisode != null) { + _aggregationService.Augment(trackedDownload.RemoteEpisode); + + // Calculate custom formats trackedDownload.RemoteEpisode.CustomFormats = _formatCalculator.ParseCustomFormat(trackedDownload.RemoteEpisode, downloadItem.TotalSize); } diff --git a/src/NzbDrone.Core/Indexers/IndexerFactory.cs b/src/NzbDrone.Core/Indexers/IndexerFactory.cs index d26ed6b56..620d36ed2 100644 --- a/src/NzbDrone.Core/Indexers/IndexerFactory.cs +++ b/src/NzbDrone.Core/Indexers/IndexerFactory.cs @@ -13,10 +13,12 @@ public interface IIndexerFactory : IProviderFactory List RssEnabled(bool filterBlockedIndexers = true); List AutomaticSearchEnabled(bool filterBlockedIndexers = true); List InteractiveSearchEnabled(bool filterBlockedIndexers = true); + IndexerDefinition FindByName(string name); } public class IndexerFactory : ProviderFactory, IIndexerFactory { + private readonly IIndexerRepository _indexerRepository; private readonly IIndexerStatusService _indexerStatusService; private readonly Logger _logger; @@ -28,6 +30,7 @@ public IndexerFactory(IIndexerStatusService indexerStatusService, Logger logger) : base(providerRepository, providers, container, eventAggregator, logger) { + _indexerRepository = providerRepository; _indexerStatusService = indexerStatusService; _logger = logger; } @@ -82,6 +85,11 @@ public List InteractiveSearchEnabled(bool filterBlockedIndexers = true return enabledIndexers.ToList(); } + public IndexerDefinition FindByName(string name) + { + return _indexerRepository.FindByName(name); + } + private IEnumerable FilterBlockedIndexers(IEnumerable indexers) { var blockedIndexers = _indexerStatusService.GetBlockedProviders().ToDictionary(v => v.ProviderId, v => v); diff --git a/src/NzbDrone.Core/Indexers/IndexerRepository.cs b/src/NzbDrone.Core/Indexers/IndexerRepository.cs index c4858f415..dac9e0fb2 100644 --- a/src/NzbDrone.Core/Indexers/IndexerRepository.cs +++ b/src/NzbDrone.Core/Indexers/IndexerRepository.cs @@ -1,4 +1,5 @@ -using NzbDrone.Core.Datastore; +using System.Linq; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.ThingiProvider; @@ -6,6 +7,7 @@ namespace NzbDrone.Core.Indexers { public interface IIndexerRepository : IProviderRepository { + IndexerDefinition FindByName(string name); } public class IndexerRepository : ProviderRepository, IIndexerRepository @@ -14,5 +16,10 @@ public IndexerRepository(IMainDatabase database, IEventAggregator eventAggregato : base(database, eventAggregator) { } + + public IndexerDefinition FindByName(string name) + { + return Query(i => i.Name == name).SingleOrDefault(); + } } }