Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

preserve channel info from provider

Browse Source
This commit is contained in:
Luke Pulverenti 2017-10-13 01:44:40 -04:00
parent bc656edf4f
commit d7bbfff23f
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Emby.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -527,18 +527,18 @@ namespace Emby.Server.Implementations.LiveTv
item.ChannelType = channelInfo.ChannelType; item.ChannelType = channelInfo.ChannelType;
item.ServiceName = serviceName; item.ServiceName = serviceName;
if (!string.Equals(channelInfo.Number, item.Number, StringComparison.Ordinal))
{
forceUpdate = true;
}
item.Number = channelInfo.Number; item.Number = channelInfo.Number;
//if (!string.Equals(item.ProviderImageUrl, channelInfo.ImageUrl, StringComparison.OrdinalIgnoreCase)) if (!string.Equals(channelInfo.Name, item.Name, StringComparison.Ordinal))
//{ {
// isNew = true; forceUpdate = true;
// replaceImages.Add(ImageType.Primary); }
//} item.Name = channelInfo.Name;
//if (!string.Equals(item.ProviderImagePath, channelInfo.ImagePath, StringComparison.OrdinalIgnoreCase))
//{
// isNew = true;
// replaceImages.Add(ImageType.Primary);
//}
if (!item.HasImage(ImageType.Primary)) if (!item.HasImage(ImageType.Primary))
{ {
@ -554,11 +554,6 @@ namespace Emby.Server.Implementations.LiveTv
} }
} }
if (string.IsNullOrEmpty(item.Name))
{
item.Name = channelInfo.Name;
}
if (isNew) if (isNew)
{ {
_libraryManager.CreateItem(item, cancellationToken); _libraryManager.CreateItem(item, cancellationToken);
@ -2923,7 +2918,7 @@ namespace Emby.Server.Implementations.LiveTv
public Folder GetInternalLiveTvFolder(CancellationToken cancellationToken) public Folder GetInternalLiveTvFolder(CancellationToken cancellationToken)
{ {
var name = _localization.GetLocalizedString("ViewTypeLiveTV"); var name = _localization.GetLocalizedString("HeaderLiveTV");
return _libraryManager.GetNamedView(name, CollectionType.LiveTv, name, cancellationToken); return _libraryManager.GetNamedView(name, CollectionType.LiveTv, name, cancellationToken);
} }