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

This reverts commit 8ec8f2ac57.
Disabling seasonfolder is no longer needed as we now allow
virtualFolders from jellyfin api.

.github/FUNDING.yml

@@ -1 +1 @@
-github: [Fallenbagel]
+github: [Fallenbagel]

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     container: node:18.18-alpine
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install dependencies
         env:
           HUSKY: 0
@@ -34,18 +34,18 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -56,7 +56,7 @@ jobs:
         env:
           OWNER: ${{ github.repository_owner }}
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile

.github/workflows/codeql.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

.github/workflows/cypress.yml

@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Cypress run
-        uses: cypress-io/github-action@v4
+        uses: cypress-io/github-action@v6
         with:
           build: yarn cypress:build
           start: yarn start

.github/workflows/preview.yml

@@ -11,21 +11,21 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get the version
         id: get_version
         run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile

.github/workflows/release.yml

@@ -10,19 +10,19 @@ jobs:
       HUSKY: 0
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
@@ -48,7 +48,7 @@ jobs:
           - armhf
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Switch to main branch
@@ -65,7 +65,7 @@ jobs:
             echo "RELEASE=edge" >> $GITHUB_OUTPUT
           fi
       - name: Set Up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
         with:
           image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde
       - name: Build Snap Package
@@ -74,7 +74,7 @@ jobs:
         with:
           architecture: ${{ matrix.architecture }}
       - name: Upload Snap Package
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: jellyseerr-snap-package-${{ matrix.architecture }}
           path: ${{ steps.build.outputs.snap }}

.github/workflows/snap.yaml

@@ -12,7 +12,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.10.0
+        uses: styfle/cancel-workflow-action@0.12.1
         with:
           access_token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -29,7 +29,7 @@ jobs:
           - armhf
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Prepare
         id: prepare
         run: |
@@ -40,7 +40,7 @@ jobs:
             echo "RELEASE=edge" >> $GITHUB_OUTPUT
           fi
       - name: Set Up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Configure Git
         run: git config --add safe.directory /data/parts/jellyseerr/src
       - name: Build Snap Package
@@ -49,7 +49,7 @@ jobs:
         with:
           architecture: ${{ matrix.architecture }}
       - name: Upload Snap Package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: jellyseerr-snap-package-${{ matrix.architecture }}
           path: ${{ steps.build.outputs.snap }}

.github/workflows/support.yml

@@ -6,9 +6,9 @@ on:
 
 jobs:
   support:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: dessant/support-requests@v2
+      - uses: dessant/support-requests@v4
         with:
           github-token: ${{ github.token }}
           support-label: 'support'

server/api/jellyfin.ts

@@ -9,6 +9,9 @@ export interface JellyfinUserResponse {
   ServerId: string;
   ServerName: string;
   Id: string;
+  Configuration: {
+    GroupedFolders: string[];
+  };
   Policy: {
     IsAdministrator: boolean;
   };
@@ -24,6 +27,13 @@ export interface JellyfinUserListResponse {
   users: JellyfinUserResponse[];
 }
 
+interface JellyfinMediaFolder {
+  Name: string;
+  Id: string;
+  Type: string;
+  CollectionType: string;
+}
+
 export interface JellyfinLibrary {
   type: 'show' | 'movie';
   key: string;
@@ -175,24 +185,45 @@ class JellyfinAPI {
 
   public async getLibraries(): Promise<JellyfinLibrary[]> {
     try {
-      // TODO: Try to fix automatic grouping without fucking up LDAP users
-      // const libraries = await this.axios.get<any>('/Library/VirtualFolders');
+      const mediaFolders = await this.axios.get<any>(`/Library/MediaFolders`);
 
-      const account = await this.axios.get<any>(
-        `/Users/${this.userId ?? 'Me'}/Views`
-      );
+      return this.mapLibraries(mediaFolders.data.Items);
+    } catch (mediaFoldersError) {
+      // fallback to user views to get libraries
+      // this only affects LDAP users
+      try {
+        const mediaFolders = await this.axios.get<any>(
+          `/Users/${this.userId ?? 'Me'}/Views`
+        );
 
-      const response: JellyfinLibrary[] = account.data.Items.filter(
-        (Item: any) => {
-          return (
-            Item.Type === 'CollectionFolder' &&
-            Item.CollectionType !== 'music' &&
-            Item.CollectionType !== 'books' &&
-            Item.CollectionType !== 'musicvideos' &&
-            Item.CollectionType !== 'homevideos'
-          );
-        }
-      ).map((Item: any) => {
+        return this.mapLibraries(mediaFolders.data.Items);
+      } catch (e) {
+        logger.error(
+          `Something went wrong while getting libraries from the Jellyfin server: ${e.message}`,
+          { label: 'Jellyfin API' }
+        );
+        return [];
+      }
+    }
+  }
+
+  private mapLibraries(mediaFolders: JellyfinMediaFolder[]): JellyfinLibrary[] {
+    const excludedTypes = [
+      'music',
+      'books',
+      'musicvideos',
+      'homevideos',
+      'boxsets',
+    ];
+
+    return mediaFolders
+      .filter((Item: JellyfinMediaFolder) => {
+        return (
+          Item.Type === 'CollectionFolder' &&
+          !excludedTypes.includes(Item.CollectionType)
+        );
+      })
+      .map((Item: JellyfinMediaFolder) => {
         return <JellyfinLibrary>{
           key: Item.Id,
           title: Item.Name,
@@ -200,21 +231,12 @@ class JellyfinAPI {
           agent: 'jellyfin',
         };
       });
-
-      return response;
-    } catch (e) {
-      logger.error(
-        `Something went wrong while getting libraries from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API' }
-      );
-      return [];
-    }
   }
 
   public async getLibraryContents(id: string): Promise<JellyfinLibraryItem[]> {
     try {
       const contents = await this.axios.get<any>(
-        `/Users/${this.userId}/Items?SortBy=SortName&SortOrder=Ascending&IncludeItemTypes=Series,Movie,Others&Recursive=true&StartIndex=0&ParentId=${id}`
+        `/Users/${this.userId}/Items?SortBy=SortName&SortOrder=Ascending&IncludeItemTypes=Series,Movie,Others&Recursive=true&StartIndex=0&ParentId=${id}&collapseBoxSetItems=false`
       );
 
       return contents.data.Items.filter(

server/routes/settings/index.ts

@@ -261,7 +261,7 @@ settingsRoutes.post('/jellyfin', (req, res) => {
   return res.status(200).json(settings.jellyfin);
 });
 
-settingsRoutes.get('/jellyfin/library', async (req, res) => {
+settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
   const settings = getSettings();
 
   if (req.query.sync) {
@@ -281,6 +281,19 @@ settingsRoutes.get('/jellyfin/library', async (req, res) => {
 
     const libraries = await jellyfinClient.getLibraries();
 
+    if (libraries.length === 0) {
+      // Check if no libraries are found due to the fallback to user views
+      // This only affects LDAP users
+      const account = await jellyfinClient.getUser();
+
+      // Automatic Library grouping is not supported when user views are used to get library
+      if (account.Configuration.GroupedFolders.length > 0) {
+        return next({ status: 501, message: 'SYNC_ERROR_GROUPED_FOLDERS' });
+      }
+
+      return next({ status: 404, message: 'SYNC_ERROR_NO_LIBRARIES' });
+    }
+
     const newLibraries: Library[] = libraries.map((library) => {
       const existing = settings.jellyfin.libraries.find(
         (l) => l.id === library.key && l.name === library.title

src/components/Settings/SettingsJellyfin.tsx

@@ -34,6 +34,11 @@ const messages = defineMessages({
   externalUrl: 'External URL',
   internalUrl: 'Internal URL',
   jellyfinForgotPasswordUrl: 'Forgot Password URL',
+  jellyfinSyncFailedNoLibrariesFound: 'No libraries were found',
+  jellyfinSyncFailedAutomaticGroupedFolders:
+    'Custom authentication with Automatic Library Grouping not supported',
+  jellyfinSyncFailedGenericError:
+    'Something went wrong while syncing libraries',
   validationUrl: 'You must provide a valid URL',
   syncing: 'Syncing',
   syncJellyfin: 'Sync Libraries',
@@ -70,6 +75,7 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
   showAdvancedSettings,
 }) => {
   const [isSyncing, setIsSyncing] = useState(false);
+  const toasts = useToasts();
 
   const {
     data,
@@ -117,11 +123,43 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
       params.enable = activeLibraries.join(',');
     }
 
-    await axios.get('/api/v1/settings/jellyfin/library', {
-      params,
-    });
-    setIsSyncing(false);
-    revalidate();
+    try {
+      await axios.get('/api/v1/settings/jellyfin/library', {
+        params,
+      });
+      setIsSyncing(false);
+      revalidate();
+    } catch (e) {
+      if (e.response.data.message === 'SYNC_ERROR_GROUPED_FOLDERS') {
+        toasts.addToast(
+          intl.formatMessage(
+            messages.jellyfinSyncFailedAutomaticGroupedFolders
+          ),
+          {
+            autoDismiss: true,
+            appearance: 'warning',
+          }
+        );
+      } else if (e.response.data.message === 'SYNC_ERROR_NO_LIBRARIES') {
+        toasts.addToast(
+          intl.formatMessage(messages.jellyfinSyncFailedNoLibrariesFound),
+          {
+            autoDismiss: true,
+            appearance: 'error',
+          }
+        );
+      } else {
+        toasts.addToast(
+          intl.formatMessage(messages.jellyfinSyncFailedGenericError),
+          {
+            autoDismiss: true,
+            appearance: 'error',
+          }
+        );
+      }
+      setIsSyncing(false);
+      revalidate();
+    }
   };
 
   const startScan = async () => {

src/components/Settings/SonarrModal/index.tsx

@@ -1,10 +1,8 @@
 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 { MediaServerType } from '@server/constants/server';
-import { type SonarrSettings } from '@server/lib/settings';
+import type { SonarrSettings } from '@server/lib/settings';
 import axios from 'axios';
 import { Field, Formik } from 'formik';
 import { useCallback, useEffect, useRef, useState } from 'react';
@@ -111,7 +109,6 @@ 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: [],
@@ -258,9 +255,7 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
           animeTags: sonarr?.animeTags ?? [],
           isDefault: sonarr?.isDefault ?? false,
           is4k: sonarr?.is4k ?? false,
-          enableSeasonFolders:
-            sonarr?.enableSeasonFolders ??
-            settings.currentSettings.mediaServerType !== MediaServerType.PLEX,
+          enableSeasonFolders: sonarr?.enableSeasonFolders ?? false,
           externalUrl: sonarr?.externalUrl,
           syncEnabled: sonarr?.syncEnabled ?? false,
           enableSearch: !sonarr?.preventSearch,
@@ -966,24 +961,11 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
                   >
                     {intl.formatMessage(messages.seasonfolders)}
                   </label>
-                  <div
-                    className={`form-input-area ${
-                      settings.currentSettings.mediaServerType ===
-                        MediaServerType.JELLYFIN ||
-                      settings.currentSettings.mediaServerType ===
-                        MediaServerType.EMBY
-                        ? 'opacity-50'
-                        : 'opacity-100'
-                    }`}
-                  >
+                  <div className="form-input-area">
                     <Field
                       type="checkbox"
                       id="enableSeasonFolders"
                       name="enableSeasonFolders"
-                      disabled={
-                        settings.currentSettings.mediaServerType !==
-                        MediaServerType.PLEX
-                      }
                     />
                   </div>
                 </div>

src/i18n/locale/en.json

@@ -946,6 +946,9 @@
   "components.Settings.jellyfinlibrariesDescription": "The libraries {mediaServerName} scans for titles. Click the button below if no libraries are listed.",
   "components.Settings.jellyfinsettings": "{mediaServerName} Settings",
   "components.Settings.jellyfinsettingsDescription": "Configure the settings for your {mediaServerName} server. {mediaServerName} scans your {mediaServerName} libraries to see what content is available.",
+  "components.Settings.jellyfinSyncFailedNoLibrariesFound": "No libraries were found",
+  "components.Settings.jellyfinSyncFailedAutomaticGroupedFolders": "Custom authentication with Automatic Library Grouping not supported",
+  "components.Settings.jellyfinSyncFailedGenericError": "Something went wrong while syncing libraries",
   "components.Settings.librariesRemaining": "Libraries Remaining: {count}",
   "components.Settings.manualscan": "Manual Library Scan",
   "components.Settings.manualscanDescription": "Normally, this will only be run once every 24 hours. Jellyseerr will check your Plex server's recently added more aggressively. If this is your first time configuring Plex, a one-time full manual library scan is recommended!",