diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-06-08 00:57:03 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-06-08 00:57:03 -0400 |
| commit | 2538889943c19439f9f87f1daeee6c5ecfcfa244 (patch) | |
| tree | cd48172d0820c4b8333c9c3b0ed571709a76d99e | |
| parent | 18df678d3f18bd710aa65fa315f4006a78415fbc (diff) | |
add mappings to add meta data method
3 files changed, 18 insertions, 3 deletions
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs index 0e44980df..242a2d24e 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using MediaBrowser.Model.Dto; +using MediaBrowser.Model.Extensions; namespace MediaBrowser.Model.LiveTv { @@ -90,5 +91,17 @@ namespace MediaBrowser.Model.LiveTv EnableAllTuners = true; ChannelMappings = new NameValuePair[] {}; } + + public string GetMappedChannel(string channelNumber) + { + foreach (NameValuePair mapping in ChannelMappings) + { + if (StringHelper.EqualsIgnoreCase(mapping.Name, channelNumber)) + { + return mapping.Value; + } + } + return channelNumber; + } } } diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index 41c137c29..d3e5bc1f9 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -1000,7 +1000,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV result.Item3.Release(); } - _libraryMonitor.ReportFileSystemChangeComplete(recordPath, false); + _libraryMonitor.ReportFileSystemChangeComplete(recordPath, true); } } catch (OperationCanceledException) diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs index 328dd9979..4de029d57 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs @@ -107,11 +107,13 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings var reader = new XmlTvReader(info.Path, GetLanguage(), null); var results = reader.GetChannels().ToList(); - if (channels != null && channels.Count > 0) + if (channels != null) { channels.ForEach(c => { - var match = results.FirstOrDefault(r => r.Id == c.Id); + var channelNumber = info.GetMappedChannel(c.Number); + var match = results.FirstOrDefault(r => string.Equals(r.Id, channelNumber, StringComparison.OrdinalIgnoreCase)); + if (match != null && match.Icon != null && !String.IsNullOrEmpty(match.Icon.Source)) { c.ImageUrl = match.Icon.Source; |
