1 files changed, 21 insertions, 20 deletions

diff --git a/src/Jellyfin.LiveTv/Guide/GuideManager.cs b/src/Jellyfin.LiveTv/Guide/GuideManager.cs
index 556516674b..4e1b62cdf9 100644
--- a/src/Jellyfin.LiveTv/Guide/GuideManager.cs
+++ b/src/Jellyfin.LiveTv/Guide/GuideManager.cs
@@ -5,7 +5,9 @@ using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
+using Jellyfin.LiveTv;
 using Jellyfin.LiveTv.Configuration;
+using Jellyfin.LiveTv.Listings;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
@@ -448,18 +450,9 @@ public class GuideManager : IGuideManager
 
         item.Name = channelInfo.Name;
 
-        if (!item.HasImage(ImageType.Primary))
+        if (LiveTvChannelImageHelper.UpdateChannelImageIfNeeded(item, channelInfo.ImagePath, channelInfo.ImageUrl))
         {
-            if (!string.IsNullOrWhiteSpace(channelInfo.ImagePath))
-            {
-                item.SetImagePath(ImageType.Primary, channelInfo.ImagePath);
-                forceUpdate = true;
-            }
-            else if (!string.IsNullOrWhiteSpace(channelInfo.ImageUrl))
-            {
-                item.SetImagePath(ImageType.Primary, channelInfo.ImageUrl);
-                forceUpdate = true;
-            }
+            forceUpdate = true;
         }
 
         if (isNew)
@@ -494,8 +487,13 @@ public class GuideManager : IGuideManager
                 DateCreated = DateTime.UtcNow,
                 DateModified = DateTime.UtcNow
             };
-
-            item.TrySetProviderId(EtagKey, info.Etag);
+        }
+        else if (XmlTvProgramEtag.MatchesStored(info.Etag, item.GetProviderId(EtagKey)))
+        {
+            // XMLTV ETags are generated from the final ProgramInfo fields Jellyfin consumes,
+            // so an exact match means nothing relevant changed. Other providers stay on the
+            // field-by-field update path.
+            return (item, false, false);
         }
 
         if (!string.Equals(info.ShowId, item.ShowId, StringComparison.OrdinalIgnoreCase))
@@ -621,13 +619,9 @@ public class GuideManager : IGuideManager
 
         forceUpdate |= UpdateImages(item, info);
 
-        if (isNew)
-        {
-            item.OnMetadataChanged();
-
-            return (item, true, false);
-        }
-
+        // Restore the etag wiped by `item.ProviderIds = info.ProviderIds` above and
+        // persist it on new items so they join the fast path on the next refresh
+        // instead of taking an extra full processing cycle.
         var isUpdated = forceUpdate;
         var etag = info.Etag;
         if (string.IsNullOrWhiteSpace(etag))
@@ -640,6 +634,13 @@ public class GuideManager : IGuideManager
             isUpdated = true;
         }
 
+        if (isNew)
+        {
+            item.OnMetadataChanged();
+
+            return (item, true, false);
+        }
+
         if (isUpdated)
         {
             item.OnMetadataChanged();