Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not consider tags in search (#12741)

Browse Source
This commit is contained in:
Tim Eisele 2024-09-30 04:21:24 +02:00 committed by GitHub
parent 6773223da4
commit 0ef72683bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View File

@ -1,7 +1,5 @@
#nullable disable #nullable disable
#pragma warning disable CS1591
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
@ -547,6 +545,7 @@ namespace Emby.Server.Implementations.Data
} }
} }
/// <inheritdoc />
public void SaveImages(BaseItem item) public void SaveImages(BaseItem item)
{ {
ArgumentNullException.ThrowIfNull(item); ArgumentNullException.ThrowIfNull(item);
@ -2340,9 +2339,6 @@ namespace Emby.Server.Implementations.Data
if (query.SearchTerm.Length > 1) if (query.SearchTerm.Length > 1)
{ {
builder.Append("+ ((CleanName like @SearchTermContains or (OriginalTitle not null and OriginalTitle like @SearchTermContains)) * 10)"); builder.Append("+ ((CleanName like @SearchTermContains or (OriginalTitle not null and OriginalTitle like @SearchTermContains)) * 10)");
builder.Append("+ (SELECT COUNT(1) * 1 from ItemValues where ItemId=Guid and CleanValue like @SearchTermContains)");
builder.Append("+ (SELECT COUNT(1) * 2 from ItemValues where ItemId=Guid and CleanValue like @SearchTermStartsWith)");
builder.Append("+ (SELECT COUNT(1) * 10 from ItemValues where ItemId=Guid and CleanValue like @SearchTermEquals)");
} }
builder.Append(") as SearchScore"); builder.Append(") as SearchScore");
@ -2373,11 +2369,6 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind("@SearchTermContains", "%" + searchTerm + "%"); statement.TryBind("@SearchTermContains", "%" + searchTerm + "%");
} }
if (commandText.Contains("@SearchTermEquals", StringComparison.OrdinalIgnoreCase))
{
statement.TryBind("@SearchTermEquals", searchTerm);
}
} }
private void BindSimilarParams(InternalItemsQuery query, SqliteCommand statement) private void BindSimilarParams(InternalItemsQuery query, SqliteCommand statement)
@ -2443,6 +2434,7 @@ namespace Emby.Server.Implementations.Data
return string.Empty; return string.Empty;
} }
/// <inheritdoc />
public int GetCount(InternalItemsQuery query) public int GetCount(InternalItemsQuery query)
{ {
ArgumentNullException.ThrowIfNull(query); ArgumentNullException.ThrowIfNull(query);
@ -2490,6 +2482,7 @@ namespace Emby.Server.Implementations.Data
} }
} }
/// <inheritdoc />
public List<BaseItem> GetItemList(InternalItemsQuery query) public List<BaseItem> GetItemList(InternalItemsQuery query)
{ {
ArgumentNullException.ThrowIfNull(query); ArgumentNullException.ThrowIfNull(query);
@ -2643,6 +2636,7 @@ namespace Emby.Server.Implementations.Data
items.Add(newItem); items.Add(newItem);
} }
/// <inheritdoc />
public QueryResult<BaseItem> GetItems(InternalItemsQuery query) public QueryResult<BaseItem> GetItems(InternalItemsQuery query)
{ {
ArgumentNullException.ThrowIfNull(query); ArgumentNullException.ThrowIfNull(query);
@ -2887,6 +2881,7 @@ namespace Emby.Server.Implementations.Data
}; };
} }
/// <inheritdoc />
public List<Guid> GetItemIdsList(InternalItemsQuery query) public List<Guid> GetItemIdsList(InternalItemsQuery query)
{ {
ArgumentNullException.ThrowIfNull(query); ArgumentNullException.ThrowIfNull(query);
@ -4445,6 +4440,7 @@ namespace Emby.Server.Implementations.Data
|| query.IncludeItemTypes.Contains(BaseItemKind.Season); || query.IncludeItemTypes.Contains(BaseItemKind.Season);
} }
/// <inheritdoc />
public void UpdateInheritedValues() public void UpdateInheritedValues()
{ {
const string Statements = """ const string Statements = """
@ -4461,6 +4457,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
transaction.Commit(); transaction.Commit();
} }
/// <inheritdoc />
public void DeleteItem(Guid id) public void DeleteItem(Guid id)
{ {
if (id.IsEmpty()) if (id.IsEmpty())
@ -4503,6 +4500,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
} }
} }
/// <inheritdoc />
public List<string> GetPeopleNames(InternalPeopleQuery query) public List<string> GetPeopleNames(InternalPeopleQuery query)
{ {
ArgumentNullException.ThrowIfNull(query); ArgumentNullException.ThrowIfNull(query);
@ -4541,6 +4539,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
return list; return list;
} }
/// <inheritdoc />
public List<PersonInfo> GetPeople(InternalPeopleQuery query) public List<PersonInfo> GetPeople(InternalPeopleQuery query)
{ {
ArgumentNullException.ThrowIfNull(query); ArgumentNullException.ThrowIfNull(query);
@ -4700,46 +4699,55 @@ AND Type = @InternalPersonType)");
} }
} }
/// <inheritdoc />
public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAllArtists(InternalItemsQuery query) public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAllArtists(InternalItemsQuery query)
{ {
return GetItemValues(query, new[] { 0, 1 }, typeof(MusicArtist).FullName); return GetItemValues(query, new[] { 0, 1 }, typeof(MusicArtist).FullName);
} }
/// <inheritdoc />
public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetArtists(InternalItemsQuery query) public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetArtists(InternalItemsQuery query)
{ {
return GetItemValues(query, new[] { 0 }, typeof(MusicArtist).FullName); return GetItemValues(query, new[] { 0 }, typeof(MusicArtist).FullName);
} }
/// <inheritdoc />
public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAlbumArtists(InternalItemsQuery query) public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAlbumArtists(InternalItemsQuery query)
{ {
return GetItemValues(query, new[] { 1 }, typeof(MusicArtist).FullName); return GetItemValues(query, new[] { 1 }, typeof(MusicArtist).FullName);
} }
/// <inheritdoc />
public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetStudios(InternalItemsQuery query) public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetStudios(InternalItemsQuery query)
{ {
return GetItemValues(query, new[] { 3 }, typeof(Studio).FullName); return GetItemValues(query, new[] { 3 }, typeof(Studio).FullName);
} }
/// <inheritdoc />
public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetGenres(InternalItemsQuery query) public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetGenres(InternalItemsQuery query)
{ {
return GetItemValues(query, new[] { 2 }, typeof(Genre).FullName); return GetItemValues(query, new[] { 2 }, typeof(Genre).FullName);
} }
/// <inheritdoc />
public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetMusicGenres(InternalItemsQuery query) public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetMusicGenres(InternalItemsQuery query)
{ {
return GetItemValues(query, new[] { 2 }, typeof(MusicGenre).FullName); return GetItemValues(query, new[] { 2 }, typeof(MusicGenre).FullName);
} }
/// <inheritdoc />
public List<string> GetStudioNames() public List<string> GetStudioNames()
{ {
return GetItemValueNames(new[] { 3 }, Array.Empty<string>(), Array.Empty<string>()); return GetItemValueNames(new[] { 3 }, Array.Empty<string>(), Array.Empty<string>());
} }
/// <inheritdoc />
public List<string> GetAllArtistNames() public List<string> GetAllArtistNames()
{ {
return GetItemValueNames(new[] { 0, 1 }, Array.Empty<string>(), Array.Empty<string>()); return GetItemValueNames(new[] { 0, 1 }, Array.Empty<string>(), Array.Empty<string>());
} }
/// <inheritdoc />
public List<string> GetMusicGenreNames() public List<string> GetMusicGenreNames()
{ {
return GetItemValueNames( return GetItemValueNames(
@ -4754,6 +4762,7 @@ AND Type = @InternalPersonType)");
Array.Empty<string>()); Array.Empty<string>());
} }
/// <inheritdoc />
public List<string> GetGenreNames() public List<string> GetGenreNames()
{ {
return GetItemValueNames( return GetItemValueNames(
@ -5231,6 +5240,7 @@ AND Type = @InternalPersonType)");
} }
} }
/// <inheritdoc />
public void UpdatePeople(Guid itemId, List<PersonInfo> people) public void UpdatePeople(Guid itemId, List<PersonInfo> people)
{ {
if (itemId.IsEmpty()) if (itemId.IsEmpty())
@ -5332,6 +5342,7 @@ AND Type = @InternalPersonType)");
return item; return item;
} }
/// <inheritdoc />
public List<MediaStream> GetMediaStreams(MediaStreamQuery query) public List<MediaStream> GetMediaStreams(MediaStreamQuery query)
{ {
CheckDisposed(); CheckDisposed();
@ -5380,6 +5391,7 @@ AND Type = @InternalPersonType)");
} }
} }
/// <inheritdoc />
public void SaveMediaStreams(Guid id, IReadOnlyList<MediaStream> streams, CancellationToken cancellationToken) public void SaveMediaStreams(Guid id, IReadOnlyList<MediaStream> streams, CancellationToken cancellationToken)
{ {
CheckDisposed(); CheckDisposed();
@ -5734,6 +5746,7 @@ AND Type = @InternalPersonType)");
return item; return item;
} }
/// <inheritdoc />
public List<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query) public List<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query)
{ {
CheckDisposed(); CheckDisposed();
@ -5769,6 +5782,7 @@ AND Type = @InternalPersonType)");
return list; return list;
} }
/// <inheritdoc />
public void SaveMediaAttachments( public void SaveMediaAttachments(
Guid id, Guid id,
IReadOnlyList<MediaAttachment> attachments, IReadOnlyList<MediaAttachment> attachments,