ffmpeg-progress 1.7.0 → 1.8.1

package/cli.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
 const core_1 = require("./core");
 let args = process.argv.slice(2);
+let custom_args = [];
+let verbose = false;
 for (let arg of args) {
     if (arg == '-h' || arg == '--help') {
         console.log(`
@@ -20,9 +22,13 @@ EXAMPLES:
   # pipe from ffmpeg output (need to redirect stderr):
   ffmpeg -i input.mp4 -c:v libx264 output.mp4 2>&1 | ffmpeg-progress
 
+  # using calling other script that use ffmpeg indirectly
+  to-mp4 --auto-name input.mov | ffmpeg-progress
+
 OPTIONS:
   -h, --help     show this help message and exit
-  -v, --version  show version and exit
+  --version      show version and exit
+  --verbose      verbose mode
 
 NOTES:
   - Pipe mode requires redirecting ffmpeg stderr to stdout (2>&1)
@@ -36,7 +42,13 @@ NOTES:
         console.log(`ffmpeg-progress ${pkg.version}`);
         process.exit(0);
     }
+    if (arg == '--verbose') {
+        verbose = true;
+        custom_args.push(arg);
+        continue;
+    }
 }
+args = args.filter(arg => !custom_args.includes(arg));
 let errorLines = [];
 function checkOverwrite(chunk) {
     let str = chunk.toString();
@@ -66,29 +78,52 @@ function onProgress(args) {
         (args.currentSeconds / (passedTime / 1000)));
     writeProgress(`progress=${progress} speed=${speed}x elapsed=${elapsed} eta=${eta}`);
 }
+function timestamp() {
+    let date = new Date();
+    let y = date.getFullYear();
+    let m = (date.getMonth() + 1).toString().padStart(2, '0');
+    let d = date.getDate().toString().padStart(2, '0');
+    let H = date.getHours().toString().padStart(2, '0');
+    let M = date.getMinutes().toString().padStart(2, '0');
+    let S = date.getSeconds().toString().padStart(2, '0');
+    return `${y}-${m}-${d} ${H}:${M}:${S}`;
+}
+function logVerbose(message) {
+    console.log(`[${timestamp()}] ${message}`);
+}
 if (args.length == 0) {
-    console.log('reading ffmpeg output from pipe...');
+    if (verbose) {
+        logVerbose('reading ffmpeg output from pipe...');
+    }
+    else {
+        writeProgress('reading ffmpeg output from pipe...');
+    }
     (0, core_1.attachStream)({
         stream: process.stdin,
         onData: checkOverwrite,
         onProgress,
     }).on('end', () => {
         process.stdout.write('\n');
-        console.log('end of ffmpeg output.');
+        if (verbose) {
+            logVerbose('end of ffmpeg output.');
+        }
     });
 }
 else {
-    let cmd = 'ffmpeg';
-    for (let arg of args) {
-        let str = JSON.stringify(arg);
-        if (str == `"${arg}"`) {
-            cmd += ' ' + arg;
-        }
-        else {
-            cmd += ' ' + str;
+    if (verbose) {
+        let cmd = 'ffmpeg';
+        for (let arg of args) {
+            let str = JSON.stringify(arg);
+            if (str == `"${arg}"`) {
+                cmd += ' ' + arg;
+            }
+            else {
+                cmd += ' ' + str;
+            }
         }
+        console.log('> ' + cmd);
+        logVerbose('starting ffmpeg process...');
     }
-    console.log('> ' + cmd);
     let childProcess = (0, child_process_1.spawn)('ffmpeg', args, {
         stdio: ['inherit', 'pipe', 'pipe'],
     });
@@ -99,9 +134,14 @@ else {
     })
         .then(() => {
         process.stdout.write('\n');
-        console.log('ffmpeg process finished.');
+        if (verbose) {
+            logVerbose('ffmpeg process finished.');
+        }
     })
         .catch(error => {
+        if (verbose) {
+            logVerbose('ffmpeg process failed.');
+        }
         process.stderr.write('\n');
         for (let line of errorLines) {
             console.error(line);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ffmpeg-progress",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "description": "Extract progress from ffmpeg child_process",
   "keywords": [
     "ffmpeg",