diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-08-04 10:26:36 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-08-04 10:26:36 -0400 |
| commit | 30710dbe007b60d696cdf28e4bf97a428432124b (patch) | |
| tree | e9201ea9e7fb5502aead14f59d78c3a56ad91850 /MediaBrowser.Server.Implementations | |
| parent | 036301795e3847e4f80697b22827e6dec65d031b (diff) | |
update components
Diffstat (limited to 'MediaBrowser.Server.Implementations')
3 files changed, 15 insertions, 14 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index 9ca2537f1..b96e3b26c 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -490,13 +490,13 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV if (recording == null) { - recording = new RecordingInfo() + recording = new RecordingInfo { ChannelId = info.ChannelId, Id = Guid.NewGuid().ToString("N"), StartDate = info.StartDate, EndDate = info.EndDate, - Genres = info.Genres ?? null, + Genres = info.Genres, IsKids = info.IsKids, IsLive = info.IsLive, IsMovie = info.IsMovie, @@ -507,10 +507,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV IsSports = info.IsSports, IsRepeat = !info.IsPremiere, Name = info.Name, - EpisodeTitle = info.EpisodeTitle ?? "", + EpisodeTitle = info.EpisodeTitle, ProgramId = info.Id, - HasImage = info.HasImage ?? false, - ImagePath = info.ImagePath ?? null, + HasImage = info.HasImage, + ImagePath = info.ImagePath, ImageUrl = info.ImageUrl, OriginalAirDate = info.OriginalAirDate, Status = RecordingStatus.Scheduled, diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs index 655feedae..2aadf4a66 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs @@ -286,20 +286,20 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings } } ScheduleDirect.Gracenote gracenote; - string EpisodeTitle = ""; + string episodeTitle = null; if (details.metadata != null) { gracenote = details.metadata.Find(x => x.Gracenote != null).Gracenote; if ((details.showType ?? "No ShowType") == "Series") { - EpisodeTitle = "Season: " + gracenote.season + " Episode: " + gracenote.episode; + episodeTitle = "Season: " + gracenote.season + " Episode: " + gracenote.episode; } } if (details.episodeTitle150 != null) { - EpisodeTitle = EpisodeTitle + " " + details.episodeTitle150; + episodeTitle = ((episodeTitle ?? string.Empty) + " " + details.episodeTitle150).Trim(); } - bool hasImage = false; + var imageLink = ""; if (details.hasImageArtwork) @@ -314,11 +314,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings Overview = desc, StartDate = startAt, EndDate = endAt, - Genres = new List<string>() { "N/A" }, Name = details.titles[0].title120 ?? "Unkown", OfficialRating = "0", CommunityRating = null, - EpisodeTitle = EpisodeTitle, + EpisodeTitle = episodeTitle, Audio = audioType, IsHD = hdtv, IsRepeat = repeat, @@ -339,8 +338,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings (details.showType ?? "No ShowType") == "Short Film", IsPremiere = false, }; - //logger.Info("Done init"); - if (null != details.originalAirDate) + + if (!string.IsNullOrWhiteSpace(details.originalAirDate)) { info.OriginalAirDate = DateTime.Parse(details.originalAirDate); } diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs index b4669f53e..6861901ac 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs @@ -774,6 +774,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv ChannelIds = query.ChannelIds, IsMovie = query.IsMovie, IsSports = query.IsSports, + IsKids = query.IsKids, Genres = query.Genres }; @@ -844,7 +845,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv IncludeItemTypes = new[] { typeof(LiveTvProgram).Name }, IsAiring = query.IsAiring, IsMovie = query.IsMovie, - IsSports = query.IsSports + IsSports = query.IsSports, + IsKids = query.IsKids }; if (query.HasAired.HasValue) |
