From 1fcbd3c6da5bd061473a3f34a6410c9bbce0fc13 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 5 Jul 2016 02:01:31 -0400
Subject: denormalize seriesid

---
 .../Dto/DtoService.cs                              | 35 ++++++++++++++--------
 1 file changed, 22 insertions(+), 13 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Dto')

diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 257448941a..925afa4286 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -1316,6 +1316,12 @@ namespace MediaBrowser.Server.Implementations.Dto
 
                 dto.SeasonName = episode.SeasonName;
 
+                var seriesId = episode.SeriesId;
+                if (seriesId.HasValue)
+                {
+                    dto.SeriesId = seriesId.Value.ToString("N");
+                }
+
                 Series episodeSeries = null;
 
                 if (fields.Contains(ItemFields.SeriesGenres))
@@ -1327,13 +1333,7 @@ namespace MediaBrowser.Server.Implementations.Dto
                     }
                 }
 
-                episodeSeries = episodeSeries ?? episode.Series;
-                if (episodeSeries != null)
-                {
-                    dto.SeriesId = GetDtoId(episodeSeries);
-                }
-
-                if (options.GetImageLimit(ImageType.Primary) > 0)
+                if (fields.Contains(ItemFields.SeriesPrimaryImage))
                 {
                     episodeSeries = episodeSeries ?? episode.Series;
                     if (episodeSeries != null)
@@ -1369,18 +1369,27 @@ namespace MediaBrowser.Server.Implementations.Dto
             {
                 dto.SeriesName = season.SeriesName;
 
-                series = season.Series;
-
-                if (series != null)
+                var seriesId = season.SeriesId;
+                if (seriesId.HasValue)
                 {
-                    dto.SeriesId = GetDtoId(series);
+                    dto.SeriesId = seriesId.Value.ToString("N");
+                }
+
+                series = null;
 
-                    if (fields.Contains(ItemFields.SeriesStudio))
+                if (fields.Contains(ItemFields.SeriesStudio))
+                {
+                    series = series ?? season.Series;
+                    if (series != null)
                     {
                         dto.SeriesStudio = series.Studios.FirstOrDefault();
                     }
+                }
 
-                    if (options.GetImageLimit(ImageType.Primary) > 0)
+                if (fields.Contains(ItemFields.SeriesPrimaryImage))
+                {
+                    series = series ?? season.Series;
+                    if (series != null)
                     {
                         dto.SeriesPrimaryImageTag = GetImageCacheTag(series, ImageType.Primary);
                     }
-- 
cgit v1.2.3