Merge branch 'tokencache' of https://github.com/snobu/destreamer into tokencache

destreamer.cmd

@@ -0,0 +1 @@
+node.exe build\src\destreamer.js %*

destreamer.ps1

@@ -0,0 +1 @@
+node.exe build\src\destreamer.js $args

destreamer.sh

@@ -0,0 +1 @@
+node build/src/destreamer.js "$@"

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);
 }
 
 

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);
 }

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<l; ++i, j+=outDirsIdxInc) {
         const video = metadata[i];
-        let previousChunks = 0;
         const pbar = new cliProgress.SingleBar({
             barCompleteChar: '\u2588',
             barIncompleteChar: '\u2591',
@@ -186,23 +186,29 @@ async function downloadVideo(videoUrls: string[], outputDirectories: string[], s
         // set events
         ffmpegCmd.on('update', (data: any) => {
             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...