Merge pull request #530 from HaveAGitGat/parser_update

More accurate hb 2 pass logic
HaveAGitGat · Nov 8, 2023 · 3bfa384 · 3bfa384
2 parents 82b61eb + d949b20
commit 3bfa384
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 14 deletions.
diff --git a/FlowPlugins/FlowHelpers/1.0.0/cliParsers.js b/FlowPlugins/FlowHelpers/1.0.0/cliParsers.js
@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.editreadyParser = exports.getFFmpegVar = exports.getFFmpegPercentage = exports.ffmpegParser = exports.handbrakeParser = void 0;
 var handbrakeParser = function (_a) {
-    var str = _a.str;
+    var str = _a.str, hbPass = _a.hbPass;
     if (typeof str !== 'string') {
         return 0;
     }
@@ -19,14 +19,14 @@ var handbrakeParser = function (_a) {
         var outputNum = Number(output);
         if (outputNum > 0) {
             percentage = outputNum;
+            if (hbPass === 1) {
+                percentage /= 2;
+            }
+            else if (hbPass === 2) {
+                percentage = 50 + (percentage / 2);
+            }
         }
     }
-    if (str.includes('task 1 of 2')) {
-        percentage /= 2;
-    }
-    else if (str.includes('task 2 of 2')) {
-        percentage = 50 + (percentage / 2);
-    }
     return percentage;
 };
 exports.handbrakeParser = handbrakeParser;

diff --git a/FlowPlugins/FlowHelpers/1.0.0/cliUtils.js b/FlowPlugins/FlowHelpers/1.0.0/cliUtils.js
@@ -92,6 +92,7 @@ var CLI = /** @class */ (function () {
         this.oldEstSize = 0;
         this.oldProgress = 0;
         this.lastProgCheck = 0;
+        this.hbPass = 0;
         this.updateETA = function (perc) {
             if (perc > 0) {
                 if (_this.lastProgCheck === 0) {
@@ -154,8 +155,15 @@ var CLI = /** @class */ (function () {
                 _this.config.jobLog(str);
             }
             if (_this.config.cli.toLowerCase().includes('handbrake')) {
+                if (str.includes('task 1 of 2')) {
+                    _this.hbPass = 1;
+                }
+                else if (str.includes('task 2 of 2')) {
+                    _this.hbPass = 2;
+                }
                 var percentage = (0, cliParsers_1.handbrakeParser)({
                     str: str,
+                    hbPass: _this.hbPass,
                 });
                 if (percentage > 0) {
                     _this.updateETA(percentage);

diff --git a/FlowPluginsTs/FlowHelpers/1.0.0/cliParsers.ts b/FlowPluginsTs/FlowHelpers/1.0.0/cliParsers.ts
@@ -1,8 +1,10 @@
 const handbrakeParser = ({
   str,
+  hbPass,
 }:
   {
-    str: string
+    str: string,
+    hbPass: number
   }): number => {
   if (typeof str !== 'string') {
     return 0;
@@ -25,13 +27,13 @@ const handbrakeParser = ({
     const outputNum = Number(output);
     if (outputNum > 0) {
       percentage = outputNum;
-    }
-  }
 
-  if (str.includes('task 1 of 2')) {
-    percentage /= 2;
-  } else if (str.includes('task 2 of 2')) {
-    percentage = 50 + (percentage / 2);
+      if (hbPass === 1) {
+        percentage /= 2;
+      } else if (hbPass === 2) {
+        percentage = 50 + (percentage / 2);
+      }
+    }
   }
 
   return percentage;

diff --git a/FlowPluginsTs/FlowHelpers/1.0.0/cliUtils.ts b/FlowPluginsTs/FlowHelpers/1.0.0/cliUtils.ts
@@ -85,6 +85,8 @@ class CLI {
 
   lastProgCheck = 0;
 
+  hbPass = 0;
+
   constructor(config: Iconfig) {
     this.config = config;
   }
@@ -163,9 +165,17 @@ class CLI {
     }
 
     if (this.config.cli.toLowerCase().includes('handbrake')) {
+      if (str.includes('task 1 of 2')) {
+        this.hbPass = 1;
+      } else if (str.includes('task 2 of 2')) {
+        this.hbPass = 2;
+      }
+
       const percentage = handbrakeParser({
         str,
+        hbPass: this.hbPass,
       });
+
       if (percentage > 0) {
         this.updateETA(percentage);
         this.config.updateWorker({