Combine Emby and Jellyfin (#520)

* Add Retry for if Session for device can't be found * Combined emby and Jellyfin * spacing * prettier
killergerbah · Sep 22, 2024 · 3013bed · 3013bed
1 parent 88d6fc6
commit 3013bed
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 105 deletions.
diff --git a/extension/src/manifest.json b/extension/src/manifest.json
@@ -108,7 +108,6 @@
                 "pages/viki-page.js",
                 "pages/unext-page.js",
                 "pages/emby-page.js",
-                "pages/jellyfin-page.js",
                 "pages/osnplus-page.js",
                 "pages/bilibili-page.js",
                 "pages/nrk-tv-page.js",

diff --git a/extension/src/pages.json b/extension/src/pages.json
@@ -91,17 +91,9 @@
             }
         },
         {
-            "host": "jellyfin*|:8096*",
-            "script": "jellyfin-page.js",
-            "hash": "#/video",
-            "autoSync": {
-                "enabled": true
-            }
-        },
-        {
-            "host": "emby*|:8096*",
+            "host": "jellyfin*|emby*|:8096*",
             "script": "emby-page.js",
-            "hash": "#!/videoosd/videoosd.html",
+            "hash": "#!/videoosd/videoosd.html|#/video",
             "autoSync": {
                 "enabled": true
             }

diff --git a/extension/src/pages/emby-page.ts → extension/src/pages/emby-jellyfin-page.ts b/extension/src/pages/emby-page.ts → extension/src/pages/emby-jellyfin-page.ts
@@ -16,8 +16,8 @@ document.addEventListener(
                 })
             );
         }
+
         const deviceID = ApiClient?._deviceId;
-        const apikey = ApiClient?._userAuthInfo.AccessToken;
 
         let session;
         for (let attempt = 0; attempt < 5; attempt++) {
@@ -40,31 +40,25 @@ document.addEventListener(
 
         var mediaID = session.PlayState.MediaSourceId;
         var nowPlayingItem = session.NowPlayingItem;
-        response.basename = nowPlayingItem.FileName;
+        response.basename = nowPlayingItem.FileName ?? nowPlayingItem.Name;
+
         const subtitles: VideoDataSubtitleTrack[] = [];
         nowPlayingItem.MediaStreams.filter(
             (stream: { IsTextSubtitleStream: any }) => stream.IsTextSubtitleStream
-        ).forEach((sub: { Codec: string; DisplayTitle: any; Language: any; Index: number }) => {
+        ).forEach((sub: { Codec: string; DisplayTitle: any; Language: any; Index: number; Path: string }) => {
+            const extension = sub.Path ? sub.Path.split('.').pop()! : sub.Codec;
             var url =
-                '/Videos/' +
-                nowPlayingItem.Id +
-                '/' +
-                mediaID +
-                '/Subtitles/' +
-                sub.Index +
-                '/Stream.' +
-                sub.Codec +
-                '?api_key=' +
-                apikey;
+                '/Videos/' + nowPlayingItem.Id + '/' + mediaID + '/Subtitles/' + sub.Index + '/Stream.' + extension;
             subtitles.push(
                 trackFromDef({
                     label: sub.DisplayTitle,
                     language: sub.Language || '',
                     url: url,
-                    extension: sub.Codec,
+                    extension,
                 })
             );
         });
+
         response.subtitles = subtitles;
 
         document.dispatchEvent(

diff --git a/extension/src/pages/jellyfin-page.ts b/extension/src/pages/jellyfin-page.ts