diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-02 16:46:22 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-02 16:46:22 -0500 |
| commit | 245e92c9cc6f97e139e04548c94184c65712d3f0 (patch) | |
| tree | cd957fa794a8e69871d25ea00748c1445ef58d76 /MediaBrowser.Server.Implementations/LiveTv | |
| parent | cd279d98e0574c396c0a35984e46658151e54fc0 (diff) | |
updated nuget
Diffstat (limited to 'MediaBrowser.Server.Implementations/LiveTv')
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs | 25 |
2 files changed, 9 insertions, 18 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs index e1a918fd2e..322948bade 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs @@ -75,7 +75,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv // Dummy up the original url var url = channel.ServiceName + channel.ChannelId; - await _providerManager.SaveImage(channel, response.Content, response.ContentType, ImageType.Primary, null, url, cancellationToken).ConfigureAwait(false); + await _providerManager.SaveImage(channel, response.Stream, response.MimeType, ImageType.Primary, null, url, cancellationToken).ConfigureAwait(false); } } diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs index 261c915cb2..704d1ea59c 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs @@ -209,7 +209,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv OriginalAirDate = program.OriginalAirDate, Audio = program.Audio, CommunityRating = program.CommunityRating, - AspectRatio = program.AspectRatio + AspectRatio = program.AspectRatio, + IsRepeat = program.IsRepeat, + EpisodeTitle = program.EpisodeTitle }; } @@ -297,21 +299,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv var returnArray = programs.ToArray(); - var recordings = await GetRecordings(new RecordingQuery - { - - - }, cancellationToken).ConfigureAwait(false); - - foreach (var program in returnArray) - { - var recording = recordings.Items - .FirstOrDefault(i => string.Equals(i.ProgramId, program.Id)); - - program.RecordingId = recording == null ? null : recording.Id; - program.RecordingStatus = recording == null ? (RecordingStatus?)null : recording.Status; - } - return new QueryResult<ProgramInfoDto> { Items = returnArray, @@ -400,7 +387,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv Id = id, ExternalId = info.Id, ChannelId = GetInternalChannelId(service.Name, info.ChannelId, info.ChannelName).ToString("N"), - Status = info.Status + Status = info.Status, + Path = info.Path, + Genres = info.Genres, + IsRepeat = info.IsRepeat, + EpisodeTitle = info.EpisodeTitle }; if (!string.IsNullOrEmpty(info.ProgramId)) |
