@pixwel/pixwel-sdk 2.1.37 → 2.1.39

package/dist/src/TimeFormat.js

@@ -1,13 +1,13 @@
 'use strict';
 
-var cov_gdubdzoql = function () {
-    var path = '/home/ec2-user/platform/pixwel-sdk/src/TimeFormat.js',
-        hash = '4e41d0bca2e4a35aef87a0879bb44c1696ba06a5',
+var cov_twzg327in = function () {
+    var path = '/Users/jeff/www/pixwel/platform2/pixwel-sdk/src/TimeFormat.js',
+        hash = 'e088183d370b3db442e98f1887a6e3c60f695efd',
         Function = function () {}.constructor,
         global = new Function('return this')(),
         gcv = '__coverage__',
         coverageData = {
-        path: '/home/ec2-user/platform/pixwel-sdk/src/TimeFormat.js',
+        path: '/Users/jeff/www/pixwel/platform2/pixwel-sdk/src/TimeFormat.js',
         statementMap: {
             '0': {
                 start: {
@@ -880,85 +880,85 @@ var cov_gdubdzoql = function () {
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-var stringRegex = (cov_gdubdzoql.s[0]++, /^(\d+):(\d+):(\d+)[,|.](\d{2,3})?$/);
+var stringRegex = (cov_twzg327in.s[0]++, /^(\d+):(\d+):(\d+)[,|.](\d{2,3})?$/);
 
 exports.default = {
     isValidTime: function isValidTime(time) {
-        cov_gdubdzoql.f[0]++;
-        cov_gdubdzoql.s[1]++;
+        cov_twzg327in.f[0]++;
+        cov_twzg327in.s[1]++;
 
         return !!time.match(stringRegex);
     },
     timeToTimestamp: function timeToTimestamp(time) {
-        cov_gdubdzoql.f[1]++;
+        cov_twzg327in.f[1]++;
 
-        var match = (cov_gdubdzoql.s[2]++, time.match(stringRegex));
-        cov_gdubdzoql.s[3]++;
+        var match = (cov_twzg327in.s[2]++, time.match(stringRegex));
+        cov_twzg327in.s[3]++;
         if (!match) {
-            cov_gdubdzoql.b[0][0]++;
-            cov_gdubdzoql.s[4]++;
+            cov_twzg327in.b[0][0]++;
+            cov_twzg327in.s[4]++;
 
             return 0;
         } else {
-            cov_gdubdzoql.b[0][1]++;
+            cov_twzg327in.b[0][1]++;
         }
-        var precision = (cov_gdubdzoql.s[5]++, match[4].length === 2 ? (cov_gdubdzoql.b[1][0]++, 100) : (cov_gdubdzoql.b[1][1]++, 1000));
-        cov_gdubdzoql.s[6]++;
+        var precision = (cov_twzg327in.s[5]++, match[4].length === 2 ? (cov_twzg327in.b[1][0]++, 100) : (cov_twzg327in.b[1][1]++, 1000));
+        cov_twzg327in.s[6]++;
         return parseInt(match[1], 10) * 60 * 60 + parseInt(match[2], 10) * 60 + parseInt(match[3], 10) + parseInt(match[4], 10) / precision;
     },
     timestampToTime: function timestampToTime(second, decimalMark) {
-        cov_gdubdzoql.f[2]++;
+        cov_twzg327in.f[2]++;
 
-        var hours = (cov_gdubdzoql.s[7]++, ~~(second / 3600));
-        var min = (cov_gdubdzoql.s[8]++, ~~(second / 60) % 60);
-        var sec = (cov_gdubdzoql.s[9]++, second % 60);
-        var fixedSec = (cov_gdubdzoql.s[10]++, sec.toFixed(3).replace('.', decimalMark ? (cov_gdubdzoql.b[2][0]++, decimalMark) : (cov_gdubdzoql.b[2][1]++, ',')));
-        cov_gdubdzoql.s[11]++;
-        return (hours < 10 ? (cov_gdubdzoql.b[3][0]++, '0' + hours) : (cov_gdubdzoql.b[3][1]++, hours)) + ":" + (min < 10 ? (cov_gdubdzoql.b[4][0]++, '0' + min) : (cov_gdubdzoql.b[4][1]++, min)) + ':' + (sec < 10 ? (cov_gdubdzoql.b[5][0]++, '0' + fixedSec) : (cov_gdubdzoql.b[5][1]++, fixedSec));
+        var hours = (cov_twzg327in.s[7]++, ~~(second / 3600));
+        var min = (cov_twzg327in.s[8]++, ~~(second / 60) % 60);
+        var sec = (cov_twzg327in.s[9]++, second % 60);
+        var fixedSec = (cov_twzg327in.s[10]++, sec.toFixed(3).replace('.', decimalMark ? (cov_twzg327in.b[2][0]++, decimalMark) : (cov_twzg327in.b[2][1]++, ',')));
+        cov_twzg327in.s[11]++;
+        return (hours < 10 ? (cov_twzg327in.b[3][0]++, '0' + hours) : (cov_twzg327in.b[3][1]++, hours)) + ":" + (min < 10 ? (cov_twzg327in.b[4][0]++, '0' + min) : (cov_twzg327in.b[4][1]++, min)) + ':' + (sec < 10 ? (cov_twzg327in.b[5][0]++, '0' + fixedSec) : (cov_twzg327in.b[5][1]++, fixedSec));
     },
     timeDiff: function timeDiff(time1, time2) {
-        cov_gdubdzoql.f[3]++;
-        cov_gdubdzoql.s[12]++;
+        cov_twzg327in.f[3]++;
+        cov_twzg327in.s[12]++;
 
-        if ((cov_gdubdzoql.b[7][0]++, time1 === undefined) || (cov_gdubdzoql.b[7][1]++, time2 === undefined)) {
-            cov_gdubdzoql.b[6][0]++;
-            cov_gdubdzoql.s[13]++;
+        if ((cov_twzg327in.b[7][0]++, time1 === undefined) || (cov_twzg327in.b[7][1]++, time2 === undefined)) {
+            cov_twzg327in.b[6][0]++;
+            cov_twzg327in.s[13]++;
 
             return 0;
         } else {
-            cov_gdubdzoql.b[6][1]++;
+            cov_twzg327in.b[6][1]++;
         }
-        cov_gdubdzoql.s[14]++;
+        cov_twzg327in.s[14]++;
         return this.timestampDiff(this.timeToTimestamp(time1), this.timeToTimestamp(time2));
     },
     timestampDiff: function timestampDiff(time1, time2) {
-        cov_gdubdzoql.f[4]++;
-        cov_gdubdzoql.s[15]++;
+        cov_twzg327in.f[4]++;
+        cov_twzg327in.s[15]++;
 
-        if ((cov_gdubdzoql.b[9][0]++, time1 === undefined) || (cov_gdubdzoql.b[9][1]++, time2 === undefined) || (cov_gdubdzoql.b[9][2]++, time1 === time2)) {
-            cov_gdubdzoql.b[8][0]++;
-            cov_gdubdzoql.s[16]++;
+        if ((cov_twzg327in.b[9][0]++, time1 === undefined) || (cov_twzg327in.b[9][1]++, time2 === undefined) || (cov_twzg327in.b[9][2]++, time1 === time2)) {
+            cov_twzg327in.b[8][0]++;
+            cov_twzg327in.s[16]++;
 
             return 0;
         } else {
-            cov_gdubdzoql.b[8][1]++;
+            cov_twzg327in.b[8][1]++;
         }
-        var diff = (cov_gdubdzoql.s[17]++, time2 - time1);
-        cov_gdubdzoql.s[18]++;
+        var diff = (cov_twzg327in.s[17]++, time2 - time1);
+        cov_twzg327in.s[18]++;
         return Math.round(Math.max(-1, Math.min(1, diff)) * 10) / 10;
     },
     startTime: function startTime(line) {
-        cov_gdubdzoql.f[5]++;
+        cov_twzg327in.f[5]++;
 
-        var timestamp = (cov_gdubdzoql.s[19]++, this.timeToTimestamp(line.startTime) + ((cov_gdubdzoql.b[10][0]++, line.inOffset) || (cov_gdubdzoql.b[10][1]++, 0)));
-        cov_gdubdzoql.s[20]++;
+        var timestamp = (cov_twzg327in.s[19]++, this.timeToTimestamp(line.startTime) + ((cov_twzg327in.b[10][0]++, line.inOffset) || (cov_twzg327in.b[10][1]++, 0)));
+        cov_twzg327in.s[20]++;
         return this.timestampToTime(timestamp);
     },
     stopTime: function stopTime(line) {
-        cov_gdubdzoql.f[6]++;
+        cov_twzg327in.f[6]++;
 
-        var timestamp = (cov_gdubdzoql.s[21]++, this.timeToTimestamp(line.stopTime) + ((cov_gdubdzoql.b[11][0]++, line.outOffset) || (cov_gdubdzoql.b[11][1]++, 0)));
-        cov_gdubdzoql.s[22]++;
+        var timestamp = (cov_twzg327in.s[21]++, this.timeToTimestamp(line.stopTime) + ((cov_twzg327in.b[11][0]++, line.outOffset) || (cov_twzg327in.b[11][1]++, 0)));
+        cov_twzg327in.s[22]++;
         return this.timestampToTime(timestamp);
     }
 };

package/dist/src/fileType.js

@@ -1,13 +1,13 @@
 "use strict";
 
-var cov_6vz0wl3fa = function () {
-	var path = "/home/ec2-user/platform/pixwel-sdk/src/fileType.js",
-	    hash = "479746e24a1bf0d4facba1d1ae2f30519ce932b2",
+var cov_rbwlazav = function () {
+	var path = "/Users/jeff/www/pixwel/platform2/pixwel-sdk/src/fileType.js",
+	    hash = "8c0972cb3582b18ca41711ec8a591eefb67ebd44",
 	    Function = function () {}.constructor,
 	    global = new Function('return this')(),
 	    gcv = "__coverage__",
 	    coverageData = {
-		path: "/home/ec2-user/platform/pixwel-sdk/src/fileType.js",
+		path: "/Users/jeff/www/pixwel/platform2/pixwel-sdk/src/fileType.js",
 		statementMap: {
 			"0": {
 				start: {
@@ -296,9 +296,9 @@ var cov_6vz0wl3fa = function () {
 	return coverage[path] = coverageData;
 }();
 
-var extname = (cov_6vz0wl3fa.s[0]++, require("path").extname);
+var extname = (cov_rbwlazav.s[0]++, require("path").extname);
 
-var TYPES = (cov_6vz0wl3fa.s[1]++, {
+var TYPES = (cov_rbwlazav.s[1]++, {
 	document: ["doc", "docx", "xls", "xlsx", "txt", "pdf", "ppt", "pptx"],
 
 	video: ["mov", "mp4", "m4v", "mpg", "mxf"],
@@ -311,50 +311,50 @@ var TYPES = (cov_6vz0wl3fa.s[1]++, {
 });
 
 function extensionType(extension) {
-	cov_6vz0wl3fa.f[0]++;
-	cov_6vz0wl3fa.s[2]++;
+	cov_rbwlazav.f[0]++;
+	cov_rbwlazav.s[2]++;
 
 	for (var type in TYPES) {
-		cov_6vz0wl3fa.s[3]++;
+		cov_rbwlazav.s[3]++;
 
 		if (TYPES[type].indexOf(extension) > -1) {
-			cov_6vz0wl3fa.b[0][0]++;
-			cov_6vz0wl3fa.s[4]++;
+			cov_rbwlazav.b[0][0]++;
+			cov_rbwlazav.s[4]++;
 
 			return type;
 		} else {
-			cov_6vz0wl3fa.b[0][1]++;
+			cov_rbwlazav.b[0][1]++;
 		}
 	}
 }
 
 function extension(path) {
-	cov_6vz0wl3fa.f[1]++;
-	cov_6vz0wl3fa.s[5]++;
+	cov_rbwlazav.f[1]++;
+	cov_rbwlazav.s[5]++;
 
 	return extname(path.split("?")[0].toLowerCase()).substring(1);
 }
 
 function mediaType(path) {
-	cov_6vz0wl3fa.f[2]++;
+	cov_rbwlazav.f[2]++;
 
-	var type = (cov_6vz0wl3fa.s[6]++, extensionType(extension(path)));
+	var type = (cov_rbwlazav.s[6]++, extensionType(extension(path)));
 
-	cov_6vz0wl3fa.s[7]++;
+	cov_rbwlazav.s[7]++;
 	if (type) {
-		cov_6vz0wl3fa.b[1][0]++;
-		cov_6vz0wl3fa.s[8]++;
+		cov_rbwlazav.b[1][0]++;
+		cov_rbwlazav.s[8]++;
 
 		return type;
 	} else {
-		cov_6vz0wl3fa.b[1][1]++;
+		cov_rbwlazav.b[1][1]++;
 	}
 
-	cov_6vz0wl3fa.s[9]++;
+	cov_rbwlazav.s[9]++;
 	throw new Error("Unknown extension '" + extension + "'");
 }
 
-cov_6vz0wl3fa.s[10]++;
+cov_rbwlazav.s[10]++;
 module.exports = {
 	extension: extension,
 	extensionType: extensionType,

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@pixwel/pixwel-sdk",
 	"description": "",
-	"version": "2.1.37",
+	"version": "2.1.39",
 	"author": "Pixwel",
 	"license": "UNLICENSED",
 	"main": "./dist/index.js",

package/src/Ingest.js

@@ -596,7 +596,8 @@ export default class Ingest extends Model {
 		}
 
 		if (original.context.tag) {
-			ingest.selected.download.tags.Extra = [original.context.tag];
+			ingest.selected.download.tags.Extra = [];
+			ingest.selected.download.tags.Extra = ingest.selected.download.tags.Extra.concat(original.context.tag);
 		}
 
 		if (original.context.revision) {
@@ -631,15 +632,6 @@ export default class Ingest extends Model {
 
 		ingest.selected.preview.watermark = watermarks[0] ? watermarks[0]._id : "";
 
-		let tags = ingest.selected.download.tags;
-		ingest.selected.preview.enabled =
-			!!(
-				tags.Codec == "prores" &&
-				tags.Resolution.split("x")[1] == "1080" &&
-				(tags.Framerate == "23.98" || tags.Framerate == "25") &&
-				watermarks.length
-			) || false;
-
 		return ingest;
 	}
 }

package/test/Ingest.spec.js

@@ -1471,28 +1471,6 @@ describe("Ingest", () => {
 			let data = ingest.assemble({ filename, order });
 			expect(data.selected.preview.revision).toBe("Final");
 		});
-		it("should enable preview if file is prores 1080p 23.98/25", () => {
-			let original = { context: {} };
-			let filename = {
-				selected: { download: { language: "ENG", country: "US" } }
-			};
-			let mediainfo = {
-				selected: {
-					download: {
-						tags: {
-							Codec: "prores",
-							Resolution: "720x1080",
-							Framerate: "23.98"
-						}
-					}
-				}
-			};
-			let order = new Order();
-			let watermarks = [1];
-			let ingest = new Ingest(original);
-			let data = ingest.assemble({ filename, mediainfo, order, watermarks });
-			expect(data.selected.preview.enabled).toBe(true);
-		});
 		it("should prefer language and country from order over filename", () => {
 			let original = { context: {} };
 			let filename = {

package/update-sdk.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euf -o pipefail
+
 npm run build
 npm publish