Merge pull request #511 from HaveAGitGat/parser

Use time status

FlowPlugins/FlowHelpers/1.0.0/cliParsers.js

@@ -51,7 +51,7 @@ var getFFmpegVar = function (_a) {
 };
 exports.getFFmpegVar = getFFmpegVar;
 var getFFmpegPercentage = function (_a) {
-    var f = _a.f, fc = _a.fc, vf = _a.vf, d = _a.d;
+    var time = _a.time, f = _a.f, fc = _a.fc, vf = _a.vf, d = _a.d;
     var frameCount01 = fc;
     var VideoFrameRate = vf;
     var Duration = d;
@@ -60,14 +60,19 @@ var getFFmpegPercentage = function (_a) {
     frameCount01 = Math.ceil(frameCount01);
     VideoFrameRate = Math.ceil(VideoFrameRate);
     Duration = Math.ceil(Duration);
-    if (frameCount01 > 0) {
+    if (frame > 0) {
-        perc = ((frame / frameCount01) * 100);
+        if (frameCount01 > 0) {
-    }
+            perc = ((frame / frameCount01) * 100);
-    else if (VideoFrameRate > 0 && Duration > 0) {
+        }
-        perc = ((frame / (VideoFrameRate * Duration)) * 100);
+        else if (VideoFrameRate > 0 && Duration > 0) {
+            perc = ((frame / (VideoFrameRate * Duration)) * 100);
+        }
+        else {
+            perc = (frame);
+        }
     }
-    else {
+    else if (time > 0 && Duration > 0) {
-        perc = (frame);
+        perc = ((time / Duration) * 100);
     }
     var percString = perc.toFixed(2);
     // eslint-disable-next-line no-restricted-globals
@@ -84,33 +89,45 @@ var ffmpegParser = function (_a) {
     }
     var percentage = 0;
     if (str.length >= 6) {
-        var n = str.indexOf('fps');
+        var frame = getFFmpegVar({
-        if (n >= 6) {
+            str: str,
-            // get frame
+            variable: 'frame',
-            var frame = getFFmpegVar({
+        });
-                str: str,
+        var time = 0;
-                variable: 'frame',
+        // get time
-            });
+        var timeStr = getFFmpegVar({
-            var frameRate = videoFrameRate || 0;
+            str: str,
-            var duration = 0;
+            variable: 'time',
-            if (ffprobeDuration
+        });
-                && parseFloat(ffprobeDuration) > 0) {
+        if (timeStr) {
-                duration = parseFloat(ffprobeDuration);
+            var timeArr = timeStr.split(':');
-            }
+            if (timeArr.length === 3) {
-            else if (metaDuration) {
+                var hours = parseInt(timeArr[0], 10);
-                duration = metaDuration;
+                var minutes = parseInt(timeArr[1], 10);
-            }
+                var seconds = parseInt(timeArr[2], 10);
-            var per = getFFmpegPercentage({
+                time = (hours * 3600) + (minutes * 60) + seconds;
-                f: frame,
-                fc: frameCount,
-                vf: frameRate,
-                d: duration,
-            });
-            var outputNum = Number(per);
-            if (outputNum > 0) {
-                percentage = outputNum;
             }
         }
+        var frameRate = videoFrameRate || 0;
+        var duration = 0;
+        if (ffprobeDuration
+            && parseFloat(ffprobeDuration) > 0) {
+            duration = parseFloat(ffprobeDuration);
+        }
+        else if (metaDuration) {
+            duration = metaDuration;
+        }
+        var per = getFFmpegPercentage({
+            time: time,
+            f: frame,
+            fc: frameCount,
+            vf: frameRate,
+            d: duration,
+        });
+        var outputNum = Number(per);
+        if (outputNum > 0) {
+            percentage = outputNum;
+        }
     }
     return percentage;
 };

FlowPluginsTs/FlowHelpers/1.0.0/cliParsers.ts

@@ -66,12 +66,13 @@ const getFFmpegVar = ({
 };
 
 const getFFmpegPercentage = ({
+  time,
   f,
   fc,
   vf,
   d,
 }: {
-
+  time: number,
   f: string, fc: number, vf: number, d: number
 }): number => {
   let frameCount01: number = fc;
@@ -85,12 +86,16 @@ const getFFmpegPercentage = ({
   VideoFrameRate = Math.ceil(VideoFrameRate);
   Duration = Math.ceil(Duration);
 
-  if (frameCount01 > 0) {
+  if (frame > 0) {
-    perc = ((frame / frameCount01) * 100);
+    if (frameCount01 > 0) {
-  } else if (VideoFrameRate > 0 && Duration > 0) {
+      perc = ((frame / frameCount01) * 100);
-    perc = ((frame / (VideoFrameRate * Duration)) * 100);
+    } else if (VideoFrameRate > 0 && Duration > 0) {
-  } else {
+      perc = ((frame / (VideoFrameRate * Duration)) * 100);
-    perc = (frame);
+    } else {
+      perc = (frame);
+    }
+  } else if (time > 0 && Duration > 0) {
+    perc = ((time / Duration) * 100);
   }
 
   const percString = perc.toFixed(2);
@@ -124,40 +129,54 @@ const ffmpegParser = ({
 
   let percentage = 0;
   if (str.length >= 6) {
-    const n = str.indexOf('fps');
+    const frame = getFFmpegVar({
-
+      str,
-    if (n >= 6) {
+      variable: 'frame',
-      // get frame
+    });
-      const frame = getFFmpegVar({
+
-        str,
+    let time = 0;
-        variable: 'frame',
+
-      });
+    // get time
+    const timeStr = getFFmpegVar({
+      str,
+      variable: 'time',
+    });
+
+    if (timeStr) {
+      const timeArr = timeStr.split(':');
+      if (timeArr.length === 3) {
+        const hours = parseInt(timeArr[0], 10);
+        const minutes = parseInt(timeArr[1], 10);
+        const seconds = parseInt(timeArr[2], 10);
+        time = (hours * 3600) + (minutes * 60) + seconds;
+      }
+    }
 
-      const frameRate = videoFrameRate || 0;
+    const frameRate = videoFrameRate || 0;
-      let duration = 0;
+    let duration = 0;
 
-      if (
+    if (
-        ffprobeDuration
+      ffprobeDuration
         && parseFloat(ffprobeDuration) > 0
-      ) {
+    ) {
-        duration = parseFloat(ffprobeDuration);
+      duration = parseFloat(ffprobeDuration);
-      } else if (metaDuration) {
+    } else if (metaDuration) {
-        duration = metaDuration;
+      duration = metaDuration;
-      }
+    }
 
-      const per = getFFmpegPercentage(
+    const per = getFFmpegPercentage(
-        {
+      {
-          f: frame,
+        time,
-          fc: frameCount,
+        f: frame,
-          vf: frameRate,
+        fc: frameCount,
-          d: duration,
+        vf: frameRate,
-        },
+        d: duration,
-      );
+      },
-
+    );
-      const outputNum = Number(per);
+
-      if (outputNum > 0) {
+    const outputNum = Number(per);
-        percentage = outputNum;
+    if (outputNum > 0) {
-      }
+      percentage = outputNum;
     }
   }