diff --git a/destreamer.cmd b/destreamer.cmd new file mode 100644 index 0000000..2c922e2 --- /dev/null +++ b/destreamer.cmd @@ -0,0 +1 @@ +node.exe build\src\destreamer.js %* \ No newline at end of file diff --git a/destreamer.ps1 b/destreamer.ps1 new file mode 100644 index 0000000..dba5b34 --- /dev/null +++ b/destreamer.ps1 @@ -0,0 +1 @@ +node.exe build\src\destreamer.js $args \ No newline at end of file diff --git a/destreamer.sh b/destreamer.sh new file mode 100644 index 0000000..3d65b8c --- /dev/null +++ b/destreamer.sh @@ -0,0 +1 @@ +node build/src/destreamer.js "$@" \ No newline at end of file diff --git a/src/Metadata.ts b/src/Metadata.ts index becb3a3..87b78ed 100644 --- a/src/Metadata.ts +++ b/src/Metadata.ts @@ -17,7 +17,7 @@ function durationToTotalChunks(duration: string) { const mins = durationObj['minutes'] ?? 0; const secs = Math.ceil(durationObj['seconds'] ?? 0); - return hrs * 1000 + mins * 100 + secs; + return (hrs * 60) + mins + (secs / 60); } diff --git a/src/Utils.ts b/src/Utils.ts index 2e915cc..3d8c244 100644 --- a/src/Utils.ts +++ b/src/Utils.ts @@ -137,5 +137,5 @@ export function ffmpegTimemarkToChunk(timemark: string) { const mins = parseInt(timeVals[1]); const secs = parseInt(timeVals[2]); - return hrs * 1000 + mins * 100 + secs; + return (hrs * 60) + mins + (secs / 60); } diff --git a/src/destreamer.ts b/src/destreamer.ts index 9b7d9c7..3c7e276 100644 --- a/src/destreamer.ts +++ b/src/destreamer.ts @@ -15,6 +15,7 @@ import isElevated from 'is-elevated'; import puppeteer from 'puppeteer'; import colors from 'colors'; import path from 'path'; +import fs from 'fs'; import sanitize from 'sanitize-filename'; import cliProgress from 'cli-progress'; @@ -148,7 +149,6 @@ async function downloadVideo(videoUrls: string[], outputDirectories: string[], s const outDirsIdxInc = outputDirectories.length > 1 ? 1:0; for (let i=0, j=0, l=metadata.length; i { const currentChunks = ffmpegTimemarkToChunk(data.out_time); - const incChunk = currentChunks - previousChunks; - pbar.increment(incChunk, { + pbar.update(currentChunks, { speed: data.bitrate }); - - previousChunks = currentChunks; }); ffmpegCmd.on('error', (error: any) => { pbar.stop(); + + try { + fs.unlinkSync(outputPath); + } catch (e) {} + console.log(`\nffmpeg returned an error: ${error.message}`); process.exit(ERROR_CODE.UNK_FFMPEG_ERROR); }); process.on('SIGINT', () => { pbar.stop(); + + try { + fs.unlinkSync(outputPath); + } catch (e) {} }); // let the magic begin...