Merge pull request #1579 from MediaBrowser/dev

Dev

MediaBrowser.Model/Dto/BaseItemDto.cs

@@ -290,6 +290,12 @@ namespace MediaBrowser.Model.Dto
         /// <value><c>null</c> if [is place holder] contains no value, <c>true</c> if [is place holder]; otherwise, <c>false</c>.</value>
         public bool? IsPlaceHolder { get; set; }
 
+        /// <summary>
+        /// Gets or sets the number.
+        /// </summary>
+        /// <value>The number.</value>
+        public string Number { get; set; }
+        
         /// <summary>
         /// Gets or sets the index number.
         /// </summary>

MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs

@@ -314,6 +314,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
                     {
 
                     }
+                    catch (Exception ex)
+                    {
+                        _logger.ErrorException("Error deleting recording file {0}", ex, remove.Path);
+                    }
                 }
                 _recordingProvider.Delete(remove);
             }
@@ -525,7 +529,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
                 }
 
                 _logger.Debug("Getting programs for channel {0}-{1} from {2}-{3}", channel.Number, channel.Name, provider.Item1.Name, provider.Item2.ListingsId ?? string.Empty);
-                
+
                 var programs = await provider.Item1.GetProgramsAsync(provider.Item2, channel.Number, channel.Name, startDateUtc, endDateUtc, cancellationToken)
                         .ConfigureAwait(false);
 

MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs

@@ -1845,6 +1845,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 var dto = tuple.Item1;
                 var channel = tuple.Item2;
 
+                dto.Number = channel.Number;
+                dto.ChannelType = channel.ChannelType;
+                dto.ServiceName = GetService(channel).Name;
+
                 dto.MediaSources = channel.GetMediaSources(true).ToList();
 
                 var channelIdString = channel.Id.ToString("N");