mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Size on disk calculation including multi-episode files multiple times 

Closes #5296
This commit is contained in:
Mark McDowall 2022-12-14 00:24:02 -08:00
parent 9a96dee49d
commit be98862ce0
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/NzbDrone.Core.Test/SeriesStatsTests/SeriesStatisticsFixture.cs
View File

@ -4,6 +4,7 @@ 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;
@ -180,5 +181,25 @@ 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);
}
}
}

2
src/NzbDrone.Core/SeriesStats/SeriesStatisticsRepository.cs
View File

@ -55,7 +55,7 @@ namespace NzbDrone.Core.SeriesStats
return new SqlBuilder()
.Select(@"Episodes.SeriesId AS SeriesId,
Episodes.SeasonNumber,
SUM(COALESCE(EpisodeFiles.Size, 0)) AS SizeOnDisk,
SUM(COALESCE(EpisodeFiles.Size, 0)) * COUNT(DISTINCT EpisodeFiles.Id) / COUNT(EpisodeFiles.Id) 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,