fix bugs

Last-Order · Oct 1, 2021 · 74f63a1 · 74f63a1
1 parent b8df3b6
commit 74f63a1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "minyami",
-    "version": "4.4.2",
+    "version": "4.4.3",
     "description": "",
     "main": "dist/exports.js",
     "types": "dist/exports.d.ts",

diff --git a/src/core/downloader.ts b/src/core/downloader.ts
@@ -149,13 +149,14 @@ class Downloader extends EventEmitter {
 
         if (output) {
             this.outputPath = output;
-            if (fs.existsSync(this.outputPath)) {
-                // output filename conflict
-                const pathArr = this.outputPath.split(".");
-                const filePath = pathArr.slice(0, -1).join(".");
-                const ext = pathArr[pathArr.length - 1];
-                this.outputPath = `${filePath}_${Date.now()}.${ext}`;
-            }
+        }
+
+        if (fs.existsSync(this.outputPath)) {
+            // output filename conflict
+            const pathArr = this.outputPath.split(".");
+            const filePath = pathArr.slice(0, -1).join(".");
+            const ext = pathArr[pathArr.length - 1];
+            this.outputPath = `${filePath}_${Date.now()}.${ext}`;
         }
 
         if (key) {

diff --git a/src/core/m3u8.ts b/src/core/m3u8.ts
@@ -169,9 +169,11 @@ export class Playlist {
                 }
                 this.chunks.push({
                     url: CommonUtils.buildFullUrl(this.m3u8Url, initialSegmentUrl),
-                    isEncrypted: false,
+                    isEncrypted: true,
                     length: 0,
                     sequenceId: 0,
+                    key,
+                    iv,
                 });
             }
             if (currentLine.startsWith("#EXT-X-ENDLIST")) {