display tv service version info

2 files changed, 25 insertions, 14 deletions

diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
index 1546f8045..2fea919b0 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -66,7 +66,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             if (program != null)
             {
-                dto.ProgramInfo = GetProgramInfoDto(program, channel.ChannelInfo.Name);
+                dto.ProgramInfo = GetProgramInfoDto(program, channel);
 
                 dto.ProgramInfo.TimerId = dto.Id;
                 dto.ProgramInfo.SeriesTimerId = dto.SeriesTimerId;
@@ -260,7 +260,12 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             if (channel != null)
             {
-                dto.ChannelName = channel.ChannelInfo.Name;
+                dto.ChannelName = channel.Name;
+
+                if (!string.IsNullOrEmpty(channel.PrimaryImagePath))
+                {
+                    dto.ChannelPrimaryImageTag = GetImageTag(channel);
+                }
             }
 
             return dto;
@@ -303,13 +308,13 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             if (currentProgram != null)
             {
-                dto.CurrentProgram = GetProgramInfoDto(currentProgram, channelInfo.Name, user);
+                dto.CurrentProgram = GetProgramInfoDto(currentProgram, info, user);
             }
 
             return dto;
         }
 
-        public ProgramInfoDto GetProgramInfoDto(LiveTvProgram item, string channelName, User user = null)
+        public ProgramInfoDto GetProgramInfoDto(LiveTvProgram item, LiveTvChannel channel, User user = null)
         {
             var program = item.ProgramInfo;
 
@@ -331,7 +336,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 CommunityRating = GetClientCommunityRating(program.CommunityRating),
                 IsRepeat = program.IsRepeat,
                 EpisodeTitle = program.EpisodeTitle,
-                ChannelName = channelName,
                 IsMovie = program.IsMovie,
                 IsSeries = program.IsSeries,
                 IsSports = program.IsSports,
@@ -343,6 +347,16 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 Type = "Program"
             };
 
+            if (channel != null)
+            {
+                dto.ChannelName = channel.Name;
+
+                if (!string.IsNullOrEmpty(channel.PrimaryImagePath))
+                {
+                    dto.ChannelPrimaryImageTag = GetImageTag(channel);
+                }
+            }
+
             var imageTag = GetImageTag(item);
 
             if (imageTag.HasValue)
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 2d91222c1..8577e7510 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -409,9 +409,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             var channel = GetChannel(program);
 
-            var channelName = channel == null ? null : channel.ChannelInfo.Name;
-
-            var dto = _tvDtoService.GetProgramInfoDto(program, channelName, user);
+            var dto = _tvDtoService.GetProgramInfoDto(program, channel, user);
 
             await AddRecordingInfo(new[] { dto }, cancellationToken).ConfigureAwait(false);
 
@@ -479,9 +477,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 {
                     var channel = GetChannel(i);
 
-                    var channelName = channel == null ? null : channel.ChannelInfo.Name;
-
-                    return _tvDtoService.GetProgramInfoDto(i, channelName, user);
+                    return _tvDtoService.GetProgramInfoDto(i, channel, user);
                 })
                 .ToArray();
 
@@ -541,9 +537,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 {
                     var channel = GetChannel(i);
 
-                    var channelName = channel == null ? null : channel.ChannelInfo.Name;
-
-                    return _tvDtoService.GetProgramInfoDto(i, channelName, user);
+                    return _tvDtoService.GetProgramInfoDto(i, channel, user);
                 })
                 .ToArray();
 
@@ -1342,6 +1336,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
                 info.Status = statusInfo.Status;
                 info.StatusMessage = statusInfo.StatusMessage;
+                info.Version = statusInfo.Version;
+                info.HasUpdateAvailable = statusInfo.HasUpdateAvailable;
+                info.HomePageUrl = service.HomePageUrl;
             }
             catch (Exception ex)
             {