修复视频下载完成合并失败的问题

HeiSir2014 · Mar 25, 2021 · 5411f6a · 5411f6a
1 parent e516067
commit 5411f6a
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 1,295 deletions.
diff --git a/main.js b/main.js
@@ -1010,7 +1010,6 @@ async function startDownload(object,iidx) {
 			let filpath = path.join(dir, `${ ((iSeg + 1) +'').padStart(6,'0') }.ts`);
 			if(fs.existsSync(filpath))
 			{
-				indexData += `file '${filpath}'\r\n`;
 				fileSegments.push(filpath);
 			}
 		}
@@ -1061,7 +1060,7 @@ async function startDownload(object,iidx) {
 
 			for (let i = 0; i < fileSegments.length; i++) {
 				let percent = Number.parseInt((i+1)*100/fileSegments.length);
-				video.status = `已完成，合并中[${percent}%]`;
+				video.status = `合并中[${percent}%]`;
 				mainWindow.webContents.send('task-notify-end',video);
 				let filePath = fileSegments[i];
 				fs.existsSync(filePath) && ffmpegInputStream.push(fs.readFileSync(filePath));