open-source-mirrors
/
overseerr
mirror of https://github.com/sct/overseerr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(search): fully rewrote the mapSearchResults function (14s to 2s)

Browse Source
pull/3800/merge^2
Anatole Sot 3 months ago
parent ad168dcbcd
commit 36ed95299c
4 changed files with 100 additions and 85 deletions
Show Stats Download Patch File Download Diff File

16
server/models/Collection.ts
Unescape View File

@ -14,20 +14,22 @@ export interface Collection {
parts: MovieResult[];
}
export const mapCollection = (
export const mapCollection = async (
collection: TmdbCollection,
media: Media[]
): Collection => ({
): Promise<Collection> => ({
id: collection.id,
name: collection.name,
overview: collection.overview,
posterPath: collection.poster_path,
backdropPath: collection.backdrop_path,
parts: sortBy(collection.parts, 'release_date').map((part) =>
mapMovieResult(
part,
media?.find(
(req) => req.tmdbId === part.id && req.mediaType === MediaType.MOVIE
parts: await Promise.all(
sortBy(collection.parts, 'release_date').map((part) =>
mapMovieResult(
part,
media?.find(
(req) => req.tmdbId === part.id && req.mediaType === MediaType.MOVIE
)
)
)
),

141
server/models/Search.ts
Unescape View File

@ -19,7 +19,6 @@ import type {
TmdbTvDetails,
TmdbTvResult,
} from '@server/api/themoviedb/interfaces';
import { MediaType as MainMediaType } from '@server/constants/media';
import type Media from '@server/entity/Media';
export type MediaType =
@ -192,10 +191,10 @@ export type MixedSearchResponse = {
)[];
};
export const mapMovieResult = (
export const mapMovieResult = async (
movieResult: TmdbMovieResult,
media?: Media
): MovieResult => ({
): Promise<MovieResult> => ({
id: movieResult.id,
mediaType: 'movie',
adult: movieResult.adult,
@ -214,10 +213,10 @@ export const mapMovieResult = (
mediaInfo: media,
});
export const mapTvResult = (
export const mapTvResult = async (
tvResult: TmdbTvResult,
media?: Media
): TvResult => ({
): Promise<TvResult> => ({
id: tvResult.id,
firstAirDate: tvResult.first_air_date,
genreIds: tvResult.genre_ids,
@ -236,9 +235,11 @@ export const mapTvResult = (
mediaInfo: media,
});
export const mapCollectionResult = (
collectionResult: TmdbCollectionResult
): CollectionResult => ({
export const mapCollectionResult = async (
collectionResult: TmdbCollectionResult,
// eslint-disable-next-line @typescript-eslint/no-unused-vars
_media?: Media
): Promise<CollectionResult> => ({
id: collectionResult.id,
mediaType: collectionResult.media_type || 'collection',
adult: collectionResult.adult,
@ -250,22 +251,26 @@ export const mapCollectionResult = (
posterPath: collectionResult.poster_path,
});
export const mapPersonResult = (
personResult: TmdbPersonResult
): PersonResult => ({
export const mapPersonResult = async (
personResult: TmdbPersonResult,
// eslint-disable-next-line @typescript-eslint/no-unused-vars
_media?: Media
): Promise<PersonResult> => ({
id: personResult.id,
name: personResult.name,
popularity: personResult.popularity,
adult: personResult.adult,
mediaType: personResult.media_type,
profilePath: personResult.profile_path,
knownFor: personResult.known_for.map((result) => {
if (result.media_type === 'movie') {
return mapMovieResult(result);
}
knownFor: await Promise.all(
personResult.known_for.map((result) => {
if (result.media_type === 'movie') {
return mapMovieResult(result);
}
return mapTvResult(result);
}),
return mapTvResult(result);
})
),
});
export const mapReleaseGroupResult = async (
@ -335,7 +340,9 @@ export const mapReleaseResult = async (
});
export const mapRecordingResult = async (
recording: mbRecording
recording: mbRecording,
// eslint-disable-next-line @typescript-eslint/no-unused-vars
_media?: Media
): Promise<RecordingResult> => ({
id: recording.id,
mediaType: recording.media_type,
@ -348,7 +355,11 @@ export const mapRecordingResult = async (
tags: recording.tags,
});
export const mapWorkResult = async (work: mbWork): Promise<WorkResult> => ({
export const mapWorkResult = async (
work: mbWork,
// eslint-disable-next-line @typescript-eslint/no-unused-vars
_media?: Media
): Promise<WorkResult> => ({
id: work.id,
mediaType: work.media_type,
title: work.title,
@ -358,7 +369,7 @@ export const mapWorkResult = async (work: mbWork): Promise<WorkResult> => ({
tags: work.tags,
});
export const mapSearchResults = async (
export const mapSearchResults = (
results: (
| TmdbMovieResult
| TmdbTvResult
@ -371,56 +382,48 @@ export const mapSearchResults = async (
| mbWork
)[],
media?: Media[]
): Promise<Results[]> =>
await Promise.all(
results.map((result) => {
switch (result.media_type) {
case 'movie':
return mapMovieResult(
result,
media?.find(
(req) =>
req.tmdbId === result.id &&
req.mediaType === MainMediaType.MOVIE
)
);
case 'tv':
return mapTvResult(
result,
media?.find(
(req) =>
req.tmdbId === result.id && req.mediaType === MainMediaType.TV
)
);
case 'collection':
return mapCollectionResult(result);
case 'person':
return mapPersonResult(result);
case 'release-group':
return mapReleaseGroupResult(
result,
media?.find((req) => req.mbId === result.id)
);
case 'release':
return mapReleaseResult(
result,
media?.find((req) => req.mbId === result.id)
);
case 'recording':
return mapRecordingResult(result);
case 'work':
return mapWorkResult(result);
case 'artist':
return mapArtistResult(
result,
media?.find((req) => req.mbId === result.id)
);
default:
return result;
}
})
);
): Promise<Results[]> => {
const mediaLookup = new Map();
if (media) {
media.forEach((item) => {
mediaLookup.set(item.tmdbId || item.mbId, item);
});
}
const mapFunctions = {
movie: mapMovieResult,
tv: mapTvResult,
collection: mapCollectionResult,
person: mapPersonResult,
'release-group': mapReleaseGroupResult,
release: mapReleaseResult,
recording: mapRecordingResult,
work: mapWorkResult,
artist: mapArtistResult,
};
const transformResults = (
result:
| TmdbMovieResult
| TmdbTvResult
| TmdbPersonResult
| TmdbCollectionResult
| mbArtist
| mbRecording
| mbRelease
| mbReleaseGroup
| mbWork
) => {
const mapFunction: (result: any, media?: Media) => Promise<any> =
mapFunctions[result.media_type];
if (mapFunction) {
const mediaItem = mediaLookup.get(result.id);
return mapFunction(result, mediaItem);
}
};
return Promise.all(results.map((result) => transformResults(result)));
};
export const mapMovieDetailsToResult = (
movieDetails: TmdbMovieDetails
): TmdbMovieResult => ({

2
server/routes/collection.ts
Unescape View File

@ -19,7 +19,7 @@ collectionRoutes.get<{ id: string }>('/:id', async (req, res, next) => {
collection.parts.map((part) => part.id)
);
return res.status(200).json(mapCollection(collection, media));
return res.status(200).json(await mapCollection(collection, media));
} catch (e) {
logger.debug('Something went wrong retrieving collection', {
label: 'API',

26
server/routes/search.ts
Unescape View File

@ -14,6 +14,7 @@ import { Router } from 'express';
const searchRoutes = Router();
searchRoutes.get('/', async (req, res, next) => {
console.time('search');
const queryString = req.query.query as string;
const searchProvider = findSearchProvider(queryString.toLowerCase());
let results:
@ -32,30 +33,35 @@ searchRoutes.get('/', async (req, res, next) => {
query: queryString,
});
} else {
console.time('initTmdb');
const tmdb = new TheMovieDb();
console.timeEnd('initTmdb');
console.time('searchMultiTmdb');
results = await tmdb.searchMulti({
query: queryString,
page: Number(req.query.page),
language: (req.query.language as string) ?? req.locale,
});
console.timeEnd('searchMultiTmdb');
console.time('initMb');
const mb = new MusicBrainz();
console.timeEnd('initMb');
console.time('searchMultiMb');
const mbResults = await mb.searchMulti({
query: queryString,
page: Number(req.query.page),
});
console.timeEnd('searchMultiMb');
const releaseResults = mbResults.releaseResults;
const artistResults = mbResults.artistResults;
console.time('mergeResults');
results = {
...results,
results: [...results.results, ...artistResults, ...releaseResults],
};
console.timeEnd('mergeResults');
}
console.time('getRelatedMedia');
const mbIds = results.results
.filter((result) => typeof result.id === 'string')
.map((result) => result.id as string);
@ -65,12 +71,16 @@ searchRoutes.get('/', async (req, res, next) => {
.map((result) => result.id as number);
const media = await Media.getRelatedMedia(tmdbIds, mbIds);
console.timeEnd('getRelatedMedia');
console.time('mapSearchResults');
const mappedResults = await mapSearchResults(results.results, media);
console.timeEnd('mapSearchResults');
console.timeEnd('search');
return res.status(200).json({
page: results.page,
totalPages: results.total_pages,
totalResults: results.total_results,
results: await mapSearchResults(results.results, media),
results: mappedResults,
});
} catch (e) {
logger.debug('Something went wrong retrieving search results', {

Write Preview
Loading…
Cancel
Save