@pixwel/pixwel-sdk 1.1.8 → 1.1.10

package/dist/src/Filename.js

@@ -45,19 +45,19 @@ var Filename = function () {
 			var mediaType = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "";
 
 			if (!asset.project) {
-				throw "missing asset.project";
+				throw new Error("missing asset.project");
 			}
 
 			if (asset.project && !asset.project.filePrefix) {
-				throw "missing asset.project.filePrefix";
+				throw new Error("missing asset.project.filePrefix");
 			}
 
 			if (!asset.name) {
-				throw "missing asset.name";
+				throw new Error("missing asset.name");
 			}
 
 			if (!asset.type) {
-				throw "missing asset.type";
+				throw new Error("missing asset.type");
 			}
 
 			var defaults = {
@@ -82,23 +82,23 @@ var Filename = function () {
 			options = _lodash2.default.merge(defaults, options);
 
 			if (!options.language) {
-				throw "missing options.language";
+				throw new Error("missing options.language");
 			}
 
 			if (mediaType && mediaType == "video" && !options.tags.Codec) {
-				throw "missing options.tags.Codec";
+				throw new Error("missing options.tags.Codec");
 			}
 
 			if (mediaType && mediaType == "video" && !options.tags.Resolution) {
-				throw "missing options.tags.Resolution";
+				throw new Error("missing options.tags.Resolution");
 			}
 
 			if (mediaType && mediaType == "video" && !options.tags.Framerate) {
-				throw "missing options.tags.Framerate";
+				throw new Error("missing options.tags.Framerate");
 			}
 
 			if (mediaType == "video" && !options.tags["Frame Mode"]) {
-				throw "missing options.tags[Frame Mode]";
+				throw new Error("missing options.tags[Frame Mode]");
 			}
 
 			function assetType(asset, types) {
@@ -108,7 +108,7 @@ var Filename = function () {
 
 				var matchingType = _lodash2.default.find(types, { name: asset.type });
 				if (!matchingType) {
-					throw "Asset type \"" + asset.type + "\" could not be found";
+					throw new Error("Asset type \"" + asset.type + "\" could not be found");
 				}
 
 				return matchingType.file || matchingType.name.replace(".", "-").toUpperCase();

package/dist/src/Ingest.js

@@ -312,6 +312,10 @@ var Ingest = function () {
 				ingest.selected.asset = filename.asset._id;
 			}
 
+			if (order.asset) {
+				ingest.selected.asset = order.asset;
+			}
+
 			if (ingest.workRequest) {
 				ingest.selected.project = ingest.context.project;
 				ingest.selected.asset = ingest.context.asset;

package/package.json

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

package/src/Filename.js

@@ -24,19 +24,19 @@ export default class Filename {
 		mediaType = ""
 	) {
 		if (!asset.project) {
-			throw "missing asset.project";
+			throw new Error("missing asset.project");
 		}
 
 		if (asset.project && !asset.project.filePrefix) {
-			throw "missing asset.project.filePrefix";
+			throw new Error("missing asset.project.filePrefix");
 		}
 
 		if (!asset.name) {
-			throw "missing asset.name";
+			throw new Error("missing asset.name");
 		}
 
 		if (!asset.type) {
-			throw "missing asset.type";
+			throw new Error("missing asset.type");
 		}
 
 		let defaults = {
@@ -61,23 +61,23 @@ export default class Filename {
 		options = _.merge(defaults, options);
 
 		if (!options.language) {
-			throw "missing options.language";
+			throw new Error("missing options.language");
 		}
 
 		if (mediaType && mediaType == "video" && !options.tags.Codec) {
-			throw "missing options.tags.Codec";
+			throw new Error("missing options.tags.Codec");
 		}
 
 		if (mediaType && mediaType == "video" && !options.tags.Resolution) {
-			throw "missing options.tags.Resolution";
+			throw new Error("missing options.tags.Resolution");
 		}
 
 		if (mediaType && mediaType == "video" && !options.tags.Framerate) {
-			throw "missing options.tags.Framerate";
+			throw new Error("missing options.tags.Framerate");
 		}
 
 		if (mediaType == "video" && !options.tags["Frame Mode"]) {
-			throw "missing options.tags[Frame Mode]";
+			throw new Error("missing options.tags[Frame Mode]");
 		}
 
 		function assetType(asset, types) {
@@ -87,7 +87,7 @@ export default class Filename {
 
 			let matchingType = _.find(types, { name: asset.type });
 			if (!matchingType) {
-				throw `Asset type "${asset.type}" could not be found`;
+				throw new Error(`Asset type "${asset.type}" could not be found`);
 			}
 
 			return (

package/src/Ingest.js

@@ -284,6 +284,10 @@ export default class Ingest {
 			ingest.selected.asset = filename.asset._id;
 		}
 
+		if (order.asset) {
+			ingest.selected.asset = order.asset;
+		}
+
 		if (ingest.workRequest) {
 			ingest.selected.project = ingest.context.project;
 			ingest.selected.asset = ingest.context.asset;

package/test/Ingest.spec.js

@@ -27,6 +27,18 @@ describe("Ingest", () => {
 			expect(ingest.selected.download.language).toBe("ENG");
 			expect(ingest.selected.download.country).toBe("US");
 		});
+		it('should use asset from order when available', () => {
+			let original = {
+				context: {}
+			};
+			let filename = {
+				asset: { _id: "a1b2c3" }
+			};
+			let mediainfo = {};
+			let order = new Order({ asset: 'z1x2c3' });
+			let ingest = Ingest.assemble(original, filename, mediainfo, order);
+			expect(ingest.selected.asset).toBe("z1x2c3");
+		});
 		it("should use asset from filename when there is no context", () => {
 			let original = {
 				context: {}