@pixwel/pixwel-sdk 2.1.29 → 2.1.30

package/dist/src/Ingest.js

@@ -4,10 +4,6 @@ Object.defineProperty(exports, "__esModule", {
 	value: true
 });
 
-var _stringify = require("babel-runtime/core-js/json/stringify");
-
-var _stringify2 = _interopRequireDefault(_stringify);
-
 var _getPrototypeOf = require("babel-runtime/core-js/object/get-prototype-of");
 
 var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
@@ -100,9 +96,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,18 +237,6 @@ 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,
 			    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];
 
@@ -263,12 +244,9 @@ var Ingest = function (_Model) {
 				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);
@@ -287,8 +265,6 @@ var Ingest = function (_Model) {
 
 				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();
 			}
 
 			return name + "." + extension;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@pixwel/pixwel-sdk",
 	"description": "",
-	"version": "2.1.29",
+	"version": "2.1.30",
 	"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,23 +192,6 @@ 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;
-				});
-
-			if (setTag) {
-				return setTag.name;
-			}
-		}
-
 		let tags = options.tags,
 			parts = [
 				asset.project.filePrefix,
@@ -230,12 +210,9 @@ 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);
@@ -264,8 +241,6 @@ export default class Ingest extends Model {
 			name = name.match(match)
 				? name.replace(match, encodeTag)
 				: name + "_" + encodeTag;
-		} else if (hasResInfo && !hasAllInfo && tags.Framerate) {
-			name += tags.Framerate.replace(".", "").toUpperCase();
 		}
 
 		return `${name}.${extension}`;