@nexrender/core 1.52.1 → 1.53.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrender/core",
-  "version": "1.52.1",
+  "version": "1.53.0",
   "main": "src/index.js",
   "author": "Inlife",
   "homepage": "https://www.nexrender.com",
@@ -40,5 +40,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "696f8a9dfea2668acee490e1f753c51fdff1ac73"
+  "gitHead": "7c2436fb31a71f1d5c210a96ececdc7070282944"
 }

package/src/tasks/download.js

@@ -26,7 +26,9 @@ const download = (job, settings, asset) => {
         destName = decodeURI(destName) /* < remove/decode any special URI symbols within filename */
 
         /* prevent duplicate filename collisions during parallel fetch */
-        destName = Math.random().toString(36).substring(2) + '-' + destName;
+        if (!asset.sequence) {
+            destName = Math.random().toString(36).substring(2) + '-' + destName;
+        }
     }
 
     /* force asset name if it is provided */

package/src/tasks/render.js

@@ -3,11 +3,19 @@ const path = require('path')
 const {spawn} = require('child_process')
 const {expandEnvironmentVariables, checkForWSL} = require('../helpers/path')
 
-const progressRegex = /([\d]{1,2}:[\d]{2}:[\d]{2}:[\d]{2})\s+(\(\d+[UL]?\))/gi;
-const durationRegex = /Duration:\s+([\d]{1,2}:[\d]{2}:[\d]{2}:[\d]{2})/gi;
-const startRegex = /Start:\s+([\d]{1,2}:[\d]{2}:[\d]{2}:[\d]{2})/gi;
-const nexrenderErrorRegex = /Error:\s+(nexrender:.*)$/gim;
-const errorRegex = /aerender Error:\s*(.*)$/gis;
+const translations = {
+    "en": {
+        "duration": "Duration",
+        "error"   : "Error",
+        "start"   : "Start"
+    },
+    "de": {
+        "duration": "Dauer",
+        "error"   : "Fehler",
+        "start"   : "Anfang"
+    }
+};
+
 
 const option = (params, name, ...values) => {
     if (values !== undefined) {
@@ -25,6 +33,17 @@ const seconds = (string) => string.split(':')
 module.exports = (job, settings) => {
     settings.logger.log(`[${job.uid}] rendering job...`);
 
+    if(!settings.language) {
+        settings.lang = "en"
+    }
+
+    const progressRegex = /([\d]{1,2}:[\d]{2}:[\d]{2}:[\d]{2})\s+(\(\d+[UL]?\))/gi;
+    const durationRegex = new RegExp(translations[settings.language].duration + ":\\s+([\\d]{1,2}:[\\d]{2}:[\\d]{2}:[\\d]{2})", "gi");
+    const startRegex = new RegExp(translations[settings.language].start + ":\\s+([\\d]{1,2}:[\\d]{2}:[\\d]{2}:[\\d]{2})", "gi");
+    const nexrenderErrorRegex = new RegExp(translations[settings.language].error + ":\\s+(nexrender:.*)$", "gim");
+    const errorRegex = new RegExp("aerender " + translations[settings.language].error + ":\\s*(.*)$", "gis");
+
+
     // create container for our parameters
     let params = [];
     let outputFile = expandEnvironmentVariables(job.output)