Merge branch 'main' of https://git.tdpi.dev/TDPI/jellyfin-plugin-smartnotify

Reviewed-on: #18

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.0.14"
+  ".": "0.0.17"
 }

CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## 0.0.17 (2026-03-03)
+
+### Bug Fixes
+
+* fix: removed notifications on reorganization
+
+### Chores
+
+* chore: update manifest for v0.0.16
+
+
+## 0.0.16 (2026-03-02)
+
+### Bug Fixes
+
+* fix: ist das wirklich ein Fix und kein defix?
+
+### Chores
+
+* chore: update manifest for v0.0.15
+
+
+## 0.0.15 (2026-03-01)
+
+### Bug Fixes
+
+* fix: timestamps!
+
+### Chores
+
+* chore: update manifest for v0.0.14
+
+
 ## 0.0.14 (2026-03-01)
 
 ### Bug Fixes

Jellyfin.Plugin.SmartNotify/Jellyfin.Plugin.SmartNotify.csproj

@@ -3,8 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>Jellyfin.Plugin.SmartNotify</RootNamespace>
-    <AssemblyVersion>0.0.14.0</AssemblyVersion>
-    <FileVersion>0.0.14.0</FileVersion>
+    <AssemblyVersion>0.0.17.0</AssemblyVersion>
+    <FileVersion>0.0.17.0</FileVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

Jellyfin.Plugin.SmartNotify/Notifiers/SmartNotifyBackgroundService.cs

@@ -1,8 +1,10 @@
 using System;
+using System.Linq;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Timers;
+using Jellyfin.Data.Enums;
 using Jellyfin.Plugin.SmartNotify.Services;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
@@ -47,6 +49,10 @@ public class SmartNotifyBackgroundService : IHostedService, IDisposable
     {
         _logger.LogInformation("SmartNotify background service starting");
 
+        // Pre-populate DB with all existing library items so they're recognized as "known".
+        // This prevents mass notifications on first run or after DB reset.
+        SeedExistingLibraryItems();
+
         // Subscribe to library events
         _libraryManager.ItemAdded += OnItemAdded;
         _libraryManager.ItemRemoved += OnItemRemoved;
@@ -62,6 +68,44 @@ public class SmartNotifyBackgroundService : IHostedService, IDisposable
         return Task.CompletedTask;
     }
 
+    /// <summary>
+    /// Seeds the database with all existing Episodes and Movies from the library.
+    /// Runs once at startup — only records items not yet in the DB.
+    /// </summary>
+    private void SeedExistingLibraryItems()
+    {
+        try
+        {
+            var query = new InternalItemsQuery
+            {
+                IncludeItemTypes = new[] { BaseItemKind.Episode, BaseItemKind.Movie },
+                IsVirtualItem = false,
+                Recursive = true
+            };
+
+            var existingItems = _libraryManager.GetItemList(query);
+            var seeded = 0;
+
+            foreach (var item in existingItems)
+            {
+                if (!_historyService.IsKnownItem(item.Id))
+                {
+                    _historyService.RecordItem(item);
+                    seeded++;
+                }
+            }
+
+            _logger.LogInformation(
+                "Seeded {Count} existing library items into SmartNotify DB (total in library: {Total})",
+                seeded,
+                existingItems.Count);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error seeding existing library items");
+        }
+    }
+
     /// <inheritdoc />
     public Task StopAsync(CancellationToken cancellationToken)
     {
@@ -88,6 +132,14 @@ public class SmartNotifyBackgroundService : IHostedService, IDisposable
             return;
         }
 
+        // Skip virtual items — these are created by "Add Missing Episodes/Seasons"
+        // metadata feature and have no actual file on disk
+        if (item.IsVirtualItem || string.IsNullOrEmpty(item.Path))
+        {
+            _logger.LogDebug("Skipping virtual item (no file): {Name} (ID: {Id})", item.Name, item.Id);
+            return;
+        }
+
         _logger.LogDebug("Item added: {Name} (Type: {Type}, ID: {Id})", item.Name, item.GetType().Name, item.Id);
 
         var config = Plugin.Instance?.Configuration;
@@ -128,6 +180,17 @@ public class SmartNotifyBackgroundService : IHostedService, IDisposable
             return;
         }
 
+        // Check 0: Is this exact item (same Jellyfin ID) already known in our DB?
+        if (_historyService.IsKnownItem(item.Id))
+        {
+            _logger.LogDebug(
+                "Item {Name} (ID: {Id}) is already known in DB, skipping notification",
+                item.Name,
+                item.Id);
+            _historyService.RecordItem(item);
+            return;
+        }
+
         // Check 1: Is this a quality upgrade? (Same content, different file)
         var isUpgrade = _historyService.IsQualityUpgrade(item);
 
@@ -201,10 +264,16 @@ public class SmartNotifyBackgroundService : IHostedService, IDisposable
             notification.EpisodeNumber = episode.IndexNumber;
             notification.Year = episode.ProductionYear;
 
-            // Use series image if episode doesn't have its own
+            // Use series provider IDs for external links — episode provider IDs
+            // (e.g. AniDB episode ID) lead to wrong URLs when used with /anime/ paths
             if (episode.SeriesId != Guid.Empty)
             {
                 var series = _libraryManager.GetItemById(episode.SeriesId);
+                if (series?.ProviderIds != null && series.ProviderIds.Count > 0)
+                {
+                    notification.ProviderIdsJson = JsonSerializer.Serialize(series.ProviderIds);
+                }
+
                 var seriesImage = series?.GetImagePath(ImageType.Primary, 0);
                 if (!string.IsNullOrEmpty(seriesImage))
                 {
@@ -231,6 +300,76 @@ public class SmartNotifyBackgroundService : IHostedService, IDisposable
         _logger.LogDebug("Item removed: {Name} (ID: {Id})", e.Item.Name, e.Item.Id);
     }
 
+    /// <summary>
+    /// Refreshes notification metadata from the library (series info may not be available at queue time).
+    /// </summary>
+    private void RefreshNotificationMetadata(PendingNotification notification)
+    {
+        if (!Guid.TryParse(notification.JellyfinItemId, out var itemId) || itemId == Guid.Empty)
+        {
+            return;
+        }
+
+        var item = _libraryManager.GetItemById(itemId);
+        if (item is not Episode episode)
+        {
+            return;
+        }
+
+        var changed = false;
+
+        if (string.IsNullOrEmpty(notification.SeriesName) || notification.SeriesName == "Unknown Series")
+        {
+            notification.SeriesName = episode.SeriesName;
+            changed = true;
+        }
+
+        if (string.IsNullOrEmpty(notification.SeriesId) || notification.SeriesId == Guid.Empty.ToString())
+        {
+            if (episode.SeriesId != Guid.Empty)
+            {
+                notification.SeriesId = episode.SeriesId.ToString();
+                changed = true;
+            }
+        }
+
+        if (!notification.SeasonNumber.HasValue && episode.ParentIndexNumber.HasValue)
+        {
+            notification.SeasonNumber = episode.ParentIndexNumber;
+            changed = true;
+        }
+
+        if (!notification.EpisodeNumber.HasValue && episode.IndexNumber.HasValue)
+        {
+            notification.EpisodeNumber = episode.IndexNumber;
+            changed = true;
+        }
+
+        // Refresh image if missing
+        if (string.IsNullOrEmpty(notification.ImagePath) && episode.SeriesId != Guid.Empty)
+        {
+            var series = _libraryManager.GetItemById(episode.SeriesId);
+            var seriesImage = series?.GetImagePath(ImageType.Primary, 0);
+            if (!string.IsNullOrEmpty(seriesImage))
+            {
+                notification.ImagePath = seriesImage;
+                changed = true;
+            }
+        }
+
+        if (changed)
+        {
+            _historyService.UpdateNotification(notification);
+            _logger.LogInformation(
+                "Refreshed metadata for {Name}: Series={SeriesName}, SeriesId={SeriesId}, S{Season}E{Episode}",
+                notification.Name,
+                notification.SeriesName,
+                notification.SeriesId,
+                notification.SeasonNumber,
+                notification.EpisodeNumber);
+        }
+    }
+
     /// <summary>
     /// Processes pending notifications (called by timer).
     /// </summary>
@@ -261,21 +400,66 @@ public class SmartNotifyBackgroundService : IHostedService, IDisposable
                 groupingWindowMinutes,
                 cutoff);
 
+            // Refresh metadata for episodes that were queued before metadata was available
+            foreach (var notification in pendingNotifications.Where(n => n.ItemType == "Episode"))
+            {
+                RefreshNotificationMetadata(notification);
+            }
+
+            // Late upgrade detection: re-check now that metadata is fully populated.
+            // At queue time, metadata (ProviderIds, Series, Season/Episode) may not have
+            // been available, causing GenerateContentKey() to return null and upgrades
+            // to go undetected. By now (after delay + grouping window), metadata is ready.
+            if (config.SuppressUpgrades)
+            {
+                var suppressedIds = new List<int>();
+                foreach (var notification in pendingNotifications)
+                {
+                    if (Guid.TryParse(notification.JellyfinItemId, out var revalidateId))
+                    {
+                        var revalidateItem = _libraryManager.GetItemById(revalidateId);
+                        if (_historyService.RevalidatePendingItem(notification.JellyfinItemId, revalidateItem))
+                        {
+                            suppressedIds.Add(notification.Id);
+                            _logger.LogInformation(
+                                "Late suppression: {Name} detected as upgrade at send time",
+                                notification.Name);
+                        }
+                    }
+                }
+
+                if (suppressedIds.Count > 0)
+                {
+                    _historyService.RemoveNotifications(suppressedIds);
+                    pendingNotifications.RemoveAll(n => suppressedIds.Contains(n.Id));
+                    _logger.LogInformation(
+                        "Suppressed {Count} upgrade notifications at send time",
+                        suppressedIds.Count);
+                }
+
+                if (pendingNotifications.Count == 0)
+                {
+                    return;
+                }
+            }
+
             // Group episodes by series
+            var emptyGuid = Guid.Empty.ToString();
             var episodesBySeries = pendingNotifications
-                .Where(n => n.ItemType == "Episode" && !string.IsNullOrEmpty(n.SeriesId))
+                .Where(n => n.ItemType == "Episode" && !string.IsNullOrEmpty(n.SeriesId) && n.SeriesId != emptyGuid)
                 .GroupBy(n => n.SeriesId!)
                 .ToList();
 
-            // Log unmatched notifications (neither episode with series nor movie)
-            var unmatchedCount = pendingNotifications.Count
-                - pendingNotifications.Count(n => n.ItemType == "Episode" && !string.IsNullOrEmpty(n.SeriesId))
-                - pendingNotifications.Count(n => n.ItemType == "Movie");
-            if (unmatchedCount > 0)
+            // Handle episodes that still have no series info (send individually as fallback)
+            var orphanEpisodes = pendingNotifications
+                .Where(n => n.ItemType == "Episode" && (string.IsNullOrEmpty(n.SeriesId) || n.SeriesId == emptyGuid))
+                .ToList();
+
+            if (orphanEpisodes.Count > 0)
             {
                 _logger.LogWarning(
-                    "{Count} notifications are neither episodes (with SeriesId) nor movies and will be skipped",
-                    unmatchedCount);
+                    "{Count} episode notifications have no series info even after refresh",
+                    orphanEpisodes.Count);
             }
 
             // Process each series group
@@ -317,6 +501,31 @@ public class SmartNotifyBackgroundService : IHostedService, IDisposable
                 }
             }
 
+            // Process orphan episodes (no series info - send individually)
+            foreach (var orphan in orphanEpisodes)
+            {
+                var oldAge = DateTime.UtcNow.AddMinutes(-groupingWindowMinutes);
+                if (orphan.QueuedAt > oldAge)
+                {
+                    continue;
+                }
+
+                _logger.LogInformation("Sending individual episode notification for: {Name} (no series info)", orphan.Name);
+
+                var success = await _discordService.SendGroupedEpisodeNotificationAsync(
+                    new[] { orphan },
+                    CancellationToken.None);
+
+                if (success)
+                {
+                    _historyService.RemoveNotifications(new[] { orphan.Id });
+                }
+                else
+                {
+                    _logger.LogWarning("Discord send failed for orphan episode {Name}, keeping in queue for retry", orphan.Name);
+                }
+            }
+
             // Process movies
             var movies = pendingNotifications
                 .Where(n => n.ItemType == "Movie")

Jellyfin.Plugin.SmartNotify/Services/ItemHistoryService.cs

@@ -38,7 +38,13 @@ public class ItemHistoryService : IDisposable
         var dbPath = Path.Combine(pluginDataPath, "smartnotify.db");
         _logger.LogInformation("SmartNotify database path: {Path}", dbPath);
 
-        _database = new LiteDatabase(dbPath);
+        // Use UTC for all DateTime to avoid container timezone vs Jellyfin time mismatches
+        var mapper = new BsonMapper { SerializeNullValues = false };
+        mapper.RegisterType<DateTime>(
+            serialize: value => new BsonValue(value.ToUniversalTime()),
+            deserialize: bson => bson.AsDateTime.ToUniversalTime());
+
+        _database = new LiteDatabase(dbPath, mapper);
         _knownItems = _database.GetCollection<KnownMediaItem>("known_items");
         _pendingNotifications = _database.GetCollection<PendingNotification>("pending_notifications");
 
@@ -58,18 +64,25 @@ public class ItemHistoryService : IDisposable
     {
         if (item is Episode episode)
         {
-            // For episodes: use series provider IDs + season + episode number
+            // Prefer episode's own provider ID (e.g. AniDB episode ID).
+            // This is stable even when seasons are reorganized in Jellyfin.
+            var episodeKey = GetProviderKey(episode.ProviderIds);
+            if (!string.IsNullOrEmpty(episodeKey))
+            {
+                return $"episode|{episodeKey}";
+            }
+
+            // Fallback: series provider key + season + episode number
             var series = episode.Series;
             if (series == null)
             {
-                _logger.LogDebug("Episode {Name} has no series, cannot generate content key", episode.Name);
+                _logger.LogDebug("Episode {Name} has no series and no provider IDs, cannot generate content key", episode.Name);
                 return null;
             }
 
             var seriesKey = GetProviderKey(series.ProviderIds);
             if (string.IsNullOrEmpty(seriesKey))
             {
-                // Fallback to series name if no provider IDs
                 seriesKey = series.Name?.ToLowerInvariant().Trim() ?? "unknown";
             }
 
@@ -78,7 +91,7 @@ public class ItemHistoryService : IDisposable
 
             if (episodeNum == 0)
             {
-                _logger.LogDebug("Episode {Name} has no episode number", episode.Name);
+                _logger.LogDebug("Episode {Name} has no episode number and no provider IDs", episode.Name);
                 return null;
             }
 
@@ -201,48 +214,64 @@ public class ItemHistoryService : IDisposable
         return false;
     }
 
+    /// <summary>
+    /// Checks if an item with the given Jellyfin ID is already tracked in the database.
+    /// </summary>
+    /// <param name="itemId">The Jellyfin item ID.</param>
+    /// <returns>True if the item is already known.</returns>
+    public bool IsKnownItem(Guid itemId)
+    {
+        var jellyfinId = itemId.ToString();
+        return _knownItems.Exists(x => x.JellyfinItemId == jellyfinId);
+    }
+
     /// <summary>
     /// Records a known item in the database.
+    /// Always records the JellyfinItemId even if metadata is not yet available,
+    /// using a placeholder ContentKey that gets updated later.
     /// </summary>
     /// <param name="item">The item to record.</param>
     public void RecordItem(BaseItem item)
     {
         var contentKey = GenerateContentKey(item);
-        if (contentKey == null)
-        {
-            return;
-        }
-
         var jellyfinId = item.Id.ToString();
 
         // Check if we already have this exact Jellyfin item
         var existing = _knownItems.FindOne(x => x.JellyfinItemId == jellyfinId);
         if (existing != null)
         {
-            // Update the record
-            existing.ContentKey = contentKey;
+            // Update the record — only update ContentKey if we have a real one
+            if (contentKey != null)
+            {
+                existing.ContentKey = contentKey;
+            }
+
             existing.FilePath = item.Path;
+            existing.Name = item.Name;
             _knownItems.Update(existing);
             return;
         }
 
         // Check if we have this content key already (upgrade scenario)
-        var byContentKey = _knownItems.FindOne(x => x.ContentKey == contentKey);
-        if (byContentKey != null)
+        if (contentKey != null)
         {
-            // Content exists, this is an upgrade - update the record
-            byContentKey.JellyfinItemId = jellyfinId;
-            byContentKey.FilePath = item.Path;
-            _knownItems.Update(byContentKey);
-            _logger.LogDebug("Updated existing content record for {Key} with new file", contentKey);
-            return;
+            var byContentKey = _knownItems.FindOne(x => x.ContentKey == contentKey);
+            if (byContentKey != null)
+            {
+                // Content exists, this is an upgrade - update the record
+                byContentKey.JellyfinItemId = jellyfinId;
+                byContentKey.FilePath = item.Path;
+                _knownItems.Update(byContentKey);
+                _logger.LogDebug("Updated existing content record for {Key} with new file", contentKey);
+                return;
+            }
         }
 
-        // New content - create record
+        // New content - create record (use placeholder key if metadata not yet available)
         var record = new KnownMediaItem
         {
             JellyfinItemId = jellyfinId,
-            ContentKey = contentKey,
+            ContentKey = contentKey ?? $"unresolved|{jellyfinId}",
             ItemType = item.GetType().Name,
             Name = item.Name,
             FirstSeen = DateTime.UtcNow,
@@ -263,7 +292,57 @@ public class ItemHistoryService : IDisposable
         }
 
         _knownItems.Insert(record);
-        _logger.LogDebug("Recorded new content: {Key}", contentKey);
+        _logger.LogDebug("Recorded new content: {Key}", record.ContentKey);
+    }
+
+    /// <summary>
+    /// Re-checks if a pending notification is actually a quality upgrade.
+    /// Called at send time when metadata is fully populated.
+    /// </summary>
+    /// <param name="jellyfinItemId">The Jellyfin item ID string.</param>
+    /// <param name="item">The resolved library item (may have updated metadata).</param>
+    /// <returns>True if this item is a late-detected upgrade that should be suppressed.</returns>
+    public bool RevalidatePendingItem(string jellyfinItemId, BaseItem? item)
+    {
+        if (item == null)
+        {
+            return false;
+        }
+
+        var contentKey = GenerateContentKey(item);
+        if (contentKey == null)
+        {
+            return false;
+        }
+
+        // Check if this content was already known under a different item ID
+        var existing = _knownItems.FindOne(x => x.ContentKey == contentKey && x.JellyfinItemId != jellyfinItemId);
+        if (existing != null)
+        {
+            _logger.LogInformation(
+                "Late upgrade detection for {Name}: content key {Key} already known (first seen: {FirstSeen})",
+                item.Name,
+                contentKey,
+                existing.FirstSeen);
+
+            // Update the existing record to point to the new item
+            existing.JellyfinItemId = jellyfinItemId;
+            existing.FilePath = item.Path;
+            _knownItems.Update(existing);
+
+            // Clean up any duplicate record that was created for this item
+            var duplicate = _knownItems.FindOne(x => x.JellyfinItemId == jellyfinItemId && x.Id != existing.Id);
+            if (duplicate != null)
+            {
+                _knownItems.Delete(duplicate.Id);
+            }
+
+            return true;
+        }
+
+        // Ensure the item is properly recorded (might have been missed at queue time due to missing metadata)
+        RecordItem(item);
+        return false;
     }
 
     /// <summary>
@@ -295,6 +374,15 @@ public class ItemHistoryService : IDisposable
         return _pendingNotifications.Find(x => x.QueuedAt <= olderThan);
     }
 
+    /// <summary>
+    /// Updates an existing notification in the queue (e.g. after metadata refresh).
+    /// </summary>
+    /// <param name="notification">The notification to update.</param>
+    public void UpdateNotification(PendingNotification notification)
+    {
+        _pendingNotifications.Update(notification);
+    }
+
     /// <summary>
     /// Removes processed notifications.
     /// </summary>

manifest.json

@@ -8,6 +8,30 @@
     "category": "Notifications",
     "imageUrl": "",
     "versions": [
+      {
+        "version": "0.0.16.0",
+        "changelog": "### Bug Fixes\n\n* fix: ist das wirklich ein Fix und kein defix?\n\n### Chores\n\n* chore: update manifest for v0.0.15",
+        "targetAbi": "10.11.0.0",
+        "sourceUrl": "https://git.tdpi.dev/TDPI/jellyfin-plugin-smartnotify/releases/download/v0.0.16/smartnotify_0.0.16.zip",
+        "checksum": "fbe2b3ce339c92204961df605bfe276b",
+        "timestamp": "2026-03-02T18:58:41Z"
+      },
+      {
+        "version": "0.0.15.0",
+        "changelog": "### Bug Fixes\n\n* fix: timestamps!\n\n### Chores\n\n* chore: update manifest for v0.0.14",
+        "targetAbi": "10.11.0.0",
+        "sourceUrl": "https://git.tdpi.dev/TDPI/jellyfin-plugin-smartnotify/releases/download/v0.0.15/smartnotify_0.0.15.zip",
+        "checksum": "c3dc638240b5688de030f77eccaf9c50",
+        "timestamp": "2026-03-01T17:49:47Z"
+      },
+      {
+        "version": "0.0.14.0",
+        "changelog": "### Bug Fixes\n\n* fix: claude hat bugs im Kopf\n\n### Chores\n\n* chore: update manifest for v0.0.13",
+        "targetAbi": "10.11.0.0",
+        "sourceUrl": "https://git.tdpi.dev/TDPI/jellyfin-plugin-smartnotify/releases/download/v0.0.14/smartnotify_0.0.14.zip",
+        "checksum": "428e0cc3a00c873381dc2f2f198f3907",
+        "timestamp": "2026-03-01T17:36:26Z"
+      },
       {
         "version": "0.0.13.0",
         "changelog": "### Bug Fixes\n\n* fix: removed drecks versionen\n* fix: Bilder und dumme min TImings!\n\n### Chores\n\n* chore: update manifest for v0.0.12",