diff --git a/jellyfin-plugin/Jellyfin.Plugin.SceneSearch/SceneSearchProvider.cs b/jellyfin-plugin/Jellyfin.Plugin.SceneSearch/SceneSearchProvider.cs index 406abb3..e038207 100644 --- a/jellyfin-plugin/Jellyfin.Plugin.SceneSearch/SceneSearchProvider.cs +++ b/jellyfin-plugin/Jellyfin.Plugin.SceneSearch/SceneSearchProvider.cs @@ -12,6 +12,13 @@ namespace Jellyfin.Plugin.SceneSearch; /// public sealed class SceneSearchProvider : IExternalSearchProvider { + // Normal providers such as Jellyfin Meilisearch return relevance in the + // 0..1 range. An explicit scene: query intentionally moves Scene Search + // into a reserved range above 1.0 so its results rank first without + // modifying or forking the other provider. + private const float ExplicitSceneScoreFloor = 1.1f; + private const float ExplicitSceneScoreRange = 0.9f; + private static readonly HashSet SupportedKinds = [ BaseItemKind.Movie, @@ -67,6 +74,7 @@ public sealed class SceneSearchProvider : IExternalSearchProvider } var config = Configuration; + var explicitSceneQuery = HasPrefix(query.SearchTerm, config.SearchPrefix); var searchTerm = StripPrefix(query.SearchTerm, config); if (string.IsNullOrWhiteSpace(searchTerm)) { @@ -75,10 +83,11 @@ public sealed class SceneSearchProvider : IExternalSearchProvider var limit = Math.Min(query.Limit ?? config.MaxResults, config.MaxResults); _logger.LogInformation( - "Scene Search handling Jellyfin query '{SearchTerm}' as '{BackendQuery}' (limit {Limit})", + "Scene Search handling Jellyfin query '{SearchTerm}' as '{BackendQuery}' (limit {Limit}, explicit scene preference {ExplicitSceneQuery})", query.SearchTerm, searchTerm, - Math.Max(limit, 1)); + Math.Max(limit, 1), + explicitSceneQuery); var results = await _client.SearchAsync( searchTerm, @@ -106,9 +115,18 @@ public sealed class SceneSearchProvider : IExternalSearchProvider continue; } - var score = result.RankingScore ?? result.SiglipScore ?? 0.5; + var score = (float)Math.Clamp( + result.RankingScore ?? result.SiglipScore ?? 0.5, + 0.0, + 1.0); + + if (explicitSceneQuery) + { + score = ExplicitSceneScoreFloor + (ExplicitSceneScoreRange * score); + } + yielded++; - yield return new SearchResult(itemId, (float)Math.Clamp(score, 0.0, 1.0)); + yield return new SearchResult(itemId, score); } _logger.LogInformation( @@ -136,6 +154,10 @@ public sealed class SceneSearchProvider : IExternalSearchProvider private static PluginConfiguration Configuration => Plugin.Instance?.Configuration ?? new PluginConfiguration(); + private static bool HasPrefix(string term, string prefix) + => !string.IsNullOrWhiteSpace(prefix) + && term.TrimStart().StartsWith(prefix, StringComparison.OrdinalIgnoreCase); + private static string StripPrefix(string term, PluginConfiguration config) { var trimmed = term.Trim();