update live tv styles

7 files changed, 44 insertions, 13 deletions

diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
index 3fec0ee56..2f244b4e3 100644
--- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
@@ -1,11 +1,10 @@
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Runtime.Serialization;
-using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using System;
-using System.Collections.Generic;
 using MediaBrowser.Model.Library;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Runtime.Serialization;
 
 namespace MediaBrowser.Model.LiveTv
 {
@@ -20,7 +19,7 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value>The name.</value>
         public string Name { get; set; }
-
+        
         /// <summary>
         /// Gets or sets the identifier.
         /// </summary>
diff --git a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
index fb931820e..0a2873ef3 100644
--- a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
@@ -10,7 +10,7 @@ using MediaBrowser.Model.Library;
 namespace MediaBrowser.Model.LiveTv
 {
     [DebuggerDisplay("Name = {Name}, StartTime = {StartDate}, EndTime = {EndDate}")]
-    public class ProgramInfoDto : INotifyPropertyChanged
+    public class ProgramInfoDto : INotifyPropertyChanged, IItemDto
     {
         /// <summary>
         /// Id of the program.
@@ -18,6 +18,18 @@ namespace MediaBrowser.Model.LiveTv
         public string Id { get; set; }
 
         /// <summary>
+        /// Gets or sets the primary image aspect ratio.
+        /// </summary>
+        /// <value>The primary image aspect ratio.</value>
+        public double? PrimaryImageAspectRatio { get; set; }
+
+        /// <summary>
+        /// Gets or sets the original primary image aspect ratio.
+        /// </summary>
+        /// <value>The original primary image aspect ratio.</value>
+        public double? OriginalPrimaryImageAspectRatio { get; set; }
+        
+        /// <summary>
         /// Gets or sets the timer identifier.
         /// </summary>
         /// <value>The timer identifier.</value>
diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
index 3705b7a29..58bca06bd 100644
--- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
@@ -10,7 +10,7 @@ using System.Runtime.Serialization;
 namespace MediaBrowser.Model.LiveTv
 {
     [DebuggerDisplay("Name = {Name}, ChannelName = {ChannelName}")]
-    public class RecordingInfoDto : INotifyPropertyChanged
+    public class RecordingInfoDto : INotifyPropertyChanged, IItemDto
     {
         /// <summary>
         /// Id of the recording.
@@ -18,6 +18,18 @@ namespace MediaBrowser.Model.LiveTv
         public string Id { get; set; }
 
         /// <summary>
+        /// Gets or sets the primary image aspect ratio.
+        /// </summary>
+        /// <value>The primary image aspect ratio.</value>
+        public double? PrimaryImageAspectRatio { get; set; }
+
+        /// <summary>
+        /// Gets or sets the original primary image aspect ratio.
+        /// </summary>
+        /// <value>The original primary image aspect ratio.</value>
+        public double? OriginalPrimaryImageAspectRatio { get; set; }
+        
+        /// <summary>
         /// Gets or sets the series timer identifier.
         /// </summary>
         /// <value>The series timer identifier.</value>
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs
index b7af8beeb..05c972a4e 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs
@@ -2,7 +2,6 @@
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Logging;
-using MoreLinq;
 using System;
 using System.Linq;
 using System.Threading;
@@ -77,7 +76,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 double percent = numComplete;
                 percent /= people.Count;
 
-                progress.Report(15 + 85 * percent);
+                progress.Report(100 * percent);
             }
 
             progress.Report(100);
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
index 7bf484689..8d9abc128 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -244,6 +244,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             if (imageTag != null)
             {
                 dto.ImageTags[ImageType.Primary] = imageTag;
+                _dtoService.AttachPrimaryImageAspectRatio(dto, recording);
             }
 
             if (user != null)
@@ -331,6 +332,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             if (imageTag != null)
             {
                 dto.ImageTags[ImageType.Primary] = imageTag;
+
+                _dtoService.AttachPrimaryImageAspectRatio(dto, info);
             }
 
             if (currentProgram != null)
@@ -392,6 +395,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             if (imageTag != null)
             {
                 dto.ImageTags[ImageType.Primary] = imageTag;
+                _dtoService.AttachPrimaryImageAspectRatio(dto, item);
             }
 
             if (user != null)
diff --git a/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs b/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
index e64121c45..f1d4c3555 100644
--- a/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
+++ b/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
@@ -79,9 +79,12 @@ namespace MediaBrowser.Server.Implementations.Session
 
         private void ResetPingTimer()
         {
-            var period = TimeSpan.FromSeconds(60);
+            if (_pingTimer != null)
+            {
+                var period = TimeSpan.FromSeconds(60);
 
-            _pingTimer.Change(period, period);
+                _pingTimer.Change(period, period);
+            }
         }
 
         private Task SendMessage(string name, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 0ee9e6213..ee09395da 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -165,6 +165,8 @@ namespace MediaBrowser.Server.Implementations.Session
 
             if (disposable != null)
             {
+                _logger.Debug("Disposing session controller {0}", disposable.GetType().Name);
+
                 try
                 {
                     disposable.Dispose();