Merge branch 'develop' into feat-media-availability-sync-emby/jellyfin-support

fix: disable seasonfolder option in sonarr for jellyfin/Emby users

server/api/jellyfin.ts

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import availabilitySync from '@server/lib/availabilitySync';
 import logger from '@server/logger';
 import type { AxiosInstance } from 'axios';
 import axios from 'axios';
@@ -241,7 +242,9 @@ class JellyfinAPI {
     }
   }
 
-  public async getItemData(id: string): Promise<JellyfinLibraryItemExtended> {
+  public async getItemData(
+    id: string
+  ): Promise<JellyfinLibraryItemExtended | undefined> {
     try {
       const contents = await this.axios.get<any>(
         `/Users/${this.userId}/Items/${id}`
@@ -249,6 +252,11 @@ class JellyfinAPI {
 
       return contents.data;
     } catch (e) {
+      if (availabilitySync.running) {
+        if (e.response && e.response.status === 500) {
+          return undefined;
+        }
+      }
       logger.error(
         `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
         { label: 'Jellyfin API' }

server/job/schedule.ts

@@ -1,6 +1,11 @@
 import { MediaServerType } from '@server/constants/server';
+import availabilitySync from '@server/lib/availabilitySync';
 import downloadTracker from '@server/lib/downloadtracker';
 import ImageProxy from '@server/lib/imageproxy';
+import {
+  jellyfinFullScanner,
+  jellyfinRecentScanner,
+} from '@server/lib/scanners/jellyfin';
 import { plexFullScanner, plexRecentScanner } from '@server/lib/scanners/plex';
 import { radarrScanner } from '@server/lib/scanners/radarr';
 import { sonarrScanner } from '@server/lib/scanners/sonarr';
@@ -10,7 +15,6 @@ import watchlistSync from '@server/lib/watchlistsync';
 import logger from '@server/logger';
 import random from 'lodash/random';
 import schedule from 'node-schedule';
-import { jobJellyfinFullSync, jobJellyfinRecentSync } from './jellyfinsync';
 
 interface ScheduledJob {
   id: JobId;
@@ -73,38 +77,38 @@ export const startJobs = (): void => {
     // Run recently added jellyfin sync every 5 minutes
     scheduledJobs.push({
       id: 'jellyfin-recently-added-scan',
-      name: 'Jellyfin Recently Added Sync',
+      name: 'Jellyfin Recently Added Scan',
       type: 'process',
       interval: 'minutes',
       cronSchedule: jobs['jellyfin-recently-added-scan'].schedule,
       job: schedule.scheduleJob(
         jobs['jellyfin-recently-added-scan'].schedule,
         () => {
-          logger.info('Starting scheduled job: Jellyfin Recently Added Sync', {
+          logger.info('Starting scheduled job: Jellyfin Recently Added Scan', {
             label: 'Jobs',
           });
-          jobJellyfinRecentSync.run();
+          jellyfinRecentScanner.run();
         }
       ),
-      running: () => jobJellyfinRecentSync.status().running,
-      cancelFn: () => jobJellyfinRecentSync.cancel(),
+      running: () => jellyfinRecentScanner.status().running,
+      cancelFn: () => jellyfinRecentScanner.cancel(),
     });
 
     // Run full jellyfin sync every 24 hours
     scheduledJobs.push({
       id: 'jellyfin-full-scan',
-      name: 'Jellyfin Full Library Sync',
+      name: 'Jellyfin Full Library Scan',
       type: 'process',
       interval: 'hours',
       cronSchedule: jobs['jellyfin-full-scan'].schedule,
       job: schedule.scheduleJob(jobs['jellyfin-full-scan'].schedule, () => {
-        logger.info('Starting scheduled job: Jellyfin Full Sync', {
+        logger.info('Starting scheduled job: Jellyfin Full Scan', {
           label: 'Jobs',
         });
-        jobJellyfinFullSync.run();
+        jellyfinFullScanner.run();
       }),
-      running: () => jobJellyfinFullSync.status().running,
-      cancelFn: () => jobJellyfinFullSync.cancel(),
+      running: () => jellyfinFullScanner.status().running,
+      cancelFn: () => jellyfinFullScanner.cancel(),
     });
   }
 
@@ -164,7 +168,7 @@ export const startJobs = (): void => {
   });
 
   // Checks if media is still available in plex/sonarr/radarr libs
-  /*  scheduledJobs.push({
+  scheduledJobs.push({
     id: 'availability-sync',
     name: 'Media Availability Sync',
     type: 'process',
@@ -179,7 +183,6 @@ export const startJobs = (): void => {
     running: () => availabilitySync.running,
     cancelFn: () => availabilitySync.cancel(),
   });
-*/
 
   // Run download sync every minute
   scheduledJobs.push({

server/lib/availabilitySync.ts

@@ -1,9 +1,12 @@
+import type { JellyfinLibraryItem } from '@server/api/jellyfin';
+import JellyfinAPI from '@server/api/jellyfin';
 import type { PlexMetadata } from '@server/api/plexapi';
 import PlexAPI from '@server/api/plexapi';
 import RadarrAPI, { type RadarrMovie } from '@server/api/servarr/radarr';
 import type { SonarrSeason, SonarrSeries } from '@server/api/servarr/sonarr';
 import SonarrAPI from '@server/api/servarr/sonarr';
 import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
+import { MediaServerType } from '@server/constants/server';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import MediaRequest from '@server/entity/MediaRequest';
@@ -18,14 +21,20 @@ class AvailabilitySync {
   public running = false;
   private plexClient: PlexAPI;
   private plexSeasonsCache: Record<string, PlexMetadata[]>;
+
+  private jellyfinClient: JellyfinAPI;
+  private jellyfinSeasonsCache: Record<string, JellyfinLibraryItem[]>;
+
   private sonarrSeasonsCache: Record<string, SonarrSeason[]>;
   private radarrServers: RadarrSettings[];
   private sonarrServers: SonarrSettings[];
 
   async run() {
     const settings = getSettings();
+    const mediaServerType = getSettings().main.mediaServerType;
     this.running = true;
     this.plexSeasonsCache = {};
+    this.jellyfinSeasonsCache = {};
     this.sonarrSeasonsCache = {};
     this.radarrServers = settings.radarr.filter((server) => server.syncEnabled);
     this.sonarrServers = settings.sonarr.filter((server) => server.syncEnabled);
@@ -37,13 +46,53 @@ class AvailabilitySync {
       const pageSize = 50;
 
       const userRepository = getRepository(User);
-      const admin = await userRepository.findOne({
-        select: { id: true, plexToken: true },
-        where: { id: 1 },
-      });
 
-      if (admin) {
-        this.plexClient = new PlexAPI({ plexToken: admin.plexToken });
+      // If it is plex admin is selected using plexToken if jellyfin admin is selected using jellyfinUserID
+
+      let admin = null;
+
+      if (mediaServerType === MediaServerType.PLEX) {
+        admin = await userRepository.findOne({
+          select: { id: true, plexToken: true },
+          where: { id: 1 },
+        });
+      } else if (
+        mediaServerType === MediaServerType.JELLYFIN ||
+        mediaServerType === MediaServerType.EMBY
+      ) {
+        admin = await userRepository.findOne({
+          where: { id: 1 },
+          select: [
+            'id',
+            'jellyfinAuthToken',
+            'jellyfinUserId',
+            'jellyfinDeviceId',
+          ],
+          order: { id: 'ASC' },
+        });
+      }
+
+      if (mediaServerType === MediaServerType.PLEX) {
+        if (admin && admin.plexToken) {
+          this.plexClient = new PlexAPI({ plexToken: admin.plexToken });
+        } else {
+          logger.error('Plex admin is not configured.');
+        }
+      } else if (
+        mediaServerType === MediaServerType.JELLYFIN ||
+        mediaServerType === MediaServerType.EMBY
+      ) {
+        if (admin) {
+          this.jellyfinClient = new JellyfinAPI(
+            settings.jellyfin.hostname ?? '',
+            admin.jellyfinAuthToken,
+            admin.jellyfinDeviceId
+          );
+
+          this.jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
+        } else {
+          logger.error('Jellyfin admin is not configured.');
+        }
       } else {
         logger.error('An admin is not configured.');
       }
@@ -60,41 +109,84 @@ class AvailabilitySync {
           let movieExists = false;
           let movieExists4k = false;
 
-          const { existsInPlex } = await this.mediaExistsInPlex(media, false);
-          const { existsInPlex: existsInPlex4k } = await this.mediaExistsInPlex(
-            media,
-            true
-          );
+          // if (mediaServerType === MediaServerType.PLEX) {
+          //   await this.mediaExistsInPlex(media, false);
+          // } else if (
+          //   mediaServerType === MediaServerType.JELLYFIN ||
+          //   mediaServerType === MediaServerType.EMBY
+          // ) {
+          //   await this.mediaExistsInJellyfin(media, false);
+          // }
 
           const existsInRadarr = await this.mediaExistsInRadarr(media, false);
           const existsInRadarr4k = await this.mediaExistsInRadarr(media, true);
 
-          if (existsInPlex || existsInRadarr) {
-            movieExists = true;
-            logger.info(
-              `The non-4K movie [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
-              {
-                label: 'AvailabilitySync',
-              }
-            );
+          // plex
+          if (mediaServerType === MediaServerType.PLEX) {
+            const { existsInPlex } = await this.mediaExistsInPlex(media, false);
+            const { existsInPlex: existsInPlex4k } =
+              await this.mediaExistsInPlex(media, true);
+
+            if (existsInPlex || existsInRadarr) {
+              movieExists = true;
+              logger.info(
+                `The non-4K movie [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
+                {
+                  label: 'AvailabilitySync',
+                }
+              );
+            }
+
+            if (existsInPlex4k || existsInRadarr4k) {
+              movieExists4k = true;
+              logger.info(
+                `The 4K movie [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
+                {
+                  label: 'AvailabilitySync',
+                }
+              );
+            }
           }
 
-          if (existsInPlex4k || existsInRadarr4k) {
-            movieExists4k = true;
-            logger.info(
-              `The 4K movie [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
-              {
-                label: 'AvailabilitySync',
-              }
+          //jellyfin
+          if (
+            mediaServerType === MediaServerType.JELLYFIN ||
+            mediaServerType === MediaServerType.EMBY
+          ) {
+            const { existsInJellyfin } = await this.mediaExistsInJellyfin(
+              media,
+              false
             );
+            const { existsInJellyfin: existsInJellyfin4k } =
+              await this.mediaExistsInJellyfin(media, true);
+
+            if (existsInJellyfin || existsInRadarr) {
+              movieExists = true;
+              logger.info(
+                `The non-4K movie [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
+                {
+                  label: 'AvailabilitySync',
+                }
+              );
+            }
+
+            if (existsInJellyfin4k || existsInRadarr4k) {
+              movieExists4k = true;
+              logger.info(
+                `The 4K movie [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
+                {
+                  label: 'AvailabilitySync',
+                }
+              );
+            }
           }
 
           if (!movieExists && media.status === MediaStatus.AVAILABLE) {
-            await this.mediaUpdater(media, false);
+            await this.mediaUpdater(media, false, mediaServerType);
           }
 
           if (!movieExists4k && media.status4k === MediaStatus.AVAILABLE) {
-            await this.mediaUpdater(media, true);
+            await this.mediaUpdater(media, true, mediaServerType);
           }
         }
 
@@ -104,6 +196,8 @@ class AvailabilitySync {
           let showExists = false;
           let showExists4k = false;
 
+          //plex
+
           const { existsInPlex, seasonsMap: plexSeasonsMap = new Map() } =
             await this.mediaExistsInPlex(media, false);
           const {
@@ -111,6 +205,16 @@ class AvailabilitySync {
             seasonsMap: plexSeasonsMap4k = new Map(),
           } = await this.mediaExistsInPlex(media, true);
 
+          //jellyfin
+          const {
+            existsInJellyfin,
+            seasonsMap: jellyfinSeasonsMap = new Map(),
+          } = await this.mediaExistsInJellyfin(media, false);
+          const {
+            existsInJellyfin: existsInJellyfin4k,
+            seasonsMap: jellyfinSeasonsMap4k = new Map(),
+          } = await this.mediaExistsInJellyfin(media, true);
+
           const { existsInSonarr, seasonsMap: sonarrSeasonsMap } =
             await this.mediaExistsInSonarr(media, false);
           const {
@@ -118,24 +222,60 @@ class AvailabilitySync {
             seasonsMap: sonarrSeasonsMap4k,
           } = await this.mediaExistsInSonarr(media, true);
 
-          if (existsInPlex || existsInSonarr) {
-            showExists = true;
-            logger.info(
-              `The non-4K show [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
-              {
-                label: 'AvailabilitySync',
-              }
-            );
+          //plex
+          if (mediaServerType === MediaServerType.PLEX) {
+            if (existsInPlex || existsInSonarr) {
+              showExists = true;
+              logger.info(
+                `The non-4K show [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
+                {
+                  label: 'AvailabilitySync',
+                }
+              );
+            }
           }
 
-          if (existsInPlex4k || existsInSonarr4k) {
-            showExists4k = true;
-            logger.info(
-              `The 4K show [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
-              {
-                label: 'AvailabilitySync',
-              }
-            );
+          if (mediaServerType === MediaServerType.PLEX) {
+            if (existsInPlex4k || existsInSonarr4k) {
+              showExists4k = true;
+              logger.info(
+                `The 4K show [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
+                {
+                  label: 'AvailabilitySync',
+                }
+              );
+            }
+          }
+
+          //jellyfin
+          if (
+            mediaServerType === MediaServerType.JELLYFIN ||
+            mediaServerType === MediaServerType.EMBY
+          ) {
+            if (existsInJellyfin || existsInSonarr) {
+              showExists = true;
+              logger.info(
+                `The non-4K show [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
+                {
+                  label: 'AvailabilitySync',
+                }
+              );
+            }
+          }
+
+          if (
+            mediaServerType === MediaServerType.JELLYFIN ||
+            mediaServerType === MediaServerType.EMBY
+          ) {
+            if (existsInJellyfin4k || existsInSonarr4k) {
+              showExists4k = true;
+              logger.info(
+                `The 4K show [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
+                {
+                  label: 'AvailabilitySync',
+                }
+              );
+            }
           }
 
           // Here we will create a final map that will cross compare
@@ -155,11 +295,48 @@ class AvailabilitySync {
               filteredSeasonsMap.set(season.seasonNumber, false)
             );
 
-          const finalSeasons = new Map([
-            ...filteredSeasonsMap,
-            ...plexSeasonsMap,
-            ...sonarrSeasonsMap,
-          ]);
+          // non-4k
+          const finalSeasons: Map<number, boolean> = new Map();
+
+          if (mediaServerType === MediaServerType.PLEX) {
+            const plexMap = new Map([
+              ...plexSeasonsMap,
+              ...filteredSeasonsMap,
+              ...sonarrSeasonsMap,
+            ]);
+            plexMap.forEach((value, key) => {
+              finalSeasons.set(key, value);
+            });
+          } else if (
+            mediaServerType === MediaServerType.JELLYFIN ||
+            mediaServerType === MediaServerType.EMBY
+          ) {
+            // Adding values from jellyfinSeasonsMap
+            jellyfinSeasonsMap.forEach((value, key) => {
+              finalSeasons.set(key, value);
+            });
+
+            // Adding values from filteredSeasonsMap and handling missing keys
+            filteredSeasonsMap.forEach((value, key) => {
+              // Check if the key is missing in jellyfinSeasonsMap
+              if (!finalSeasons.has(key)) {
+                finalSeasons.set(key, value);
+              }
+            });
+
+            // Adding values from sonarrSeasonsMap and handling missing keys
+            sonarrSeasonsMap.forEach((value, key) => {
+              // Check if the key is missing in jellyfinSeasonsMap and filteredSeasonsMap
+              if (!finalSeasons.has(key)) {
+                finalSeasons.set(key, value);
+              }
+            });
+          }
+
+          // ...(mediaServerType === MediaServerType.PLEX ? plexSeasonsMap : []),
+          // ...(mediaServerType === MediaServerType.JELLYFIN ||
+          // mediaServerType === MediaServerType.EMBY  ? jellyfinSeasonsMap
+          //   : []),
 
           const filteredSeasonsMap4k: Map<number, boolean> = new Map();
 
@@ -173,18 +350,74 @@ class AvailabilitySync {
               filteredSeasonsMap4k.set(season.seasonNumber, false)
             );
 
-          const finalSeasons4k = new Map([
-            ...filteredSeasonsMap4k,
-            ...plexSeasonsMap4k,
-            ...sonarrSeasonsMap4k,
-          ]);
+          // const finalSeasons4k: Map<any, any> = new Map<any, any>([
+          //   ...(mediaServerType === MediaServerType.PLEX
+          //     ? plexSeasonsMap4k
+          //     : []),
+          //   ...(mediaServerType === MediaServerType.JELLYFIN ||
+          //   mediaServerType === MediaServerType.EMBY
+          //     ? jellyfinSeasonsMap4k
+          //     : []),
+          //   ...filteredSeasonsMap4k,
+          //   ...sonarrSeasonsMap4k,
+          // ]);
+
+          // 4k
+          const finalSeasons4k: Map<number, boolean> = new Map();
+
+          if (mediaServerType === MediaServerType.PLEX) {
+            const plexMap4k = new Map([
+              ...plexSeasonsMap4k,
+              ...filteredSeasonsMap4k,
+              ...sonarrSeasonsMap4k,
+            ]);
+            plexMap4k.forEach((value, key) => {
+              finalSeasons4k.set(key, value);
+            });
+          } else if (
+            mediaServerType === MediaServerType.JELLYFIN ||
+            mediaServerType === MediaServerType.EMBY
+          ) {
+            // Adding values from jellyfinSeasonsMap
+            jellyfinSeasonsMap4k.forEach((value, key) => {
+              finalSeasons4k.set(key, value);
+            });
+
+            // Adding values from filteredSeasonsMap and handling missing keys
+            filteredSeasonsMap4k.forEach((value, key) => {
+              // Check if the key is missing in jellyfinSeasonsMap
+              if (!finalSeasons4k.has(key)) {
+                finalSeasons4k.set(key, value);
+              }
+            });
+
+            // Adding values from sonarrSeasonsMap and handling missing keys
+            sonarrSeasonsMap4k.forEach((value, key) => {
+              // Check if the key is missing in jellyfinSeasonsMap and filteredSeasonsMap
+              if (!finalSeasons4k.has(key)) {
+                finalSeasons4k.set(key, value);
+              }
+            });
+          }
+
+          // TODO: Figure out how to run seasonUpdater for each season
 
           if ([...finalSeasons.values()].includes(false)) {
-            await this.seasonUpdater(media, finalSeasons, false);
+            await this.seasonUpdater(
+              media,
+              finalSeasons,
+              false,
+              mediaServerType
+            );
           }
 
           if ([...finalSeasons4k.values()].includes(false)) {
-            await this.seasonUpdater(media, finalSeasons4k, true);
+            await this.seasonUpdater(
+              media,
+              finalSeasons4k,
+              true,
+              mediaServerType
+            );
           }
 
           if (
@@ -192,7 +425,7 @@ class AvailabilitySync {
             (media.status === MediaStatus.AVAILABLE ||
               media.status === MediaStatus.PARTIALLY_AVAILABLE)
           ) {
-            await this.mediaUpdater(media, false);
+            await this.mediaUpdater(media, false, mediaServerType);
           }
 
           if (
@@ -200,7 +433,7 @@ class AvailabilitySync {
             (media.status4k === MediaStatus.AVAILABLE ||
               media.status4k === MediaStatus.PARTIALLY_AVAILABLE)
           ) {
-            await this.mediaUpdater(media, true);
+            await this.mediaUpdater(media, true, mediaServerType);
           }
         }
       }
@@ -272,7 +505,11 @@ class AvailabilitySync {
     return mediaStatus;
   }
 
-  private async mediaUpdater(media: Media, is4k: boolean): Promise<void> {
+  private async mediaUpdater(
+    media: Media,
+    is4k: boolean,
+    mediaServerType: MediaServerType
+  ): Promise<void> {
     const mediaRepository = getRepository(Media);
     const requestRepository = getRepository(MediaRequest);
 
@@ -320,17 +557,32 @@ class AvailabilitySync {
         mediaStatus === MediaStatus.PROCESSING
           ? media[is4k ? 'externalServiceSlug4k' : 'externalServiceSlug']
           : null;
-      media[is4k ? 'ratingKey4k' : 'ratingKey'] =
-        mediaStatus === MediaStatus.PROCESSING
-          ? media[is4k ? 'ratingKey4k' : 'ratingKey']
-          : null;
-
+      if (mediaServerType === MediaServerType.PLEX) {
+        media[is4k ? 'ratingKey4k' : 'ratingKey'] =
+          mediaStatus === MediaStatus.PROCESSING
+            ? media[is4k ? 'ratingKey4k' : 'ratingKey']
+            : undefined;
+      } else if (
+        mediaServerType === MediaServerType.JELLYFIN ||
+        mediaServerType === MediaServerType.EMBY
+      ) {
+        media[is4k ? 'jellyfinMediaId4k' : 'jellyfinMediaId'] =
+          mediaStatus === MediaStatus.PROCESSING
+            ? media[is4k ? 'jellyfinMediaId4k' : 'jellyfinMediaId']
+            : undefined;
+      }
       logger.info(
         `The ${is4k ? '4K' : 'non-4K'} ${
           media.mediaType === 'movie' ? 'movie' : 'show'
         } [TMDB ID ${media.tmdbId}] was not found in any ${
           media.mediaType === 'movie' ? 'Radarr' : 'Sonarr'
-        } and Plex instance. Status will be changed to unknown.`,
+        } and ${
+          mediaServerType === MediaServerType.PLEX
+            ? 'plex'
+            : mediaServerType === MediaServerType.JELLYFIN
+            ? 'jellyfin'
+            : 'emby'
+        } instance. Status will be changed to unknown.`,
         { label: 'AvailabilitySync' }
       );
 
@@ -358,7 +610,8 @@ class AvailabilitySync {
   private async seasonUpdater(
     media: Media,
     seasons: Map<number, boolean>,
-    is4k: boolean
+    is4k: boolean,
+    mediaServerType: MediaServerType
   ): Promise<void> {
     const mediaRepository = getRepository(Media);
     const seasonRequestRepository = getRepository(SeasonRequest);
@@ -370,6 +623,8 @@ class AvailabilitySync {
     );
     const seasonKeys = [...seasonsPendingRemoval.keys()];
 
+    // let isSeasonRemoved = false;
+
     try {
       // Need to check and see if there are any related season
       // requests. If they are, we will need to delete them.
@@ -420,7 +675,13 @@ class AvailabilitySync {
           media.tmdbId
         }] was not found in any ${
           media.mediaType === 'tv' ? 'Sonarr' : 'Radarr'
-        } and Plex instance. Status will be changed to unknown.`,
+        } and ${
+          mediaServerType === MediaServerType.PLEX
+            ? 'plex'
+            : mediaServerType === MediaServerType.JELLYFIN
+            ? 'jellyfin'
+            : 'emby'
+        } instance. Status will be changed to unknown.`,
         { label: 'AvailabilitySync' }
       );
     } catch (ex) {
@@ -604,6 +865,7 @@ class AvailabilitySync {
     return seasonExists;
   }
 
+  // Plex
   private async mediaExistsInPlex(
     media: Media,
     is4k: boolean
@@ -719,6 +981,123 @@ class AvailabilitySync {
 
     return seasonExistsInPlex;
   }
+
+  // Jellyfin
+  private async mediaExistsInJellyfin(
+    media: Media,
+    is4k: boolean
+  ): Promise<{ existsInJellyfin: boolean; seasonsMap?: Map<number, boolean> }> {
+    const ratingKey = media.jellyfinMediaId;
+    const ratingKey4k = media.jellyfinMediaId4k;
+    let existsInJellyfin = false;
+    let preventSeasonSearch = false;
+
+    // Check each jellyfin instance to see if the media still exists
+    // If found, we will assume the media exists and prevent removal
+    // We can use the cache we built when we fetched the series with mediaExistsInJellyfin
+    try {
+      let jellyfinMedia: JellyfinLibraryItem | undefined;
+
+      if (ratingKey && !is4k) {
+        jellyfinMedia = await this.jellyfinClient?.getItemData(ratingKey);
+
+        if (media.mediaType === 'tv' && jellyfinMedia !== undefined) {
+          this.jellyfinSeasonsCache[ratingKey] =
+            await this.jellyfinClient?.getSeasons(ratingKey);
+        }
+      }
+
+      if (ratingKey4k && is4k) {
+        jellyfinMedia = await this.jellyfinClient?.getItemData(ratingKey4k);
+
+        if (media.mediaType === 'tv' && jellyfinMedia !== undefined) {
+          this.jellyfinSeasonsCache[ratingKey4k] =
+            await this.jellyfinClient?.getSeasons(ratingKey4k);
+        }
+      }
+
+      if (jellyfinMedia) {
+        existsInJellyfin = true;
+      }
+    } catch (ex) {
+      if (!ex.message.includes('404' || '500')) {
+        existsInJellyfin = false;
+        preventSeasonSearch = true;
+        logger.debug(
+          `Failure retrieving the ${is4k ? '4K' : 'non-4K'} ${
+            media.mediaType === 'tv' ? 'show' : 'movie'
+          } [TMDB ID ${media.tmdbId}] from Jellyfin.`,
+          {
+            errorMessage: ex.message,
+            label: 'AvailabilitySync',
+          }
+        );
+      }
+    }
+
+    // Here we check each season in jellyfin for availability
+    // If the API returns an error other than a 404,
+    // we will have to prevent the season check from happening
+    if (media.mediaType === 'tv') {
+      const seasonsMap: Map<number, boolean> = new Map();
+
+      if (!preventSeasonSearch) {
+        const filteredSeasons = media.seasons.filter(
+          (season) =>
+            season[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE ||
+            season[is4k ? 'status4k' : 'status'] ===
+              MediaStatus.PARTIALLY_AVAILABLE
+        );
+
+        for (const season of filteredSeasons) {
+          const seasonExists = await this.seasonExistsInJellyfin(
+            media,
+            season,
+            is4k
+          );
+
+          if (seasonExists) {
+            seasonsMap.set(season.seasonNumber, true);
+          }
+        }
+      }
+
+      return { existsInJellyfin, seasonsMap };
+    }
+
+    return { existsInJellyfin };
+  }
+
+  private async seasonExistsInJellyfin(
+    media: Media,
+    season: Season,
+    is4k: boolean
+  ): Promise<boolean> {
+    const ratingKey = media.jellyfinMediaId;
+    const ratingKey4k = media.jellyfinMediaId4k;
+    let seasonExistsInJellyfin = false;
+
+    // Check each jellyfin instance to see if the season exists
+    let jellyfinSeasons: JellyfinLibraryItem[] | undefined;
+
+    if (ratingKey && !is4k) {
+      jellyfinSeasons = this.jellyfinSeasonsCache[ratingKey];
+    }
+
+    if (ratingKey4k && is4k) {
+      jellyfinSeasons = this.jellyfinSeasonsCache[ratingKey4k];
+    }
+
+    const seasonIsAvailable = jellyfinSeasons?.find(
+      (jellyfinSeason) => jellyfinSeason.IndexNumber === season.seasonNumber
+    );
+
+    if (seasonIsAvailable) {
+      seasonExistsInJellyfin = true;
+    }
+
+    return seasonExistsInJellyfin;
+  }
 }
 
 const availabilitySync = new AvailabilitySync();

server/lib/scanners/jellyfin/index.ts

@@ -26,7 +26,7 @@ interface SyncStatus {
   libraries: Library[];
 }
 
-class JobJellyfinSync {
+class JellyfinScanner {
   private sessionId: string;
   private tmdb: TheMovieDb;
   private jfClient: JellyfinAPI;
@@ -62,7 +62,7 @@ class JobJellyfinSync {
       const metadata = await this.jfClient.getItemData(jellyfinitem.Id);
       const newMedia = new Media();
 
-      if (!metadata.Id) {
+      if (!metadata?.Id) {
         logger.debug('No Id metadata for this title. Skipping', {
           label: 'Plex Sync',
           ratingKey: jellyfinitem.Id,
@@ -197,6 +197,14 @@ class JobJellyfinSync {
         jellyfinitem.SeriesId ?? jellyfinitem.SeasonId ?? jellyfinitem.Id;
       const metadata = await this.jfClient.getItemData(Id);
 
+      if (!metadata?.Id) {
+        logger.debug('No Id metadata for this title. Skipping', {
+          label: 'Plex Sync',
+          ratingKey: jellyfinitem.Id,
+        });
+        return;
+      }
+
       if (metadata.ProviderIds.Tvdb) {
         tvShow = await this.tmdb.getShowByTvdbId({
           tvdbId: Number(metadata.ProviderIds.Tvdb),
@@ -275,7 +283,7 @@ class JobJellyfinSync {
                     episode.Id
                   );
 
-                  ExtendedEpisodeData.MediaSources?.some((MediaSource) => {
+                  ExtendedEpisodeData?.MediaSources?.some((MediaSource) => {
                     return MediaSource.MediaStreams.some((MediaStream) => {
                       if (MediaStream.Type === 'Video') {
                         if ((MediaStream.Width ?? 0) >= 2000) {
@@ -675,7 +683,7 @@ class JobJellyfinSync {
   }
 }
 
-export const jobJellyfinFullSync = new JobJellyfinSync();
-export const jobJellyfinRecentSync = new JobJellyfinSync({
+export const jellyfinFullScanner = new JellyfinScanner();
+export const jellyfinRecentScanner = new JellyfinScanner({
   isRecentOnly: true,
 });

server/routes/settings/index.ts

@@ -12,12 +12,12 @@ import type {
   LogsResultsResponse,
   SettingsAboutResponse,
 } from '@server/interfaces/api/settingsInterfaces';
-import { jobJellyfinFullSync } from '@server/job/jellyfinsync';
 import { scheduledJobs } from '@server/job/schedule';
 import type { AvailableCacheIds } from '@server/lib/cache';
 import cacheManager from '@server/lib/cache';
 import ImageProxy from '@server/lib/imageproxy';
 import { Permission } from '@server/lib/permissions';
+import { jellyfinFullScanner } from '@server/lib/scanners/jellyfin';
 import { plexFullScanner } from '@server/lib/scanners/plex';
 import type { JobId, Library, MainSettings } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
@@ -345,16 +345,16 @@ settingsRoutes.get('/jellyfin/users', async (req, res) => {
 });
 
 settingsRoutes.get('/jellyfin/sync', (_req, res) => {
-  return res.status(200).json(jobJellyfinFullSync.status());
+  return res.status(200).json(jellyfinFullScanner.status());
 });
 
 settingsRoutes.post('/jellyfin/sync', (req, res) => {
   if (req.body.cancel) {
-    jobJellyfinFullSync.cancel();
+    jellyfinFullScanner.cancel();
   } else if (req.body.start) {
-    jobJellyfinFullSync.run();
+    jellyfinFullScanner.run();
   }
-  return res.status(200).json(jobJellyfinFullSync.status());
+  return res.status(200).json(jellyfinFullScanner.status());
 });
 settingsRoutes.get('/tautulli', (_req, res) => {
   const settings = getSettings();

src/components/Common/ListView/index.tsx

@@ -19,6 +19,7 @@ type ListViewProps = {
   isLoading?: boolean;
   isReachingEnd?: boolean;
   onScrollBottom: () => void;
+  mutateParent?: () => void;
 };
 
 const ListView = ({
@@ -28,6 +29,7 @@ const ListView = ({
   onScrollBottom,
   isReachingEnd,
   plexItems,
+  mutateParent,
 }: ListViewProps) => {
   const intl = useIntl();
   useVerticalScroll(onScrollBottom, !isLoading && !isEmpty && !isReachingEnd);
@@ -48,6 +50,7 @@ const ListView = ({
                 type={title.mediaType}
                 isAddedToWatchlist={true}
                 canExpand
+                mutateParent={mutateParent}
               />
             </li>
           );

src/components/Discover/DiscoverWatchlist/index.tsx

@@ -30,6 +30,7 @@ const DiscoverWatchlist = () => {
     titles,
     fetchMore,
     error,
+    mutate,
   } = useDiscover<WatchlistItem>(
     `/api/v1/${
       router.pathname.startsWith('/profile')
@@ -76,6 +77,7 @@ const DiscoverWatchlist = () => {
         }
         isReachingEnd={isReachingEnd}
         onScrollBottom={fetchMore}
+        mutateParent={mutate}
       />
     </>
   );

src/components/Settings/SonarrModal/index.tsx

@@ -1,8 +1,10 @@
 import Modal from '@app/components/Common/Modal';
 import SensitiveInput from '@app/components/Common/SensitiveInput';
+import useSettings from '@app/hooks/useSettings';
 import globalMessages from '@app/i18n/globalMessages';
 import { Transition } from '@headlessui/react';
-import type { SonarrSettings } from '@server/lib/settings';
+import { MediaServerType } from '@server/constants/server';
+import { type SonarrSettings } from '@server/lib/settings';
 import axios from 'axios';
 import { Field, Formik } from 'formik';
 import { useCallback, useEffect, useRef, useState } from 'react';
@@ -109,6 +111,7 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
   const { addToast } = useToasts();
   const [isValidated, setIsValidated] = useState(sonarr ? true : false);
   const [isTesting, setIsTesting] = useState(false);
+  const settings = useSettings();
   const [testResponse, setTestResponse] = useState<TestResponse>({
     profiles: [],
     rootFolders: [],
@@ -255,7 +258,9 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
           animeTags: sonarr?.animeTags ?? [],
           isDefault: sonarr?.isDefault ?? false,
           is4k: sonarr?.is4k ?? false,
-          enableSeasonFolders: sonarr?.enableSeasonFolders ?? false,
+          enableSeasonFolders:
+            sonarr?.enableSeasonFolders ??
+            settings.currentSettings.mediaServerType !== MediaServerType.PLEX,
           externalUrl: sonarr?.externalUrl,
           syncEnabled: sonarr?.syncEnabled ?? false,
           enableSearch: !sonarr?.preventSearch,
@@ -961,11 +966,24 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
                   >
                     {intl.formatMessage(messages.seasonfolders)}
                   </label>
-                  <div className="form-input-area">
+                  <div
+                    className={`form-input-area ${
+                      settings.currentSettings.mediaServerType ===
+                        MediaServerType.JELLYFIN ||
+                      settings.currentSettings.mediaServerType ===
+                        MediaServerType.EMBY
+                        ? 'opacity-50'
+                        : 'opacity-100'
+                    }`}
+                  >
                     <Field
                       type="checkbox"
                       id="enableSeasonFolders"
                       name="enableSeasonFolders"
+                      disabled={
+                        settings.currentSettings.mediaServerType !==
+                        MediaServerType.PLEX
+                      }
                     />
                   </div>
                 </div>

src/components/TitleCard/TmdbTitleCard.tsx

@@ -12,6 +12,7 @@ export interface TmdbTitleCardProps {
   type: 'movie' | 'tv';
   canExpand?: boolean;
   isAddedToWatchlist?: boolean;
+  mutateParent?: () => void;
 }
 
 const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
@@ -25,6 +26,7 @@ const TmdbTitleCard = ({
   type,
   canExpand,
   isAddedToWatchlist = false,
+  mutateParent,
 }: TmdbTitleCardProps) => {
   const { hasPermission } = useUser();
 
@@ -71,6 +73,7 @@ const TmdbTitleCard = ({
       year={title.releaseDate}
       mediaType={'movie'}
       canExpand={canExpand}
+      mutateParent={mutateParent}
     />
   ) : (
     <TitleCard
@@ -87,6 +90,7 @@ const TmdbTitleCard = ({
       year={title.firstAirDate}
       mediaType={'tv'}
       canExpand={canExpand}
+      mutateParent={mutateParent}
     />
   );
 };

src/components/TitleCard/index.tsx

@@ -38,6 +38,7 @@ interface TitleCardProps {
   canExpand?: boolean;
   inProgress?: boolean;
   isAddedToWatchlist?: number | boolean;
+  mutateParent?: () => void;
 }
 
 const messages = defineMessages({
@@ -61,6 +62,7 @@ const TitleCard = ({
   isAddedToWatchlist = false,
   inProgress = false,
   canExpand = false,
+  mutateParent,
 }: TitleCardProps) => {
   const isTouch = useIsTouch();
   const intl = useIntl();
@@ -148,6 +150,9 @@ const TitleCard = ({
     } finally {
       setIsUpdating(false);
       mutate('/api/v1/discover/watchlist');
+      if (mutateParent) {
+        mutateParent();
+      }
       setToggleWatchlist((prevState) => !prevState);
     }
   };

src/hooks/useDiscover.ts

@@ -25,6 +25,7 @@ interface DiscoverResult<T, S> {
   error: unknown;
   titles: T[];
   firstResultData?: BaseSearchResult<T> & S;
+  mutate?: () => void;
 }
 
 const extraEncodes: [RegExp, string][] = [
@@ -54,7 +55,7 @@ const useDiscover = <
   { hideAvailable = true } = {}
 ): DiscoverResult<T, S> => {
   const settings = useSettings();
-  const { data, error, size, setSize, isValidating } = useSWRInfinite<
+  const { data, error, size, setSize, isValidating, mutate } = useSWRInfinite<
     BaseSearchResult<T> & S
   >(
     (pageIndex: number, previousPageData) => {
@@ -119,6 +120,7 @@ const useDiscover = <
     error,
     titles,
     firstResultData: data?.[0],
+    mutate,
   };
 };
 

tailwind.config.js

@@ -3,7 +3,6 @@ const defaultTheme = require('tailwindcss/defaultTheme');
 
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  important: true,
   mode: 'jit',
   content: [
     './node_modules/react-tailwindcss-datepicker-sct/dist/index.esm.js',