michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1822 from ChubbyArse/dev

Browse Source 
Changed Genre Mapping to be case insensitve
This commit is contained in:
Luke 2016-06-06 18:08:01 -04:00
commit c4b5258758
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
View File

@ -41,9 +41,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
public Task<IEnumerable<ProgramInfo>> GetProgramsAsync(ListingsProviderInfo info, string channelNumber, string channelName, DateTime startDateUtc, DateTime endDateUtc, CancellationToken cancellationToken) public Task<IEnumerable<ProgramInfo>> GetProgramsAsync(ListingsProviderInfo info, string channelNumber, string channelName, DateTime startDateUtc, DateTime endDateUtc, CancellationToken cancellationToken)
{ {
var reader = new XmlTvReader(info.Path, GetLanguage(), null); var reader = new XmlTvReader(info.Path, GetLanguage(), null);
string mappedChannel = channelNumber;
var results = reader.GetProgrammes(mappedChannel, startDateUtc, endDateUtc, cancellationToken); var results = reader.GetProgrammes(channelNumber, startDateUtc, endDateUtc, cancellationToken);
return Task.FromResult(results.Select(p => new ProgramInfo() return Task.FromResult(results.Select(p => new ProgramInfo()
{ {
ChannelId = p.ChannelId, ChannelId = p.ChannelId,
@ -61,10 +60,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
IsSeries = p.IsSeries, IsSeries = p.IsSeries,
IsRepeat = p.IsRepeat, IsRepeat = p.IsRepeat,
// IsPremiere = !p.PreviouslyShown.HasValue, // IsPremiere = !p.PreviouslyShown.HasValue,
IsKids = p.Categories.Any(info.KidsCategories.Contains), IsKids = p.Categories.Any(c => info.KidsCategories.Contains(c, StringComparer.InvariantCultureIgnoreCase)),
IsMovie = p.Categories.Any(info.MovieCategories.Contains), IsMovie = p.Categories.Any(c => info.MovieCategories.Contains(c, StringComparer.InvariantCultureIgnoreCase)),
IsNews = p.Categories.Any(info.NewsCategories.Contains), IsNews = p.Categories.Any(c => info.NewsCategories.Contains(c, StringComparer.InvariantCultureIgnoreCase)),
IsSports = p.Categories.Any(info.SportsCategories.Contains), IsSports = p.Categories.Any(c => info.SportsCategories.Contains(c, StringComparer.InvariantCultureIgnoreCase)),
ImageUrl = p.Icon != null && !String.IsNullOrEmpty(p.Icon.Source) ? p.Icon.Source : null, ImageUrl = p.Icon != null && !String.IsNullOrEmpty(p.Icon.Source) ? p.Icon.Source : null,
HasImage = p.Icon != null && !String.IsNullOrEmpty(p.Icon.Source), HasImage = p.Icon != null && !String.IsNullOrEmpty(p.Icon.Source),
OfficialRating = p.Rating != null && !String.IsNullOrEmpty(p.Rating.Value) ? p.Rating.Value : null, OfficialRating = p.Rating != null && !String.IsNullOrEmpty(p.Rating.Value) ? p.Rating.Value : null,