Merge 20282c4d9b into 086fbd49cf

MediaBrowser.Controller/LiveTv/LiveTvChannel.cs

@@ -41,6 +41,12 @@ namespace MediaBrowser.Controller.LiveTv
         /// <value>The type of the channel.</value>
         public ChannelType ChannelType { get; set; }
 
+        /// <summary>
+        /// Gets or sets the group of the channel.
+        /// </summary>
+        /// <value>The name of the group that the channel is a part of.</value>
+        public string ChannelGroup { get; set; }
+
         [JsonIgnore]
         public override LocationType LocationType => LocationType.Remote;
 

MediaBrowser.Model/Dto/BaseItemDto.cs

@@ -224,6 +224,12 @@ namespace MediaBrowser.Model.Dto
 
         public string ChannelNumber { get; set; }
 
+        /// <summary>
+        /// Gets or sets the channel's group name.
+        /// </summary>
+        /// <value>The group name.</value>
+        public string ChannelGroup { get; set; }
+
         /// <summary>
         /// Gets or sets the index number.
         /// </summary>

src/Jellyfin.LiveTv/Guide/GuideManager.cs

@@ -458,6 +458,13 @@ public class GuideManager : IGuideManager
             }
         }
 
+        if (!string.Equals(channelInfo.ChannelGroup, item.ChannelGroup, StringComparison.Ordinal))
+        {
+            forceUpdate = true;
+        }
+
+        item.ChannelGroup = channelInfo.ChannelGroup;
+
         if (isNew)
         {
             _libraryManager.CreateItem(item, parentFolder);

src/Jellyfin.LiveTv/LiveTvManager.cs

@@ -562,6 +562,7 @@ namespace Jellyfin.LiveTv
                         dto.ChannelName = liveChannel.Name;
                         dto.MediaType = liveChannel.MediaType;
                         dto.ChannelNumber = liveChannel.Number;
+                        dto.ChannelGroup = liveChannel.ChannelGroup;
 
                         if (hasChannelImage && liveChannel.HasImage(ImageType.Primary))
                         {
@@ -981,6 +982,7 @@ namespace Jellyfin.LiveTv
                 dto.Number = channel.Number;
                 dto.ChannelNumber = channel.Number;
                 dto.ChannelType = channel.ChannelType;
+                dto.ChannelGroup = channel.ChannelGroup;
 
                 currentChannelsDict[dto.Id] = dto;