@pixwel/pixwel-sdk 2.1.29 → 2.1.31

package/dist/src/Ingest.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 	value: true
 });
 
-var _stringify = require("babel-runtime/core-js/json/stringify");
+var _slicedToArray2 = require("babel-runtime/helpers/slicedToArray");
 
-var _stringify2 = _interopRequireDefault(_stringify);
+var _slicedToArray3 = _interopRequireDefault(_slicedToArray2);
 
 var _getPrototypeOf = require("babel-runtime/core-js/object/get-prototype-of");
 
@@ -100,9 +100,6 @@ var Ingest = function (_Model) {
 			var options = this.data().selected.download;
 			var mediaType = this.data().asset.mediaType;
 
-			console.log('Ingest.renderFilename.options');
-			console.log((0, _stringify2.default)(options));
-
 			if (!asset.project) {
 				throw new Error("missing asset.project");
 			}
@@ -244,53 +241,44 @@ var Ingest = function (_Model) {
 				return result;
 			}
 
-			function matchSet(allTags, tags) {
-				var selectedTags = (0, _lodash2.default)(tags).values().flatten().value();
-
-				var setTag = (0, _lodash2.default)(allTags).filter("set").find(function (setTag) {
-					return _lodash2.default.difference(setTag.set, selectedTags).length === 0;
-				});
-
-				if (setTag) {
-					return setTag.name;
-				}
-			}
+			var tags = options.tags;
 
-			var tags = options.tags,
-			    parts = [asset.project.filePrefix, assetType(asset, allTypes), assetTitle(asset), runningTime(asset), locale(options.country, options.language), textType(tags.SubDub, tags.Text), tags.Extra.join("_"), options.version, tags.Codec];
+			var parts = [asset.project.filePrefix, assetType(asset, allTypes), assetTitle(asset), runningTime(asset), locale(options.country, options.language), textType(tags.SubDub, tags.Text), tags.Extra.join("_"), options.version, tags.Codec];
 
 			parts = (0, _lodash2.default)(parts).flatten().filter().map(function (part) {
 				return part.toUpperCase();
 			});
 
-			var matchedSet = matchSet(allTags, options.tags);
 			var requiredInfo = tags.Resolution && tags["Frame Mode"] && tags.Framerate;
 
-			if (matchedSet) {
-				parts = parts.push(matchedSet);
-			} else if (mediaType == "video" && tags.Resolution && !requiredInfo) {
+			if (mediaType == "video" && tags.Resolution && !requiredInfo) {
 				parts = parts.push(tags.Resolution.replace(/\d+x/, ""));
 			} else if (mediaType == "image" && tags.Resolution) {
 				parts = parts.push(tags.Resolution);
 			}
 
-			var name = parts.join("_");
+			if (mediaType === 'video' && tags.Aspect && tags.Resolution && tags.Standard && tags.Framerate && tags['Frame Mode']) {
+				var _tags$Resolution$spli = tags.Resolution.split('x'),
+				    _tags$Resolution$spli2 = (0, _slicedToArray3.default)(_tags$Resolution$spli, 2),
+				    width = _tags$Resolution$spli2[0],
+				    height = _tags$Resolution$spli2[1];
+
+				var isHD = height === '1080' ? true : false;
 
-			var hasResInfo = null;
-			var hasAllInfo = null;
+				var aspect = tags.Aspect.replace(':', 'X');
+				var standard = tags.Standard.toUpperCase();
+				var frameModeToken = tags["Frame Mode"][0].toLowerCase();
+				var frameRate = tags.Framerate.replace(".", "");
 
-			if (requiredInfo && !hasResInfo && !hasAllInfo) {
-				var res = tags.Resolution;
-				var encodeTag = [hasResInfo ? "" : res.indexOf("x") ? res.replace(/\d+x/, "") : res, res.match(/i|p/i) && !hasResInfo ? "" : tags["Frame Mode"].toLowerCase().slice(0, 1), tags.Framerate.replace(".", "").toUpperCase()].filter(function (val) {
-					return val;
-				}).join("");
+				if (tags.Usage === "broadcast" && !isHD) {
+					parts = parts.push(standard + "-" + aspect);
+				}
 
-				var match = new RegExp(encodeTag, "i");
-				name = name.match(match) ? name.replace(match, encodeTag) : name + "_" + encodeTag;
-			} else if (hasResInfo && !hasAllInfo && tags.Framerate) {
-				name += tags.Framerate.replace(".", "").toUpperCase();
+				parts = parts.push("" + height + frameModeToken + frameRate);
 			}
 
+			var name = parts.join("_");
+
 			return name + "." + extension;
 		}
 		/**
@@ -414,6 +402,7 @@ var Ingest = function (_Model) {
 			if (!tags.Standard) {
 				switch (tags.Framerate) {
 					case "24":
+					case "23.976":
 					case "23.98":
 					case "29.97":
 					case "59.94":
@@ -464,6 +453,7 @@ var Ingest = function (_Model) {
 					tags.Aspect = "16:9";
 					break;
 				case "1.778":
+				case "1.779":
 					tags.Aspect = "16:9";
 					break;
 				case "1.366":

package/package.json

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

package/src/Ingest.js

@@ -47,9 +47,6 @@ export default class Ingest extends Model {
 		let options = this.data().selected.download;
 		let mediaType = this.data().asset.mediaType;
 
-		console.log('Ingest.renderFilename.options');
-		console.log(JSON.stringify(options));
-
 		if (!asset.project) {
 			throw new Error("missing asset.project");
 		}
@@ -195,25 +192,9 @@ export default class Ingest extends Model {
 			return result;
 		}
 
-		function matchSet(allTags, tags) {
-			let selectedTags = _(tags)
-				.values()
-				.flatten()
-				.value();
-
-			let setTag = _(allTags)
-				.filter("set")
-				.find(setTag => {
-					return _.difference(setTag.set, selectedTags).length === 0;
-				});
+		let tags = options.tags;
 
-			if (setTag) {
-				return setTag.name;
-			}
-		}
-
-		let tags = options.tags,
-			parts = [
+		let parts = [
 				asset.project.filePrefix,
 				assetType(asset, allTypes),
 				assetTitle(asset),
@@ -230,44 +211,34 @@ export default class Ingest extends Model {
 			.filter()
 			.map(part => part.toUpperCase());
 
-		let matchedSet = matchSet(allTags, options.tags);
 		let requiredInfo = tags.Resolution && tags["Frame Mode"] && tags.Framerate;
 
-		if (matchedSet) {
-			parts = parts.push(matchedSet);
-		} else if (mediaType == "video" && tags.Resolution && !requiredInfo) {
+		if (mediaType == "video" && tags.Resolution && !requiredInfo) {
 			parts = parts.push(tags.Resolution.replace(/\d+x/, ""));
 		} else if (mediaType == "image" && tags.Resolution) {
 			parts = parts.push(tags.Resolution);
 		}
 
-		let name = parts.join("_");
+		if (mediaType === 'video' && tags.Aspect && tags.Resolution && tags.Standard && tags.Framerate && tags['Frame Mode']) {
 
-		let hasResInfo = null;
-		let hasAllInfo = null;
-
-		if (requiredInfo && !hasResInfo && !hasAllInfo) {
-			let res = tags.Resolution;
-			let encodeTag = [
-				hasResInfo ? "" : res.indexOf("x") ? res.replace(/\d+x/, "") : res,
-				res.match(/i|p/i) && !hasResInfo
-					? ""
-					: tags["Frame Mode"].toLowerCase().slice(0, 1),
-				tags.Framerate.replace(".", "").toUpperCase()
-			]
-				.filter(val => {
-					return val;
-				})
-				.join("");
+			let [ width, height ] = tags.Resolution.split('x');
+			let isHD = (height === '1080') ? true : false;
+
+			let aspect = tags.Aspect.replace(':', 'X');
+			let standard = tags.Standard.toUpperCase();
+			let frameModeToken = tags["Frame Mode"][0].toLowerCase();
+			let frameRate = tags.Framerate.replace(".", "");
+
+			if (tags.Usage === "broadcast" && !isHD) {
+				parts = parts.push(`${standard}-${aspect}`);
+			}
+
+			parts = parts.push(`${height}${frameModeToken}${frameRate}`);
 
-			let match = new RegExp(encodeTag, "i");
-			name = name.match(match)
-				? name.replace(match, encodeTag)
-				: name + "_" + encodeTag;
-		} else if (hasResInfo && !hasAllInfo && tags.Framerate) {
-			name += tags.Framerate.replace(".", "").toUpperCase();
 		}
 
+		let name = parts.join("_");
+
 		return `${name}.${extension}`;
 	}
 	/**
@@ -385,6 +356,7 @@ export default class Ingest extends Model {
 		if (!tags.Standard) {
 			switch (tags.Framerate) {
 				case "24":
+				case "23.976":
 				case "23.98":
 				case "29.97":
 				case "59.94":
@@ -435,6 +407,7 @@ export default class Ingest extends Model {
 				tags.Aspect = "16:9";
 				break;
 			case "1.778":
+			case "1.779":
 				tags.Aspect = "16:9";
 				break;
 			case "1.366":