From f15f08e51abc76d2cb1ae767e4d97844fd1ee70a Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 14 Dec 2022 08:01:56 -0800 Subject: [PATCH] Revert "Fixed: Size on disk calculation including multi-episode files multiple times" This reverts commit be98862ce0c92e392394c6ac40a3caaf3811e537. --- .../SeriesStatisticsFixture.cs | 21 ------------------- .../SeriesStats/SeriesStatisticsRepository.cs | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/NzbDrone.Core.Test/SeriesStatsTests/SeriesStatisticsFixture.cs b/src/NzbDrone.Core.Test/SeriesStatsTests/SeriesStatisticsFixture.cs index 254b4e987..980107237 100644 --- a/src/NzbDrone.Core.Test/SeriesStatsTests/SeriesStatisticsFixture.cs +++ b/src/NzbDrone.Core.Test/SeriesStatsTests/SeriesStatisticsFixture.cs @@ -4,7 +4,6 @@ using System.Linq; using FizzWare.NBuilder; using FluentAssertions; using NUnit.Framework; -using NzbDrone.Common.Extensions; using NzbDrone.Core.Languages; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Qualities; @@ -181,25 +180,5 @@ namespace NzbDrone.Core.Test.SeriesStatsTests stats.Should().HaveCount(1); stats.First().SizeOnDisk.Should().Be(_episodeFile.Size); } - - [Test] - public void should_not_duplicate_size_for_multi_episode_files() - { - GivenEpisodeWithFile(); - GivenEpisode(); - GivenEpisodeFile(); - - var episode2 = _episode.JsonClone(); - - episode2.Id = 0; - episode2.EpisodeNumber += 1; - - Db.Insert(episode2); - - var stats = Subject.SeriesStatistics(); - - stats.Should().HaveCount(1); - stats.First().SizeOnDisk.Should().Be(_episodeFile.Size); - } } } diff --git a/src/NzbDrone.Core/SeriesStats/SeriesStatisticsRepository.cs b/src/NzbDrone.Core/SeriesStats/SeriesStatisticsRepository.cs index f2b5775df..f267f369f 100644 --- a/src/NzbDrone.Core/SeriesStats/SeriesStatisticsRepository.cs +++ b/src/NzbDrone.Core/SeriesStats/SeriesStatisticsRepository.cs @@ -55,7 +55,7 @@ namespace NzbDrone.Core.SeriesStats return new SqlBuilder() .Select(@"Episodes.SeriesId AS SeriesId, Episodes.SeasonNumber, - SUM(COALESCE(EpisodeFiles.Size, 0)) * COUNT(DISTINCT EpisodeFiles.Id) / COUNT(EpisodeFiles.Id) AS SizeOnDisk, + SUM(COALESCE(EpisodeFiles.Size, 0)) AS SizeOnDisk, GROUP_CONCAT(EpisodeFiles.ReleaseGroup, '|') AS ReleaseGroupsString, COUNT(*) AS TotalEpisodeCount, SUM(CASE WHEN AirdateUtc <= @currentDate OR EpisodeFileId > 0 THEN 1 ELSE 0 END) AS AvailableEpisodeCount,