foxgirlriley/JellyGlass
1
0
Fork 0
Code Issues Pull requests Releases 2 Packages 1 Wiki Activity

added audio and subtitle language info to search results

Browse source
This commit is contained in:
Fishandchips321 2026-03-09 18:19:09 +00:00
parent 7e0e492fca
commit 95e5efa533
7 changed files with 98 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/src/Models/ItemDTO.cs
View file

@ -28,4 +28,6 @@ public class ItemDTO
public string? ParentId { get; set; }
public string? ThumbnailUrl { get; set; }
public string? ProductionYear { get; set; }
public string[]? SubtitleLanguages { get; set; }
public string[]? AudioLanguages { get; set; }
}

2
backend/src/Models/JellyfinApi/Item.cs
View file

@ -21,4 +21,6 @@ public class Item
public string Type { get; set; } = string.Empty;
public double PrimaryImageAspectRatio { get; set; }
public string? CollectionType { get; set; }
public bool? HasSubtitles { get; set; }
public List<MediaStream>? MediaStreams { get; set; }
}

10
backend/src/Models/JellyfinApi/MediaStream.cs Normal file
View file

@ -0,0 +1,10 @@
namespace JellyGlass.Models.JellyfinApi;
public class MediaStream
{
public string Title { get; set; }
public string DisplayTitle { get; set; }
public string Type { get; set; }
public string? LocalizedDefault { get; set; }
public string Language { get; set; } = "undefined";
}

26
backend/src/Repositories/JellyfinApiClient.cs
View file

@ -46,9 +46,31 @@ public class JellyfinApiClient
return apiResponse!.Items.ToArray();
}
public async Task<Item[]> GetItems(string searchTerm = "", string years = "", string itemTypes = "", string limit = "", string parentId = "")
public async Task<Item[]> Search(string searchTerm = "", string itemTypes = "Series,Movie", string limit = "")
{
var request = new HttpRequestMessage(HttpMethod.Get, $"{InstanceUrl}/items?searchTerm={searchTerm}&recursive=true&includeItemTypes=Series,Movie");
var request = new HttpRequestMessage(HttpMethod.Get, $"{InstanceUrl}/items?searchTerm={searchTerm}&recursive=true&includeItemTypes={itemTypes}&limit={limit}");
var response = await MakeRequest(request);
var apiResponse = await response.Content.ReadFromJsonAsync<ItemResponse>();
return apiResponse!.Items.ToArray();
}
public async Task<Item[]> GetMediaInfoFromTvSeries(string seriesId)
{
var request = new HttpRequestMessage(HttpMethod.Get, $"{InstanceUrl}/items?parentId={seriesId}&recursive=true&includeItemTypes=Episode&fields=MediaStreams");
var response = await MakeRequest(request);
var apiResponse = await response.Content.ReadFromJsonAsync<ItemResponse>();
return apiResponse!.Items.ToArray();
}
public async Task<Item[]> GetMediaInfoFromMovie(string movieId)
{
var request = new HttpRequestMessage(HttpMethod.Get, $"{InstanceUrl}/items?ids={movieId}&fields=MediaStreams");
var response = await MakeRequest(request);

17
backend/src/Services/ClientService.cs
View file

@ -43,6 +43,23 @@ public class ClientService : IClientService
return client;
}
public async Task<JellyfinApiClient> GetClientFromJellyfinServerID(string jellyfinServerID)
{
if (!_clients.Any())
{
await LoadClients();
}
var client = _clients.FirstOrDefault(c => c.ID == jellyfinServerID);
if (client == null)
{
throw new Exception($"Could not find a client with ID of {jellyfinServerID}");
}
return client;
}
public async Task LoadNewClient(Server server)
{
var client = new JellyfinApiClient(server.Url, server.ApiToken);

1
backend/src/Services/IClientService.cs
View file

@ -7,6 +7,7 @@ public interface IClientService
{
public Task<JellyfinApiClient[]> GetClients();
public Task<JellyfinApiClient> GetClientFromUrl(string url);
public Task<JellyfinApiClient> GetClientFromJellyfinServerID(string jellyfinServerID); //the ID of the jellyfin server, not the server stored in our db
public Task LoadNewClient(Server server);
public void UnloadClient(JellyfinApiClient client);
}

70
backend/src/Services/SearchService.cs
View file

@ -5,12 +5,12 @@ namespace JellyGlass.Services;
public class SearchService : ISearchService
{
private ILibraryService _libraryService;
private ILogger<SearchService> _logger;
private IClientService _clientService;
public SearchService(ILibraryService libraryService, IClientService clientService)
public SearchService(ILogger<SearchService> logger, IClientService clientService)
{
_libraryService = libraryService;
_logger = logger;
_clientService = clientService;
}
@ -18,48 +18,62 @@ public class SearchService : ISearchService
{
var client = await _clientService.GetClientFromUrl(serverUrl);
var items = await client.GetItems(searchTerm: searchTerm);
var items = await client.Search(searchTerm: searchTerm);
var dtos = new List<ItemDTO>();
foreach (var item in items)
{
dtos.Add(new ItemDTO(item, client.InstanceUrl));
var dto = new ItemDTO(item, client.InstanceUrl);
var languages = await GetLanguagesForItem(item);
dto.SubtitleLanguages = languages.Item2;
dto.AudioLanguages = languages.Item1;
dtos.Add(dto);
}
return dtos.ToArray();
}
// public async Task<ItemDTO[]> Search2(string searchTerm, int serverId)
// {
// var libraries = await _libraryService.GetLibrariesFromServer(serverId);
// var foundItems = new List<ItemDTO>();
// foreach (var library in libraries)
// {
// var found = await SearchLibraryForTerm(searchTerm, serverId, library);
// foundItems.AddRange(found);
// }
// return foundItems.ToArray();
// }
private async Task<ItemDTO[]> SearchLibraryForTerm(string searchTerm, string serverUrl, Library library)
private async Task<Tuple<string[], string[]>> GetLanguagesForItem(Item item)
{
var items = await _libraryService.GetItemsFromLibrary(library.Name, serverUrl);
_logger.LogInformation($"Getting subtitle languages for {item.Name}");
var foundItems = new List<ItemDTO>();
var subtitleLanguages = new List<string>();
var audioLanguages = new List<string>();
var client = await _clientService.GetClientFromJellyfinServerID(item.ServerId);
foreach (var item in items)
Item[] infoList;
if (item.Type == "Movie")
{
if (item.Name.Contains(searchTerm, StringComparison.CurrentCultureIgnoreCase))
infoList = await client.GetMediaInfoFromMovie(item.Id);
}
else if (item.Type == "Series")
{
foundItems.Add(item);
infoList = await client.GetMediaInfoFromTvSeries(item.Id);
}
else
{
throw new Exception();
}
_logger.LogInformation($"Found {infoList.Count()} items");
foreach (var info in infoList)
{
foreach (var mediaStream in info.MediaStreams!)
{
if (mediaStream.Type == "Subtitle" && !subtitleLanguages.Contains(mediaStream.Language))
{
subtitleLanguages.Add(mediaStream.Language);
}
else if (mediaStream.Type == "Audio" && !audioLanguages.Contains(mediaStream.Language))
{
audioLanguages.Add(mediaStream.Language);
}
}
}
return foundItems.ToArray();
return new Tuple<string[], string[]>(audioLanguages.ToArray(), subtitleLanguages.ToArray());
}
}