瀏覽代碼

preserve channel info from provider

Luke Pulverenti 7 年之前
父節點
當前提交
d7bbfff23f
共有 1 個文件被更改,包括 11 次插入16 次删除
  1. 11 16
      Emby.Server.Implementations/LiveTv/LiveTvManager.cs

+ 11 - 16
Emby.Server.Implementations/LiveTv/LiveTvManager.cs

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