diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-03 17:55:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 17:55:03 -0400 |
| commit | 229be75961cc9d94698c37c7f95eb52cd6d5cc28 (patch) | |
| tree | 68d9736ec05239deffcdcbbe5d147b0d96137957 /MediaBrowser.Api/SearchService.cs | |
| parent | 0a9a5480c8121ee2edf8733a1bd03d31d443de7c (diff) | |
| parent | 568d769cc80644e27c15d5b842eb8bc7393016b5 (diff) | |
Merge pull request #2611 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Api/SearchService.cs')
| -rw-r--r-- | MediaBrowser.Api/SearchService.cs | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/MediaBrowser.Api/SearchService.cs b/MediaBrowser.Api/SearchService.cs index b4ee92365..5c0f918d9 100644 --- a/MediaBrowser.Api/SearchService.cs +++ b/MediaBrowser.Api/SearchService.cs @@ -9,6 +9,7 @@ using MediaBrowser.Model.Entities; using MediaBrowser.Model.Search; using System.Linq; using System.Threading.Tasks; +using MediaBrowser.Controller.LiveTv; using MediaBrowser.Model.Services; namespace MediaBrowser.Api @@ -170,11 +171,11 @@ namespace MediaBrowser.Api MatchedTerm = hintInfo.MatchedTerm, DisplayMediaType = item.DisplayMediaType, RunTimeTicks = item.RunTimeTicks, - ProductionYear = item.ProductionYear + ProductionYear = item.ProductionYear, + ChannelId = item.ChannelId, + EndDate = item.EndDate }; - result.ChannelId = item.ChannelId; - var primaryImageTag = _imageProcessor.GetImageCacheTag(item, ImageType.Primary); if (primaryImageTag != null) @@ -186,12 +187,27 @@ namespace MediaBrowser.Api SetThumbImageInfo(result, item); SetBackdropImageInfo(result, item); + var program = item as LiveTvProgram; + if (program != null) + { + result.StartDate = program.StartDate; + } + var hasSeries = item as IHasSeries; if (hasSeries != null) { result.Series = hasSeries.SeriesName; } + var series = item as Series; + if (series != null) + { + if (series.Status.HasValue) + { + result.Status = series.Status.Value.ToString(); + } + } + var album = item as MusicAlbum; if (album != null) |
