Compare commits

..

2 Commits

Author SHA1 Message Date
gauthier-th
bd42194f61 fix: add more logs for pingToken 2025-03-16 22:41:27 +01:00
Gauthier
77a36f9714 fix(job): resolve edge case issue with season availability updates (#1483)
Ensure media availability updates correctly for shows marked as UNKNOWN and yet having AVAILABLE or
PARTIALLY_AVAILABLE seasons
2025-03-16 21:57:14 +01:00
3 changed files with 55 additions and 41 deletions

View File

@@ -378,6 +378,7 @@ class PlexTvAPI extends ExternalAPI {
logger.error('Failed to ping token', {
label: 'Plex Refresh Token',
errorMessage: e.message,
errorCause: e.cause,
});
}
}

View File

@@ -1,6 +1,5 @@
import ExternalAPI from '@server/api/externalapi';
import cacheManager from '@server/lib/cache';
import { getSettings } from '@server/lib/settings';
import { sortBy } from 'lodash';
import type {
TmdbCollection,
@@ -100,7 +99,6 @@ interface DiscoverTvOptions {
}
class TheMovieDb extends ExternalAPI {
private locale: string;
private discoverRegion?: string;
private originalLanguage?: string;
constructor({
@@ -120,7 +118,6 @@ class TheMovieDb extends ExternalAPI {
},
}
);
this.locale = getSettings().main?.locale || 'en';
this.discoverRegion = discoverRegion;
this.originalLanguage = originalLanguage;
}
@@ -129,7 +126,7 @@ class TheMovieDb extends ExternalAPI {
query,
page = 1,
includeAdult = false,
language = this.locale,
language = 'en',
}: SearchOptions): Promise<TmdbSearchMultiResponse> => {
try {
const data = await this.get<TmdbSearchMultiResponse>('/search/multi', {
@@ -154,7 +151,7 @@ class TheMovieDb extends ExternalAPI {
query,
page = 1,
includeAdult = false,
language = this.locale,
language = 'en',
year,
}: SingleSearchOptions): Promise<TmdbSearchMovieResponse> => {
try {
@@ -181,7 +178,7 @@ class TheMovieDb extends ExternalAPI {
query,
page = 1,
includeAdult = false,
language = this.locale,
language = 'en',
year,
}: SingleSearchOptions): Promise<TmdbSearchTvResponse> => {
try {
@@ -206,7 +203,7 @@ class TheMovieDb extends ExternalAPI {
public getPerson = async ({
personId,
language = this.locale,
language = 'en',
}: {
personId: number;
language?: string;
@@ -224,7 +221,7 @@ class TheMovieDb extends ExternalAPI {
public getPersonCombinedCredits = async ({
personId,
language = this.locale,
language = 'en',
}: {
personId: number;
language?: string;
@@ -247,7 +244,7 @@ class TheMovieDb extends ExternalAPI {
public getMovie = async ({
movieId,
language = this.locale,
language = 'en',
}: {
movieId: number;
language?: string;
@@ -272,7 +269,7 @@ class TheMovieDb extends ExternalAPI {
public getTvShow = async ({
tvId,
language = this.locale,
language = 'en',
}: {
tvId: number;
language?: string;
@@ -322,7 +319,7 @@ class TheMovieDb extends ExternalAPI {
public async getMovieRecommendations({
movieId,
page = 1,
language = this.locale,
language = 'en',
}: {
movieId: number;
page?: number;
@@ -346,7 +343,7 @@ class TheMovieDb extends ExternalAPI {
public async getMovieSimilar({
movieId,
page = 1,
language = this.locale,
language = 'en',
}: {
movieId: number;
page?: number;
@@ -370,7 +367,7 @@ class TheMovieDb extends ExternalAPI {
public async getMoviesByKeyword({
keywordId,
page = 1,
language = this.locale,
language = 'en',
}: {
keywordId: number;
page?: number;
@@ -394,7 +391,7 @@ class TheMovieDb extends ExternalAPI {
public async getTvRecommendations({
tvId,
page = 1,
language = this.locale,
language = 'en',
}: {
tvId: number;
page?: number;
@@ -420,7 +417,7 @@ class TheMovieDb extends ExternalAPI {
public async getTvSimilar({
tvId,
page = 1,
language = this.locale,
language = 'en',
}: {
tvId: number;
page?: number;
@@ -442,7 +439,7 @@ class TheMovieDb extends ExternalAPI {
sortBy = 'popularity.desc',
page = 1,
includeAdult = false,
language = this.locale,
language = 'en',
primaryReleaseDateGte,
primaryReleaseDateLte,
originalLanguage,
@@ -513,7 +510,7 @@ class TheMovieDb extends ExternalAPI {
public getDiscoverTv = async ({
sortBy = 'popularity.desc',
page = 1,
language = this.locale,
language = 'en',
firstAirDateGte,
firstAirDateLte,
includeEmptyReleaseDate = false,
@@ -588,7 +585,7 @@ class TheMovieDb extends ExternalAPI {
public getUpcomingMovies = async ({
page = 1,
language = this.locale,
language = 'en',
}: {
page: number;
language: string;
@@ -613,7 +610,7 @@ class TheMovieDb extends ExternalAPI {
public getAllTrending = async ({
page = 1,
timeWindow = 'day',
language = this.locale,
language = 'en',
}: {
page?: number;
timeWindow?: 'day' | 'week';
@@ -680,7 +677,7 @@ class TheMovieDb extends ExternalAPI {
public async getByExternalId({
externalId,
type,
language = this.locale,
language = 'en',
}:
| {
externalId: string;
@@ -709,7 +706,7 @@ class TheMovieDb extends ExternalAPI {
public async getMediaByImdbId({
imdbId,
language = this.locale,
language = 'en',
}: {
imdbId: string;
language?: string;
@@ -748,7 +745,7 @@ class TheMovieDb extends ExternalAPI {
public async getShowByTvdbId({
tvdbId,
language = this.locale,
language = 'en',
}: {
tvdbId: number;
language?: string;
@@ -778,7 +775,7 @@ class TheMovieDb extends ExternalAPI {
public async getCollection({
collectionId,
language = this.locale,
language = 'en',
}: {
collectionId: number;
language?: string;
@@ -852,7 +849,7 @@ class TheMovieDb extends ExternalAPI {
}
public async getMovieGenres({
language = this.locale,
language = 'en',
}: {
language?: string;
} = {}): Promise<TmdbGenre[]> {
@@ -899,7 +896,7 @@ class TheMovieDb extends ExternalAPI {
}
public async getTvGenres({
language = this.locale,
language = 'en',
}: {
language?: string;
} = {}): Promise<TmdbGenre[]> {

View File

@@ -404,6 +404,34 @@ class AvailabilitySync {
});
}
if (
!showExists &&
(media.status === MediaStatus.AVAILABLE ||
media.status === MediaStatus.PARTIALLY_AVAILABLE ||
media.seasons.some(
(season) => season.status === MediaStatus.AVAILABLE
) ||
media.seasons.some(
(season) => season.status === MediaStatus.PARTIALLY_AVAILABLE
))
) {
await this.mediaUpdater(media, false, mediaServerType);
}
if (
!showExists4k &&
(media.status4k === MediaStatus.AVAILABLE ||
media.status4k === MediaStatus.PARTIALLY_AVAILABLE ||
media.seasons.some(
(season) => season.status4k === MediaStatus.AVAILABLE
) ||
media.seasons.some(
(season) => season.status4k === MediaStatus.PARTIALLY_AVAILABLE
))
) {
await this.mediaUpdater(media, true, mediaServerType);
}
// TODO: Figure out how to run seasonUpdater for each season
if ([...finalSeasons.values()].includes(false)) {
@@ -423,22 +451,6 @@ class AvailabilitySync {
mediaServerType
);
}
if (
!showExists &&
(media.status === MediaStatus.AVAILABLE ||
media.status === MediaStatus.PARTIALLY_AVAILABLE)
) {
await this.mediaUpdater(media, false, mediaServerType);
}
if (
!showExists4k &&
(media.status4k === MediaStatus.AVAILABLE ||
media.status4k === MediaStatus.PARTIALLY_AVAILABLE)
) {
await this.mediaUpdater(media, true, mediaServerType);
}
}
}
} catch (ex) {
@@ -466,6 +478,10 @@ class AvailabilitySync {
{ status: MediaStatus.PARTIALLY_AVAILABLE },
{ status4k: MediaStatus.AVAILABLE },
{ status4k: MediaStatus.PARTIALLY_AVAILABLE },
{ seasons: { status: MediaStatus.AVAILABLE } },
{ seasons: { status: MediaStatus.PARTIALLY_AVAILABLE } },
{ seasons: { status4k: MediaStatus.AVAILABLE } },
{ seasons: { status4k: MediaStatus.PARTIALLY_AVAILABLE } },
];
let mediaPage: Media[];