mirror of https://github.com/Sonarr/Sonarr
Less shitty way to do series stats for single requests and fixed tests
This commit is contained in:
parent
c3b8b52644
commit
40f49d7385
|
@ -75,7 +75,7 @@ namespace NzbDrone.Api.Series
|
||||||
|
|
||||||
var resource = series.InjectTo<SeriesResource>();
|
var resource = series.InjectTo<SeriesResource>();
|
||||||
MapCoversToLocal(resource);
|
MapCoversToLocal(resource);
|
||||||
LinkSeriesStatistics(resource, _seriesStatisticsService.SeriesStatistics());
|
FetchAndLinkSeriesStatistics(resource);
|
||||||
|
|
||||||
return resource;
|
return resource;
|
||||||
}
|
}
|
||||||
|
@ -85,12 +85,8 @@ namespace NzbDrone.Api.Series
|
||||||
var seriesStats = _seriesStatisticsService.SeriesStatistics();
|
var seriesStats = _seriesStatisticsService.SeriesStatistics();
|
||||||
var seriesResources = ToListResource(_seriesService.GetAllSeries);
|
var seriesResources = ToListResource(_seriesService.GetAllSeries);
|
||||||
|
|
||||||
foreach (var resource in seriesResources)
|
|
||||||
{
|
|
||||||
LinkSeriesStatistics(resource, seriesStats);
|
|
||||||
}
|
|
||||||
|
|
||||||
MapCoversToLocal(seriesResources.ToArray());
|
MapCoversToLocal(seriesResources.ToArray());
|
||||||
|
LinkSeriesStatistics(seriesResources, seriesStats);
|
||||||
|
|
||||||
return seriesResources;
|
return seriesResources;
|
||||||
}
|
}
|
||||||
|
@ -104,7 +100,7 @@ namespace NzbDrone.Api.Series
|
||||||
{
|
{
|
||||||
var resource = ToResource<Core.Tv.Series>(_seriesService.UpdateSeries, seriesResource);
|
var resource = ToResource<Core.Tv.Series>(_seriesService.UpdateSeries, seriesResource);
|
||||||
MapCoversToLocal(resource);
|
MapCoversToLocal(resource);
|
||||||
LinkSeriesStatistics(resource, _seriesStatisticsService.SeriesStatistics());
|
FetchAndLinkSeriesStatistics(resource);
|
||||||
|
|
||||||
return resource;
|
return resource;
|
||||||
}
|
}
|
||||||
|
@ -123,14 +119,28 @@ namespace NzbDrone.Api.Series
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void LinkSeriesStatistics(SeriesResource resource, List<SeriesStatistics> seriesStatistics)
|
private void FetchAndLinkSeriesStatistics(SeriesResource resource)
|
||||||
{
|
{
|
||||||
var stats = seriesStatistics.Single(ss => ss.SeriesId == resource.Id);
|
LinkSeriesStatistics(resource, _seriesStatisticsService.SeriesStatistics(resource.Id));
|
||||||
|
}
|
||||||
|
|
||||||
resource.EpisodeCount = stats.EpisodeCount;
|
private void LinkSeriesStatistics(List<SeriesResource> resources, List<SeriesStatistics> seriesStatistics)
|
||||||
resource.EpisodeFileCount = stats.EpisodeFileCount;
|
{
|
||||||
resource.SeasonCount = stats.SeasonCount;
|
foreach (var series in resources)
|
||||||
resource.NextAiring = stats.NextAiring;
|
{
|
||||||
|
var stats = seriesStatistics.SingleOrDefault(ss => ss.SeriesId == series.Id);
|
||||||
|
if (stats == null) continue;
|
||||||
|
|
||||||
|
LinkSeriesStatistics(series, stats);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void LinkSeriesStatistics(SeriesResource resource, SeriesStatistics seriesStatistics)
|
||||||
|
{
|
||||||
|
resource.EpisodeCount = seriesStatistics.EpisodeCount;
|
||||||
|
resource.EpisodeFileCount = seriesStatistics.EpisodeFileCount;
|
||||||
|
resource.SeasonCount = seriesStatistics.SeasonCount;
|
||||||
|
resource.NextAiring = seriesStatistics.NextAiring;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
using NzbDrone.Core.Datastore;
|
using NzbDrone.Core.Datastore;
|
||||||
|
|
||||||
namespace NzbDrone.Core.SeriesStats
|
namespace NzbDrone.Core.SeriesStats
|
||||||
|
@ -7,6 +8,7 @@ namespace NzbDrone.Core.SeriesStats
|
||||||
public interface ISeriesStatisticsRepository
|
public interface ISeriesStatisticsRepository
|
||||||
{
|
{
|
||||||
List<SeriesStatistics> SeriesStatistics();
|
List<SeriesStatistics> SeriesStatistics();
|
||||||
|
SeriesStatistics SeriesStatistics(int seriesId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public class SeriesStatisticsRepository : ISeriesStatisticsRepository
|
public class SeriesStatisticsRepository : ISeriesStatisticsRepository
|
||||||
|
@ -24,16 +26,44 @@ namespace NzbDrone.Core.SeriesStats
|
||||||
|
|
||||||
mapper.AddParameter("currentDate", DateTime.UtcNow);
|
mapper.AddParameter("currentDate", DateTime.UtcNow);
|
||||||
|
|
||||||
const string queryText = @"SELECT
|
var sb = new StringBuilder();
|
||||||
SeriesId,
|
sb.AppendLine(GetSelectClause());
|
||||||
SUM(CASE WHEN Monitored = 1 AND Airdate <= @currentDate THEN 1 ELSE 0 END) AS EpisodeCount,
|
sb.AppendLine(GetGroupByClause());
|
||||||
SUM(CASE WHEN Monitored = 1 AND Episodes.EpisodeFileId > 0 AND AirDate <= @currentDate THEN 1 ELSE 0 END) as EpisodeFileCount,
|
var queryText = sb.ToString();
|
||||||
MAX(Episodes.SeasonNumber) as SeasonCount,
|
|
||||||
MIN(CASE WHEN AirDate < @currentDate THEN NULL ELSE AirDate END) as NextAiringString
|
|
||||||
FROM Episodes
|
|
||||||
GROUP BY SeriesId";
|
|
||||||
|
|
||||||
return mapper.Query<SeriesStatistics>(queryText);
|
return mapper.Query<SeriesStatistics>(queryText);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public SeriesStatistics SeriesStatistics(int seriesId)
|
||||||
|
{
|
||||||
|
var mapper = _database.GetDataMapper();
|
||||||
|
|
||||||
|
mapper.AddParameter("currentDate", DateTime.UtcNow);
|
||||||
|
mapper.AddParameter("seriesId", seriesId);
|
||||||
|
|
||||||
|
var sb = new StringBuilder();
|
||||||
|
sb.AppendLine(GetSelectClause());
|
||||||
|
sb.AppendLine("WHERE SeriesId = @seriesId");
|
||||||
|
sb.AppendLine(GetGroupByClause());
|
||||||
|
var queryText = sb.ToString();
|
||||||
|
|
||||||
|
return mapper.Find<SeriesStatistics>(queryText);
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GetSelectClause()
|
||||||
|
{
|
||||||
|
return @"SELECT
|
||||||
|
SeriesId,
|
||||||
|
SUM(CASE WHEN Monitored = 1 AND Airdate <= @currentDate THEN 1 ELSE 0 END) AS EpisodeCount,
|
||||||
|
SUM(CASE WHEN Monitored = 1 AND Episodes.EpisodeFileId > 0 AND AirDate <= @currentDate THEN 1 ELSE 0 END) AS EpisodeFileCount,
|
||||||
|
MAX(Episodes.SeasonNumber) as SeasonCount,
|
||||||
|
MIN(CASE WHEN AirDate < @currentDate THEN NULL ELSE AirDate END) AS NextAiringString
|
||||||
|
FROM Episodes";
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GetGroupByClause()
|
||||||
|
{
|
||||||
|
return "GROUP BY SeriesId";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ namespace NzbDrone.Core.SeriesStats
|
||||||
public interface ISeriesStatisticsService
|
public interface ISeriesStatisticsService
|
||||||
{
|
{
|
||||||
List<SeriesStatistics> SeriesStatistics();
|
List<SeriesStatistics> SeriesStatistics();
|
||||||
|
SeriesStatistics SeriesStatistics(int seriesId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public class SeriesStatisticsService : ISeriesStatisticsService
|
public class SeriesStatisticsService : ISeriesStatisticsService
|
||||||
|
@ -21,5 +22,14 @@ namespace NzbDrone.Core.SeriesStats
|
||||||
{
|
{
|
||||||
return _seriesStatisticsRepository.SeriesStatistics();
|
return _seriesStatisticsRepository.SeriesStatistics();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public SeriesStatistics SeriesStatistics(int seriesId)
|
||||||
|
{
|
||||||
|
var stats = _seriesStatisticsRepository.SeriesStatistics(seriesId);
|
||||||
|
|
||||||
|
if (stats == null) return new SeriesStatistics();
|
||||||
|
|
||||||
|
return stats;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue