From 976781d4709e14ed38ec0daf3439efc17ab242fc Mon Sep 17 00:00:00 2001 From: TOomaAh Date: Wed, 23 Oct 2024 12:36:37 +0200 Subject: [PATCH] fix: wrong language with tmdb indexer --- server/api/indexer/tvdb/index.ts | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/server/api/indexer/tvdb/index.ts b/server/api/indexer/tvdb/index.ts index a562a999..195d42a2 100644 --- a/server/api/indexer/tvdb/index.ts +++ b/server/api/indexer/tvdb/index.ts @@ -72,15 +72,11 @@ class Tvdb extends ExternalAPI implements TvShowIndexer { language?: string; }): Promise { try { - const tmdbTvShow = await this.tmdb.getTvShow({ tvId }); + const tmdbTvShow = await this.tmdb.getTvShow({ tvId, language }); const tvdbId = this.getTvdbIdFromTmdb(tmdbTvShow); if (this.isValidTvdbId(tvdbId)) { - return await this.enrichTmdbShowWithTvdbData( - tmdbTvShow, - tvdbId, - language - ); + return await this.enrichTmdbShowWithTvdbData(tmdbTvShow, tvdbId); } return tmdbTvShow; @@ -104,14 +100,14 @@ class Tvdb extends ExternalAPI implements TvShowIndexer { } try { - const tmdbTvShow = await this.tmdb.getTvShow({ tvId }); + const tmdbTvShow = await this.tmdb.getTvShow({ tvId, language }); const tvdbId = this.getTvdbIdFromTmdb(tmdbTvShow); if (!this.isValidTvdbId(tvdbId)) { return await this.tmdb.getTvSeason({ tvId, seasonNumber, language }); } - return await this.getTvdbSeasonData(tvdbId, seasonNumber, tvId, language); + return await this.getTvdbSeasonData(tvdbId, seasonNumber, tvId); } catch (error) { logger.error( `[TVDB] Failed to fetch TV season details: ${error.message}` @@ -126,11 +122,10 @@ class Tvdb extends ExternalAPI implements TvShowIndexer { private async enrichTmdbShowWithTvdbData( tmdbTvShow: TmdbTvDetails, - tvdbId: ValidTvdbId, - language: string + tvdbId: ValidTvdbId ): Promise { try { - const tvdbData = await this.fetchTvdbShowData(tvdbId, language); + const tvdbData = await this.fetchTvdbShowData(tvdbId); const seasons = this.processSeasons(tvdbData); return { ...tmdbTvShow, seasons }; } catch (error) { @@ -141,12 +136,9 @@ class Tvdb extends ExternalAPI implements TvShowIndexer { } } - private async fetchTvdbShowData( - tvdbId: number, - language: string - ): Promise { + private async fetchTvdbShowData(tvdbId: number): Promise { return await this.get( - `/${language}/${tvdbId}`, + `/en/${tvdbId}`, {}, Tvdb.DEFAULT_CACHE_TTL ); @@ -183,10 +175,9 @@ class Tvdb extends ExternalAPI implements TvShowIndexer { private async getTvdbSeasonData( tvdbId: number, seasonNumber: number, - tvId: number, - language: string + tvId: number ): Promise { - const tvdbSeason = await this.fetchTvdbShowData(tvdbId, language); + const tvdbSeason = await this.fetchTvdbShowData(tvdbId); const episodes = this.processEpisodes(tvdbSeason, seasonNumber, tvId);