Return MediaStream type from getStreamByIndex

jellyfin · Dec 8, 2024 · 299c43e · 299c43e
1 parent 9b7cbb0
commit 299c43e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/components/maincontroller.ts b/src/components/maincontroller.ts
@@ -426,13 +426,17 @@ export function setSubtitleStreamIndex(
         subtitleStream.DeliveryMethod == 'External' ||
         currentDeliveryMethod == 'Encode'
     ) {
-        const textStreamUrl = subtitleStream.IsExternalUrl
-            ? subtitleStream.DeliveryUrl
-            : JellyfinApi.createUrl(subtitleStream.DeliveryUrl);
+        let textStreamUrl;
+
+        if (subtitleStream.IsExternal && subtitleStream.DeliveryUrl) {
+            textStreamUrl = subtitleStream.DeliveryUrl;
+        } else if (subtitleStream.DeliveryUrl) {
+            textStreamUrl = JellyfinApi.createUrl(subtitleStream.DeliveryUrl);
+        }
 
         console.log(`Subtitle url: ${textStreamUrl}`);
         setTextTrack(index);
-        state.subtitleStreamIndex = subtitleStream.Index;
+        state.subtitleStreamIndex = subtitleStream.Index ?? null;
 
         return;
     } else {

diff --git a/src/helpers.ts b/src/helpers.ts
@@ -461,17 +461,18 @@ export function createStreamInfo(
  * @param streams - array streams to consider
  * @param type - type of stream
  * @param index - index of stream
- * @returns first first matching stream
+ * @returns first matching stream
  */
 export function getStreamByIndex(
     streams: MediaStream[],
     type: string,
     index: number
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): any {
-    return streams.find((s) => {
-        return s.Type == type && s.Index == index;
-    });
+): MediaStream {
+    return (
+        streams.find((s) => {
+            return s.Type == type && s.Index == index;
+        }) ?? {}
+    );
 }
 
 // defined for use in the 3 next functions