fix(api): ignore Music,Books,Photos,MusicVideo libraries

Ignores libraries other than tvshows,movies,others

.github/workflows/release.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Upload Snap Package
         uses: actions/upload-artifact@v2
         with:
-          name: overseerr-snap-package-${{ matrix.architecture }}
+          name: jellyseerr-snap-package-${{ matrix.architecture }}
           path: ${{ steps.build.outputs.snap }}
       - name: Review Snap Package
         uses: diddlesnaps/snapcraft-review-tools-action@v1

.github/workflows/snap.yaml

@@ -49,7 +49,7 @@ jobs:
       - name: Upload Snap Package
         uses: actions/upload-artifact@v3
         with:
-          name: overseerr-snap-package-${{ matrix.architecture }}
+          name: jellyseerr-snap-package-${{ matrix.architecture }}
           path: ${{ steps.build.outputs.snap }}
       - name: Review Snap Package
         uses: diddlesnaps/snapcraft-review-tools-action@v1

README.md

@@ -33,17 +33,86 @@ With more features on the way! Check out our [issue tracker](https://github.com/
 
 ## Getting Started
 
+_*Jellyseerr currently does not support any library types other than *`Shows`* and *`Movies`*.
+In addition, you will need to turn off in jellyfin `settings > Home > Automatically group content from the following folders into views such as 'Movies', 'Music' and 'TV':`.*_
+
+### Launching Jellyseerr using Docker
+
 Check out our dockerhub for instructions on how to install and run Jellyseerr:
 https://hub.docker.com/r/fallenbagel/jellyseerr
 
 ### Launching Jellyseerr manually:
 
+#### Windows
+
+Pre-requisites:
+
+- Nodejs (atleast LTS version)
+- Yarn
+- Download the source code from the github (Either develop branch or main for stable)
+
 ```bash
+npm i -g win-node-env
 yarn install
 yarn run build
 yarn start
 ```
 
+#### Linux
+
+Pre-requisites:
+
+- Nodejs (atleast LTS version)
+- Yarn
+- Git
+
+```bash
+git clone https://github.com/Fallenbagel/jellyseerr.git && cd jellyseerr
+git checkout main #if you want to run stable instead of develop
+yarn install
+yarn run build
+yarn start
+```
+
+_Systemd-service:_
+
+- assuming jellyseerr was cloned to `/opt/`
+  and the environmentfile is located at `/etc/jellyseerr`
+
+service:
+
+```
+[Unit]
+Description=Jellyseerr Service
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+EnvironmentFile=/etc/jellyseerr/jellyseerr.conf
+Environment=NODE_ENV=production
+Type=exec
+Restart=on-failure
+WorkingDirectory=/opt/jellyseerr
+ExecStart=/root/.nvm/versions/node/v18.7.0/bin/node dist/index.js
+
+[Install]
+WantedBy=multi-user.target
+```
+
+Environmentfile:
+
+```
+# Jellyseerr's default port is 5055, if you want to use both, change this.
+# specify on which port to listen
+PORT=5055
+
+# specify on which interface to listen, by default jellyseerr listens on all interfaces
+#HOST=127.0.0.1
+
+# Uncomment if your media server is emby instead of jellyfin.
+# JELLYFIN_TYPE=emby
+```
+
 ### Packages:
 
 Archlinux: [AUR](https://aur.archlinux.org/packages/jellyseerr)

cypress.config.ts

@@ -1,7 +1,7 @@
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
-  projectId: 'onnqy3',
+  projectId: 'xkm1b4',
   e2e: {
     baseUrl: 'http://localhost:5055',
     experimentalSessionAndOrigin: true,

server/api/jellyfin.ts

@@ -38,6 +38,7 @@ export interface JellyfinLibraryItem {
   SeasonId?: string;
   SeasonName?: string;
   IndexNumber?: number;
+  IndexNumberEnd?: number;
   ParentIndexNumber?: number;
   MediaType: string;
 }
@@ -178,8 +179,10 @@ class JellyfinAPI {
         (Item: any) => {
           return (
             Item.Type === 'CollectionFolder' &&
-            (Item.CollectionType === 'tvshows' ||
-              Item.CollectionType === 'movies')
+            Item.CollectionType !== 'music' &&
+            Item.CollectionType !== 'books' &&
+            Item.CollectionType !== 'musicvideos' &&
+            Item.CollectionType !== 'homevideos'
           );
         }
       ).map((Item: any) => {
@@ -204,7 +207,7 @@ class JellyfinAPI {
   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&Recursive=true&StartIndex=0&ParentId=${id}`
+        `/Users/${this.userId}/Items?SortBy=SortName&SortOrder=Ascending&IncludeItemTypes=Series,Movie,Others&Recursive=true&StartIndex=0&ParentId=${id}`
       );
 
       return contents.data.Items.filter(

server/entity/Media.ts

@@ -200,21 +200,20 @@ class Media {
       const pageName =
         process.env.JELLYFIN_TYPE === 'emby' ? 'item' : 'details';
       const { serverId, hostname, externalHostname } = getSettings().jellyfin;
-      const jellyfinHost =
+      let jellyfinHost =
         externalHostname && externalHostname.length > 0
           ? externalHostname
           : hostname;
+
+      jellyfinHost = jellyfinHost!.endsWith('/')
+        ? jellyfinHost!.slice(0, -1)
+        : jellyfinHost;
+
       if (this.jellyfinMediaId) {
-        this.mediaUrl = new URL(
-          `/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${serverId}`,
-          jellyfinHost
-        ).href;
+        this.mediaUrl = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${serverId}`;
       }
       if (this.jellyfinMediaId4k) {
-        this.mediaUrl4k = new URL(
-          `/web/index.html#!/${pageName}?id=${this.jellyfinMediaId4k}&context=home&serverId=${serverId}`,
-          jellyfinHost
-        ).href;
+        this.mediaUrl4k = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${serverId}`;
       }
     }
   }

server/job/jellyfinsync/index.ts

@@ -257,8 +257,19 @@ class JobJellyfinSync {
               //use for loop to make sure this loop _completes_ in full
               //before the next section
               for (const episode of episodes) {
+                let episodeCount = 1;
+
+                // count number of combined episodes
+                if (
+                  episode.IndexNumber !== undefined &&
+                  episode.IndexNumberEnd !== undefined
+                ) {
+                  episodeCount =
+                    episode.IndexNumberEnd - episode.IndexNumber + 1;
+                }
+
                 if (!this.enable4kShow) {
-                  totalStandard++;
+                  totalStandard += episodeCount;
                 } else {
                   const ExtendedEpisodeData = await this.jfClient.getItemData(
                     episode.Id
@@ -268,10 +279,10 @@ class JobJellyfinSync {
                     return MediaSource.MediaStreams.some((MediaStream) => {
                       if (MediaStream.Type === 'Video') {
                         if (MediaStream.Width ?? 0 < 2000) {
-                          totalStandard++;
+                          totalStandard += episodeCount;
                         }
                       } else {
-                        total4k++;
+                        total4k += episodeCount;
                       }
                     });
                   });

server/routes/auth.ts

@@ -244,11 +244,15 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
     }
     // First we need to attempt to log the user in to jellyfin
     const jellyfinserver = new JellyfinAPI(hostname ?? '', undefined, deviceId);
-    const jellyfinHost =
+    let jellyfinHost =
       externalHostname && externalHostname.length > 0
         ? externalHostname
         : hostname;
 
+    jellyfinHost = jellyfinHost!.endsWith('/')
+      ? jellyfinHost!.slice(0, -1)
+      : jellyfinHost;
+
     const account = await jellyfinserver.login(body.username, body.password);
     // Next let's see if the user already exists
     user = await userRepository.findOne({
@@ -263,10 +267,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
 
       // Update the users avatar with their jellyfin profile pic (incase it changed)
       if (account.User.PrimaryImageTag) {
-        user.avatar = new URL(
-          `/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`,
-          jellyfinHost
-        ).href;
+        user.avatar = `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`;
       } else {
         user.avatar = '/os_logo_square.png';
       }
@@ -312,10 +313,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
           jellyfinAuthToken: account.AccessToken,
           permissions: Permission.ADMIN,
           avatar: account.User.PrimaryImageTag
-            ? new URL(
-                `/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`,
-                jellyfinHost
-              ).href
+            ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
             : '/os_logo_square.png',
           userType: UserType.JELLYFIN,
         });
@@ -345,10 +343,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
           jellyfinAuthToken: account.AccessToken,
           permissions: settings.main.defaultPermissions,
           avatar: account.User.PrimaryImageTag
-            ? new URL(
-                `/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`,
-                jellyfinHost
-              ).href
+            ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
             : '/os_logo_square.png',
           userType: UserType.JELLYFIN,
         });

server/routes/settings/index.ts

@@ -307,11 +307,14 @@ settingsRoutes.get('/jellyfin/library', async (req, res) => {
 settingsRoutes.get('/jellyfin/users', async (req, res) => {
   const settings = getSettings();
   const { hostname, externalHostname } = getSettings().jellyfin;
-  const jellyfinHost =
+  let jellyfinHost =
     externalHostname && externalHostname.length > 0
       ? externalHostname
       : hostname;
 
+  jellyfinHost = jellyfinHost!.endsWith('/')
+    ? jellyfinHost!.slice(0, -1)
+    : jellyfinHost;
   const userRepository = getRepository(User);
   const admin = await userRepository.findOneOrFail({
     select: ['id', 'jellyfinAuthToken', 'jellyfinDeviceId', 'jellyfinUserId'],
@@ -330,10 +333,7 @@ settingsRoutes.get('/jellyfin/users', async (req, res) => {
     username: user.Name,
     id: user.Id,
     thumb: user.PrimaryImageTag
-      ? new URL(
-          `/Users/${user.Id}/Images/Primary/?tag=${user.PrimaryImageTag}&quality=90`,
-          jellyfinHost
-        ).href
+      ? `${jellyfinHost}/Users/${user.Id}/Images/Primary/?tag=${user.PrimaryImageTag}&quality=90`
       : '/os_logo_square.png',
     email: user.Name,
   }));

server/routes/user/index.ts

@@ -497,11 +497,14 @@ router.post(
       //const jellyfinUsersResponse = await jellyfinClient.getUsers();
       const createdUsers: User[] = [];
       const { hostname, externalHostname } = getSettings().jellyfin;
-      const jellyfinHost =
+      let jellyfinHost =
         externalHostname && externalHostname.length > 0
           ? externalHostname
           : hostname;
 
+      jellyfinHost = jellyfinHost!.endsWith('/')
+        ? jellyfinHost!.slice(0, -1)
+        : jellyfinHost;
       jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
       const jellyfinUsers = await jellyfinClient.getUsers();
 
@@ -525,10 +528,7 @@ router.post(
             email: jellyfinUser?.Name,
             permissions: settings.main.defaultPermissions,
             avatar: jellyfinUser?.PrimaryImageTag
-              ? new URL(
-                  `/Users/${jellyfinUser.Id}/Images/Primary/?tag=${jellyfinUser.PrimaryImageTag}&quality=90`,
-                  jellyfinHost
-                ).href
+              ? `${jellyfinHost}/Users/${jellyfinUser.Id}/Images/Primary/?tag=${jellyfinUser.PrimaryImageTag}&quality=90`
               : '/os_logo_square.png',
             userType: UserType.JELLYFIN,
           });

snap/snapcraft.yaml

@@ -1,10 +1,11 @@
-name: overseerr
-adopt-info: overseerr
+name: jellyseerr
+adopt-info: jellyseerr
 license: MIT
-summary: Request management and media discovery tool for the Plex ecosystem.
+summary: Request management and media discovery tool for media servers
 description: >
-  Overseerr is a free and open source software application for managing requests for your media library.
-  It integrates with your existing services such as Sonarr, Radarr and Plex!
+  Jellyseerr is a free and open source software application for managing requests for your media library.
+  It is a a fork of Overseerr built to bring support for & focusing mainly on Jellyfin & Emby media servers!
+  It integrates with your existing services such as Sonarr, Radarr, and Jellyfin/Emby/Plex.
 base: core18
 confinement: strict
 
@@ -14,7 +15,7 @@ architectures:
   - build-on: armhf
 
 parts:
-  overseerr:
+  jellyseerr:
     plugin: nodejs
     nodejs-version: '16.17.0'
     nodejs-package-manager: 'yarn'
@@ -36,7 +37,7 @@ parts:
     override-pull: |
       snapcraftctl pull
       # Get information to determine snap grade and version
-      git config --global --add safe.directory /data/parts/overseerr/src
+      git config --global --add safe.directory /data/parts/jellyyseerr/src
       #setup yarn.rc
       echo "--install.frozen-lockfile\n--install.network-timeout 1000000" > .yarnrc
       BRANCH=$(git rev-parse --abbrev-ref HEAD)