fix double path concatenation

3 files changed, 71 insertions, 0 deletions

diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index fea49880e..5f4a6a52f 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -868,6 +868,19 @@ namespace MediaBrowser.Server.Implementations.Dto
                 }
             }
 
+            // If there is no thumb, indicate what parent has one in case the Ui wants to allow inheritance
+            if (!dto.HasThumb)
+            {
+                var parentWithImage = GetParentImageItem(item, ImageType.Thumb, owner);
+
+                if (parentWithImage != null)
+                {
+                    dto.ParentThumbItemId = GetDtoId(parentWithImage);
+
+                    dto.ParentThumbImageTag = GetImageCacheTag(parentWithImage, ImageType.Thumb, parentWithImage.GetImage(ImageType.Thumb));
+                }
+            }
+
             if (fields.Contains(ItemFields.Path))
             {
                 dto.Path = item.Path;
@@ -1022,6 +1035,13 @@ namespace MediaBrowser.Server.Implementations.Dto
 
                 dto.SeriesId = GetDtoId(series);
                 dto.SeriesName = series.Name;
+                dto.AirTime = series.AirTime;
+                dto.SeriesStudio = series.Studios.FirstOrDefault();
+
+                if (series.HasImage(ImageType.Thumb))
+                {
+                    dto.SeriesThumbImageTag = GetImageCacheTag(series, ImageType.Thumb, series.GetImage(ImageType.Thumb));
+                }
             }
 
             // Add SeasonInfo
@@ -1033,6 +1053,8 @@ namespace MediaBrowser.Server.Implementations.Dto
 
                 dto.SeriesId = GetDtoId(series);
                 dto.SeriesName = series.Name;
+                dto.AirTime = series.AirTime;
+                dto.SeriesStudio = series.Studios.FirstOrDefault();
             }
 
             var game = item as Game;
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 385712700..05c5f5a82 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -186,6 +186,7 @@
     </Compile>
     <Compile Include="Session\SessionWebSocketListener.cs" />
     <Compile Include="Session\WebSocketController.cs" />
+    <Compile Include="Sorting\AirTimeComparer.cs" />
     <Compile Include="Sorting\AlbumArtistComparer.cs" />
     <Compile Include="Sorting\AlbumComparer.cs" />
     <Compile Include="Sorting\AlbumCountComparer.cs" />
diff --git a/MediaBrowser.Server.Implementations/Sorting/AirTimeComparer.cs b/MediaBrowser.Server.Implementations/Sorting/AirTimeComparer.cs
new file mode 100644
index 000000000..46c3df07b
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Sorting/AirTimeComparer.cs
@@ -0,0 +1,48 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Sorting;
+using MediaBrowser.Model.Querying;
+using System;
+
+namespace MediaBrowser.Server.Implementations.Sorting
+{
+    public class AirTimeComparer : IBaseItemComparer
+    {
+        /// <summary>
+        /// Compares the specified x.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <param name="y">The y.</param>
+        /// <returns>System.Int32.</returns>
+        public int Compare(BaseItem x, BaseItem y)
+        {
+            return DateTime.Compare(GetValue(x), GetValue(y));
+        }
+
+        /// <summary>
+        /// Gets the value.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns>System.String.</returns>
+        private DateTime GetValue(BaseItem x)
+        {
+            var series = (x as Series) ?? x.FindParent<Series>();
+
+            DateTime result;
+            if (series != null && DateTime.TryParse(series.AirTime, out result))
+            {
+                return result;
+            } 
+            return DateTime.MinValue;
+        }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get { return ItemSortBy.AirTime; }
+        }
+    }
+}