Merge pull request #234 from play-dl/developer

1.7.6
play-dl · Jan 7, 2022 · e6c6e20 · e6c6e20
2 parents ce45f3c + a651979
commit e6c6e20
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/play-dl/YouTube/classes/WebmSeeker.ts b/play-dl/YouTube/classes/WebmSeeker.ts
@@ -33,7 +33,6 @@ export class WebmSeeker extends Duplex {
     private data_length: number;
     private sec: number;
     private time: number;
-    private foundCue: boolean;
 
     constructor(sec: number, options: WebmSeekerOptions) {
         super(options);
@@ -47,7 +46,6 @@ export class WebmSeeker extends Duplex {
         this.data_size = 0;
         this.sec = sec;
         this.time = Math.floor(sec / 10) * 10;
-        this.foundCue = false;
     }
 
     private get vint_length(): number {
@@ -143,15 +141,11 @@ export class WebmSeeker extends Duplex {
             if (parse instanceof Error) return parse;
 
             // stop parsing the header once we have found the correct cue
-            if (ebmlID.name === 'cueClusterPosition') {
-                if (this.foundCue) {
-                    this.emit('headComplete');
-                    this.cursor = this.chunk.length;
-                    break;
-                } else if (this.time === (this.header.segment.cues!.at(-1)!.time as number) / 1000) {
-                    this.foundCue = true;
-                }
-            }
+            if (
+                ebmlID.name === 'cueClusterPosition' &&
+                this.time === (this.header.segment.cues!.at(-1)!.time as number) / 1000
+            )
+                this.emit('headComplete');
 
             if (ebmlID.type === DataType.master) {
                 this.cursor += this.data_size;

diff --git a/play-dl/YouTube/utils/extractor.ts b/play-dl/YouTube/utils/extractor.ts
@@ -211,7 +211,8 @@ export async function video_basic_info(url: string, options: InfoOptions = {}):
                 music.push({});
                 music[music.length - 1].song =
                     x.metadataRowRenderer.contents[0].simpleText ?? x.metadataRowRenderer.contents[0]?.runs?.[0]?.text;
-            } else
+            } else if (music.length === 0) return;
+            else
                 music[music.length - 1][x.metadataRowRenderer.title.simpleText.toLowerCase()] =
                     x.metadataRowRenderer.contents[0].simpleText ?? x.metadataRowRenderer.contents[0]?.runs?.[0]?.text;
         });