backend/src/Models/ItemDTO.cs

@@ -28,6 +28,4 @@ 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; }
 }

backend/src/Models/JellyfinApi/Item.cs

@@ -21,6 +21,4 @@ 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; }
 }

backend/src/Models/JellyfinApi/MediaStream.cs

@@ -1,10 +0,0 @@
-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";
-}

backend/src/Repositories/JellyfinApiClient.cs

@@ -46,31 +46,9 @@ public class JellyfinApiClient
 		return apiResponse!.Items.ToArray();
 	}
 
-	public async Task<Item[]> Search(string searchTerm = "", string itemTypes = "Series,Movie", string limit = "")
+	public async Task<Item[]> GetItems(string searchTerm = "", string years = "", string itemTypes = "", string limit = "", string parentId = "")
 	{
-		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 request = new HttpRequestMessage(HttpMethod.Get, $"{InstanceUrl}/items?searchTerm={searchTerm}&recursive=true&includeItemTypes=Series,Movie");
 
 		var response = await MakeRequest(request);
 

backend/src/Services/ClientService.cs

@@ -43,23 +43,6 @@ 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);

backend/src/Services/IClientService.cs

@@ -7,7 +7,6 @@ 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);
 }

backend/src/Services/SearchService.cs

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

frontend/src/Components/ServerSearch/ServerSearchResult/ServerSearchResult.tsx

@@ -10,24 +10,10 @@ interface ServerSearchResultProps {
 const ServerSearchResult = ({ searchResult, server }: ServerSearchResultProps) => {
   const resultUrl = getUrlForSearchResult(searchResult, server);
 
-  function getLangs(languages: Array<string>) {
-    let formattedLangs = languages[0];
-
-    for (let i = 1; i < languages.length; i++) {
-      formattedLangs += `, ${languages[i]}`;
-    }
-
-    return formattedLangs;
-  }
-
   return (
-    <>
     <Link to={resultUrl} target="_blank" rel="noopener noreferrer">
       <h3>{searchResult.type} - {searchResult.name} - {searchResult.productionYear}</h3>
     </Link>
-      {searchResult.subtitleLanguages.length > 0 && <p>Audio Languages: {getLangs(searchResult.audioLanguages)}</p>}
-      {searchResult.subtitleLanguages.length > 0 && <p>Subtitle Languages: {getLangs(searchResult.subtitleLanguages)}</p>}
-    </>
   )
 }
 

frontend/src/Lib/Search.ts

@@ -8,8 +8,6 @@ export interface SearchResult {
   serverId: string;
   type: string;
   productionYear: string;
-  subtitleLanguages: Array<string>;
-  audioLanguages: Array<string>;
 }
 
 export const search = async (searchTerm: string, serverUrl: string): Promise<Array<SearchResult>> => {

frontend/src/Pages/Search/Search.tsx

@@ -1,35 +1,20 @@
-import { useEffect, useReducer } from "react";
+import { useEffect, useState } from "react";
 import { getServerList, type Server } from "../../Lib/Servers";
 import ServerSearch from "../../Components/ServerSearch/ServerSearch";
 import { useNavigate, useSearchParams } from "react-router-dom";
 import { Spinner } from "react-bootstrap";
 import Cookies from "js-cookie";
 
-type serverListAction = { type: "CLEAR" } | { type: "SET", payload: Server[] };
-
-const serverReducer = (state: Server[], action: serverListAction): Server[] => {
-  switch (action.type) {
-    case "CLEAR":
-      return [];
-    case "SET":
-      return action.payload;
-    default:
-      return state;
-  }
-}
 
 const Search = () => {
   const [searchParams] = useSearchParams();
-  // const [servers, setServers] = useState<Array<Server>>([]);
-  const [servers, serversDispatch] = useReducer(serverReducer, []);
+  const [servers, setServers] = useState<Array<Server>>([]);
   const navigate = useNavigate();
   const sessionCookie = Cookies.get("session");
 
   const searchTerm = searchParams.get("search") || "";
 
   useEffect(() => {
-    serversDispatch({ type: "CLEAR" });
-
     if (!sessionCookie) {
       navigate("/login");
       return;
@@ -58,11 +43,11 @@ const Search = () => {
         navigate("/");
       }
 
-      serversDispatch({ type: "SET", payload: workingServers });
+      setServers(workingServers);
     }).catch(e => {
       alert(e);
     });
-  }, [searchTerm, navigate, sessionCookie]);
+  }, [searchTerm, navigate]);
 
   return (
     <>