cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 18:42:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1579 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-03-23 23:52:04 -04:00
commit ea2ec2c854
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Model/Dto/BaseItemDto.cs
View File

@ -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>

6
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@ -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);

4
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -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");