arona/destreamer-mirror
1
0
Fork 0
mirror of https://github.com/snobu/destreamer.git synced 2026-01-17 05:22:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix progress bar, remove temp file on ffmpeg error (#66)

Browse Source 
* Delete the video file on ffmpeg error

* rework chunk calculation (with more tests it turns out it was not good for all durations)

Co-authored-by: kylon <kylonux@gmail.com>
This commit is contained in:
kylon
2020-04-16 18:21:02 +02:00
committed by GitHub
parent 176fa6e214
commit d89c0eea8c
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Metadata.ts
View File

@@ -17,7 +17,7 @@ function durationToTotalChunks(duration: string) {
const mins = durationObj['minutes'] ?? 0; const mins = durationObj['minutes'] ?? 0;
const secs = Math.ceil(durationObj['seconds'] ?? 0); const secs = Math.ceil(durationObj['seconds'] ?? 0);
return hrs * 1000 + mins * 100 + secs; return (hrs * 60) + mins + (secs / 60);
} }

2
src/Utils.ts
View File

@@ -137,5 +137,5 @@ export function ffmpegTimemarkToChunk(timemark: string) {
const mins = parseInt(timeVals[1]); const mins = parseInt(timeVals[1]);
const secs = parseInt(timeVals[2]); const secs = parseInt(timeVals[2]);
return hrs * 1000 + mins * 100 + secs; return (hrs * 60) + mins + (secs / 60);
} }

8
src/destreamer.ts
View File

@@ -15,6 +15,7 @@ import isElevated from 'is-elevated';
import puppeteer from 'puppeteer'; import puppeteer from 'puppeteer';
import colors from 'colors'; import colors from 'colors';
import path from 'path'; import path from 'path';
import fs from 'fs';
import sanitize from 'sanitize-filename'; import sanitize from 'sanitize-filename';
import cliProgress from 'cli-progress'; import cliProgress from 'cli-progress';
@@ -148,7 +149,6 @@ async function downloadVideo(videoUrls: string[], outputDirectories: string[], s
const outDirsIdxInc = outputDirectories.length > 1 ? 1:0; const outDirsIdxInc = outputDirectories.length > 1 ? 1:0;
for (let i=0, j=0, l=metadata.length; i<l; ++i, j+=outDirsIdxInc) { for (let i=0, j=0, l=metadata.length; i<l; ++i, j+=outDirsIdxInc) {
const video = metadata[i]; const video = metadata[i];
let previousChunks = 0;
const pbar = new cliProgress.SingleBar({ const pbar = new cliProgress.SingleBar({
barCompleteChar: '\u2588', barCompleteChar: '\u2588',
barIncompleteChar: '\u2591', barIncompleteChar: '\u2591',
@@ -186,17 +186,15 @@ async function downloadVideo(videoUrls: string[], outputDirectories: string[], s
// set events // set events
ffmpegCmd.on('update', (data: any) => { ffmpegCmd.on('update', (data: any) => {
const currentChunks = ffmpegTimemarkToChunk(data.out_time); const currentChunks = ffmpegTimemarkToChunk(data.out_time);
const incChunk = currentChunks - previousChunks;
pbar.increment(incChunk, { pbar.update(currentChunks, {
speed: data.bitrate speed: data.bitrate
}); });
previousChunks = currentChunks;
}); });
ffmpegCmd.on('error', (error: any) => { ffmpegCmd.on('error', (error: any) => {
pbar.stop(); pbar.stop();
fs.unlinkSync(outputPath);
console.log(`\nffmpeg returned an error: ${error.message}`); console.log(`\nffmpeg returned an error: ${error.message}`);
process.exit(ERROR_CODE.UNK_FFMPEG_ERROR); process.exit(ERROR_CODE.UNK_FFMPEG_ERROR);
}); });