From bf5c37a08e641a648467bf31e08f61d32910e229 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Mon, 8 Jan 2024 17:57:01 +0200 Subject: [PATCH] Remove unused LanguagesBelowCutoff --- .../EpisodesWhereCutoffUnmetFixture.cs | 14 ++++---------- .../Languages/LanguagesBelowCutoff.cs | 16 ---------------- src/NzbDrone.Core/Tv/EpisodeCutoffService.cs | 7 ++----- src/NzbDrone.Core/Tv/EpisodeRepository.cs | 11 +++++------ 4 files changed, 11 insertions(+), 37 deletions(-) delete mode 100644 src/NzbDrone.Core/Languages/LanguagesBelowCutoff.cs diff --git a/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesWhereCutoffUnmetFixture.cs b/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesWhereCutoffUnmetFixture.cs index fe05ea3bc..ac31f4e55 100644 --- a/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesWhereCutoffUnmetFixture.cs +++ b/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesWhereCutoffUnmetFixture.cs @@ -21,7 +21,6 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests private Series _unmonitoredSeries; private PagingSpec _pagingSpec; private List _qualitiesBelowCutoff; - private List _languagesBelowCutoff; private List _unairedEpisodes; [SetUp] @@ -71,11 +70,6 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests new QualitiesBelowCutoff(profile.Id, new[] { Quality.SDTV.Id }) }; - _languagesBelowCutoff = new List - { - new LanguagesBelowCutoff(profile.Id, new[] { Language.English.Id }) - }; - var qualityMetLanguageUnmet = new EpisodeFile { RelativePath = "a", Quality = new QualityModel { Quality = Quality.WEBDL480p }, Languages = new List { Language.English } }; var qualityMetLanguageMet = new EpisodeFile { RelativePath = "b", Quality = new QualityModel { Quality = Quality.WEBDL480p }, Languages = new List { Language.Spanish } }; var qualityMetLanguageExceed = new EpisodeFile { RelativePath = "c", Quality = new QualityModel { Quality = Quality.WEBDL480p }, Languages = new List { Language.French } }; @@ -157,7 +151,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests { GivenMonitoredFilterExpression(); - var spec = Subject.EpisodesWhereCutoffUnmet(_pagingSpec, _qualitiesBelowCutoff, _languagesBelowCutoff, false); + var spec = Subject.EpisodesWhereCutoffUnmet(_pagingSpec, _qualitiesBelowCutoff, false); spec.Records.Should().HaveCount(1); spec.Records.Should().OnlyContain(e => e.EpisodeFile.Value.Quality.Quality == Quality.SDTV); @@ -168,7 +162,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests { GivenMonitoredFilterExpression(); - var spec = Subject.EpisodesWhereCutoffUnmet(_pagingSpec, _qualitiesBelowCutoff, _languagesBelowCutoff, false); + var spec = Subject.EpisodesWhereCutoffUnmet(_pagingSpec, _qualitiesBelowCutoff, false); spec.Records.Should().HaveCount(1); spec.Records.Should().OnlyContain(e => e.Monitored); @@ -179,7 +173,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests { GivenMonitoredFilterExpression(); - var spec = Subject.EpisodesWhereCutoffUnmet(_pagingSpec, _qualitiesBelowCutoff, _languagesBelowCutoff, false); + var spec = Subject.EpisodesWhereCutoffUnmet(_pagingSpec, _qualitiesBelowCutoff, false); spec.Records.Should().HaveCount(1); spec.Records.Should().OnlyContain(e => e.Series.Monitored); @@ -192,7 +186,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests GivenMonitoredFilterExpression(); - var spec = Subject.EpisodesWhereCutoffUnmet(_pagingSpec, _qualitiesBelowCutoff, _languagesBelowCutoff, false); + var spec = Subject.EpisodesWhereCutoffUnmet(_pagingSpec, _qualitiesBelowCutoff, false); spec.Records.Should().HaveCount(2); spec.Records.Should().OnlyContain(e => e.Series.Monitored); diff --git a/src/NzbDrone.Core/Languages/LanguagesBelowCutoff.cs b/src/NzbDrone.Core/Languages/LanguagesBelowCutoff.cs deleted file mode 100644 index e320833de..000000000 --- a/src/NzbDrone.Core/Languages/LanguagesBelowCutoff.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections.Generic; - -namespace NzbDrone.Core.Languages -{ - public class LanguagesBelowCutoff - { - public int ProfileId { get; set; } - public IEnumerable LanguageIds { get; set; } - - public LanguagesBelowCutoff(int profileId, IEnumerable languageIds) - { - ProfileId = profileId; - LanguageIds = languageIds; - } - } -} diff --git a/src/NzbDrone.Core/Tv/EpisodeCutoffService.cs b/src/NzbDrone.Core/Tv/EpisodeCutoffService.cs index ec386230e..36297f760 100644 --- a/src/NzbDrone.Core/Tv/EpisodeCutoffService.cs +++ b/src/NzbDrone.Core/Tv/EpisodeCutoffService.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; using System.Linq; -using NLog; using NzbDrone.Common.Extensions; using NzbDrone.Core.Datastore; -using NzbDrone.Core.Languages; using NzbDrone.Core.Profiles.Qualities; using NzbDrone.Core.Qualities; @@ -19,7 +17,7 @@ namespace NzbDrone.Core.Tv private readonly IEpisodeRepository _episodeRepository; private readonly IQualityProfileService _qualityProfileService; - public EpisodeCutoffService(IEpisodeRepository episodeRepository, IQualityProfileService qualityProfileService, Logger logger) + public EpisodeCutoffService(IEpisodeRepository episodeRepository, IQualityProfileService qualityProfileService) { _episodeRepository = episodeRepository; _qualityProfileService = qualityProfileService; @@ -28,7 +26,6 @@ namespace NzbDrone.Core.Tv public PagingSpec EpisodesWhereCutoffUnmet(PagingSpec pagingSpec) { var qualitiesBelowCutoff = new List(); - var languagesBelowCutoff = new List(); var profiles = _qualityProfileService.All(); // Get all items less than the cutoff @@ -51,7 +48,7 @@ namespace NzbDrone.Core.Tv return pagingSpec; } - return _episodeRepository.EpisodesWhereCutoffUnmet(pagingSpec, qualitiesBelowCutoff, languagesBelowCutoff, false); + return _episodeRepository.EpisodesWhereCutoffUnmet(pagingSpec, qualitiesBelowCutoff, false); } } } diff --git a/src/NzbDrone.Core/Tv/EpisodeRepository.cs b/src/NzbDrone.Core/Tv/EpisodeRepository.cs index 13755d1ca..c8ef2d0d8 100644 --- a/src/NzbDrone.Core/Tv/EpisodeRepository.cs +++ b/src/NzbDrone.Core/Tv/EpisodeRepository.cs @@ -4,7 +4,6 @@ using System.Linq; using Dapper; using NLog; using NzbDrone.Core.Datastore; -using NzbDrone.Core.Languages; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Qualities; @@ -23,7 +22,7 @@ namespace NzbDrone.Core.Tv List GetEpisodeByFileId(int fileId); List EpisodesWithFiles(int seriesId); PagingSpec EpisodesWithoutFiles(PagingSpec pagingSpec, bool includeSpecials); - PagingSpec EpisodesWhereCutoffUnmet(PagingSpec pagingSpec, List qualitiesBelowCutoff, List languagesBelowCutoff, bool includeSpecials); + PagingSpec EpisodesWhereCutoffUnmet(PagingSpec pagingSpec, List qualitiesBelowCutoff, bool includeSpecials); List FindEpisodesBySceneNumbering(int seriesId, int seasonNumber, int episodeNumber); List FindEpisodesBySceneNumbering(int seriesId, int sceneAbsoluteEpisodeNumber); List EpisodesBetweenDates(DateTime startDate, DateTime endDate, bool includeUnmonitored); @@ -124,7 +123,7 @@ namespace NzbDrone.Core.Tv return pagingSpec; } - public PagingSpec EpisodesWhereCutoffUnmet(PagingSpec pagingSpec, List qualitiesBelowCutoff, List languagesBelowCutoff, bool includeSpecials) + public PagingSpec EpisodesWhereCutoffUnmet(PagingSpec pagingSpec, List qualitiesBelowCutoff, bool includeSpecials) { var startingSeasonNumber = 1; @@ -133,10 +132,10 @@ namespace NzbDrone.Core.Tv startingSeasonNumber = 0; } - pagingSpec.Records = GetPagedRecords(EpisodesWhereCutoffUnmetBuilder(qualitiesBelowCutoff, languagesBelowCutoff, startingSeasonNumber), pagingSpec, PagedQuery); + pagingSpec.Records = GetPagedRecords(EpisodesWhereCutoffUnmetBuilder(qualitiesBelowCutoff, startingSeasonNumber), pagingSpec, PagedQuery); var countTemplate = $"SELECT COUNT(*) FROM (SELECT /**select**/ FROM \"{TableMapping.Mapper.TableNameMapping(typeof(Episode))}\" /**join**/ /**innerjoin**/ /**leftjoin**/ /**where**/ /**groupby**/ /**having**/) AS \"Inner\""; - pagingSpec.TotalRecords = GetPagedRecordCount(EpisodesWhereCutoffUnmetBuilder(qualitiesBelowCutoff, languagesBelowCutoff, startingSeasonNumber).Select(typeof(Episode)), pagingSpec, countTemplate); + pagingSpec.TotalRecords = GetPagedRecordCount(EpisodesWhereCutoffUnmetBuilder(qualitiesBelowCutoff, startingSeasonNumber).Select(typeof(Episode)), pagingSpec, countTemplate); return pagingSpec; } @@ -225,7 +224,7 @@ namespace NzbDrone.Core.Tv currentTime.ToString("yyyy-MM-dd HH:mm:ss")); } - private SqlBuilder EpisodesWhereCutoffUnmetBuilder(List qualitiesBelowCutoff, List languagesBelowCutoff, int startingSeasonNumber) => Builder() + private SqlBuilder EpisodesWhereCutoffUnmetBuilder(List qualitiesBelowCutoff, int startingSeasonNumber) => Builder() .Join((e, s) => e.SeriesId == s.Id) .LeftJoin((e, ef) => e.EpisodeFileId == ef.Id) .Where(e => e.EpisodeFileId != 0)