fix: 修复下载结束不会自动退出的问题

lzwme · Dec 3, 2023 · 1acc9ea · 1acc9ea
1 parent 72fe208
commit 1acc9ea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/lib/worker_pool.ts b/src/lib/worker_pool.ts
@@ -35,10 +35,7 @@ export class WorkerPool<T = unknown, R = unknown> extends EventEmitter {
   get freeNum() {
     return this.freeWorkers.length;
   }
-  constructor(
-    private processorFile: string,
-    public numThreads = 0
-  ) {
+  constructor(private processorFile: string, public numThreads = 0) {
     super();
 
     numThreads = +numThreads || cpus().length;

diff --git a/src/m3u8-batch-download.ts b/src/m3u8-batch-download.ts
@@ -7,6 +7,7 @@ import { logger } from './lib/utils';
 async function formatUrls(urls: string[], options: M3u8DLOptions): Promise<Map<string, M3u8DLOptions>> {
   const taskset = new Map<string, M3u8DLOptions>();
   for (const url of urls) {
+    if (!url) continue;
     if (existsSync(url)) {
       const content = await promises.readFile(url, 'utf8');
       if (content.includes('.m3u8')) {
@@ -67,5 +68,8 @@ export async function m3u8BatchDownload(urls: string[], options: M3u8DLOptions)
     };
 
     run();
+  }).then(d => {
+    if (workPoll.freeNum === workPoll.numThreads) workPoll.close();
+    return d;
   });
 }