alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-16 05:36:52 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

move language filters from QueryFiltersLegacy to QueryFilters

Browse Source
This commit is contained in:
TheMelmacian
2026-05-12 01:47:07 +02:00
parent 5701cdce68
commit 39049a726e
10 changed files with 82 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@@ -87,6 +87,7 @@ namespace Emby.Server.Implementations.Library
private readonly IPathManager _pathManager;
private readonly FastConcurrentLru<Guid, BaseItem> _cache;
private readonly DotIgnoreIgnoreRule _dotIgnoreIgnoreRule;
private readonly IMediaStreamRepository _mediaStreamRepository;
/// <summary>
/// The _root folder sync lock.
@@ -129,6 +130,7 @@ namespace Emby.Server.Implementations.Library
/// <param name="peopleRepository">The people repository.</param>
/// <param name="pathManager">The path manager.</param>
/// <param name="dotIgnoreIgnoreRule">The .ignore rule handler.</param>
/// <param name="mediaStreamRepository">The media stream repository.</param>
public LibraryManager(
IServerApplicationHost appHost,
ILoggerFactory loggerFactory,
@@ -151,7 +153,8 @@ namespace Emby.Server.Implementations.Library
IDirectoryService directoryService,
IPeopleRepository peopleRepository,
IPathManager pathManager,
DotIgnoreIgnoreRule dotIgnoreIgnoreRule)
DotIgnoreIgnoreRule dotIgnoreIgnoreRule,
IMediaStreamRepository mediaStreamRepository)
{
_appHost = appHost;
_logger = loggerFactory.CreateLogger<LibraryManager>();
@@ -181,6 +184,8 @@ namespace Emby.Server.Implementations.Library
_configurationManager.ConfigurationUpdated += ConfigurationUpdated;
_mediaStreamRepository = mediaStreamRepository;
RecordConfigurationValues(_configurationManager.Configuration);
}
@@ -3800,5 +3805,11 @@ namespace Emby.Server.Implementations.Library
SetTopParentOrAncestorIds(query);
return _itemRepository.GetQueryFiltersLegacy(query);
}
/// <inheritdoc />
public IReadOnlyList<string> GetMediaStreamLanguages(MediaStreamType mediaStreamType)
{
return _mediaStreamRepository.GetMediaStreamLanguages(mediaStreamType);
}
}
}

37
Jellyfin.Api/Controllers/FilterController.cs
View File

@@ -8,6 +8,8 @@ using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Globalization;
using MediaBrowser.Model.Querying;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
@@ -24,16 +26,19 @@ public class FilterController : BaseJellyfinApiController
{
private readonly ILibraryManager _libraryManager;
private readonly IUserManager _userManager;
private readonly ILocalizationManager _localization;
/// <summary>
/// Initializes a new instance of the <see cref="FilterController"/> class.
/// </summary>
/// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
/// <param name="userManager">Instance of the <see cref="IUserManager"/> interface.</param>
public FilterController(ILibraryManager libraryManager, IUserManager userManager)
/// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param>
public FilterController(ILibraryManager libraryManager, IUserManager userManager, ILocalizationManager localization)
{
_libraryManager = libraryManager;
_userManager = userManager;
_localization = localization;
}
/// <summary>
@@ -183,6 +188,36 @@ public class FilterController : BaseJellyfinApiController
}).ToArray();
}
if (includeItemTypes.Contains(BaseItemKind.Movie) || includeItemTypes.Contains(BaseItemKind.Series))
{
filters.AudioLanguages = _libraryManager
.GetMediaStreamLanguages(MediaStreamType.Audio)
.Select(language =>
{
var culture = _localization.FindLanguageInfo(language);
return new NameValuePair
{
Name = culture != null ? $"{culture.DisplayName} ({language})" : language,
Value = language
};
})
.OrderBy(l => l.Name)
.ToArray();
filters.SubtitleLanguages = _libraryManager
.GetMediaStreamLanguages(MediaStreamType.Subtitle)
.Select(language =>
{
var culture = _localization.FindLanguageInfo(language);
return new NameValuePair
{
Name = culture != null ? $"{culture.DisplayName} ({language})" : language,
Value = language
};
})
.OrderBy(l => l.Name)
.ToArray();
}
return filters;
}
}

2
Jellyfin.Api/Controllers/ItemsController.cs
View File

@@ -421,7 +421,7 @@ public class ItemsController : BaseJellyfinApiController
}
else
{
// if we want to know if an item has no subtitles we don't need to check for subtitles of a specific language
// if we search for items without subtitles, we don't need to check for subtitles of a specific language
query.SubtitleLanguages = [];
}
}

36
Jellyfin.Server.Implementations/Item/BaseItemRepository.Querying.cs
View File

@@ -535,46 +535,12 @@ public sealed partial class BaseItemRepository
.OrderBy(g => g)
.ToArray();
// At the moment language filters are only available for video types (Movie and Series libraries).
// They are fetched directly from the MediaStreamInfos table and only filtered by StreamType.
// This is the fastest and most perfomant way to get the list of available languages,
// but the filter values can include language tags that are not linked to any item in the current library.
var subtitleLanguages = IncludesVideoTypes(filter)
? context.MediaStreamInfos
.Where(s => s.StreamType == MediaStreamTypeEntity.Subtitle)
.Select(s => string.IsNullOrEmpty(s.Language) ? "und" : s.Language) // und = undetermined
.Distinct()
.OrderBy(l => l)
.ToArray()
: [];
var audioLanguages = IncludesVideoTypes(filter)
? context.MediaStreamInfos
.Where(s => s.StreamType == MediaStreamTypeEntity.Audio)
.Select(s => string.IsNullOrEmpty(s.Language) ? "und" : s.Language) // und = undetermined
.Distinct()
.OrderBy(l => l)
.ToArray()
: [];
return new QueryFiltersLegacy
{
Years = years,
OfficialRatings = officialRatings,
Tags = tags,
Genres = genres,
SubtitleLanguages = subtitleLanguages,
AudioLanguages = audioLanguages
Genres = genres
};
}
private bool IncludesVideoTypes(InternalItemsQuery filter)
{
return filter.IncludeItemTypes.Contains(BaseItemKind.Movie)
|| filter.IncludeItemTypes.Contains(BaseItemKind.Video)
|| filter.IncludeItemTypes.Contains(BaseItemKind.Series)
|| filter.IncludeItemTypes.Contains(BaseItemKind.Season)
|| filter.IncludeItemTypes.Contains(BaseItemKind.Episode)
|| filter.IncludeItemTypes.Contains(BaseItemKind.Trailer);
}
}

1
Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs
View File

@@ -1078,6 +1078,7 @@ public sealed partial class BaseItemRepository
{
// Dvds and Blu-rays can either be stored in a folder structure or as an iso file
// => to find all matches we need to check both: VideoType and IsoType
// alternatively, we could provide specific IsoType filters
var videoTypeBs = filter.VideoTypes.Select(vt => $"\"VideoType\":\"{vt}\"").ToArray();
var isoTypeBs = filter.VideoTypes.Select(vt => $"\"IsoType\":\"{vt}\"").ToArray();
Expression<Func<BaseItemEntity, bool>> hasVideoType = e => videoTypeBs.Any(f => e.Data!.Contains(f)) || isoTypeBs.Any(f => e.Data!.Contains(f));

11
Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
View File

@@ -55,6 +55,17 @@ public class MediaStreamRepository : IMediaStreamRepository
return TranslateQuery(context.MediaStreamInfos.AsNoTracking(), filter).AsEnumerable().Select(Map).ToArray();
}
/// <inheritdoc />
public IReadOnlyList<string> GetMediaStreamLanguages(MediaStreamType mediaStreamType)
{
using var context = _dbProvider.CreateDbContext();
return context.MediaStreamInfos
.Where(e => e.StreamType == (MediaStreamTypeEntity)mediaStreamType)
.Select(s => string.IsNullOrEmpty(s.Language) ? "und" : s.Language) // und = undetermined
.Distinct()
.ToArray();
}
private string? GetPathToSave(string? path)
{
if (path is null)

7
MediaBrowser.Controller/Library/ILibraryManager.cs
View File

@@ -784,5 +784,12 @@ namespace MediaBrowser.Controller.Library
/// <param name="query">The query filter.</param>
/// <returns>Aggregated filter values.</returns>
QueryFiltersLegacy GetQueryFiltersLegacy(InternalItemsQuery query);
/// <summary>
/// Gets a list of all language codes of the provided stream type.
/// </summary>
/// <param name="mediaStreamType">The stream type.</param>
/// <returns>List of language codes.</returns>
IReadOnlyList<string> GetMediaStreamLanguages(MediaStreamType mediaStreamType);
}
}

7
MediaBrowser.Controller/Persistence/IMediaStreamRepository.cs
View File

@@ -21,6 +21,13 @@ public interface IMediaStreamRepository
/// <returns>IEnumerable{MediaStream}.</returns>
IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery filter);
/// <summary>
/// Gets all language codes of the provided stream type.
/// </summary>
/// <param name="mediaStreamType">The type of the media stream.</param>
/// <returns>IEnumerable{string}.</returns>
IReadOnlyList<string> GetMediaStreamLanguages(MediaStreamType mediaStreamType);
/// <summary>
/// Saves the media streams.
/// </summary>

6
MediaBrowser.Model/Querying/QueryFilters.cs
View File

@@ -12,10 +12,16 @@ namespace MediaBrowser.Model.Querying
{
Tags = Array.Empty<string>();
Genres = Array.Empty<NameGuidPair>();
AudioLanguages = Array.Empty<NameValuePair>();
SubtitleLanguages = Array.Empty<NameValuePair>();
}
public NameGuidPair[] Genres { get; set; }
public string[] Tags { get; set; }
public NameValuePair[] AudioLanguages { get; set; }
public NameValuePair[] SubtitleLanguages { get; set; }
}
}

6
MediaBrowser.Model/Querying/QueryFiltersLegacy.cs
View File

@@ -13,8 +13,6 @@ namespace MediaBrowser.Model.Querying
Tags = Array.Empty<string>();
OfficialRatings = Array.Empty<string>();
Years = Array.Empty<int>();
AudioLanguages = Array.Empty<string>();
SubtitleLanguages = Array.Empty<string>();
}
public string[] Genres { get; set; }
@@ -24,9 +22,5 @@ namespace MediaBrowser.Model.Querying
public string[] OfficialRatings { get; set; }
public int[] Years { get; set; }
public string[] AudioLanguages { get; set; }
public string[] SubtitleLanguages { get; set; }
}
}