@pixwel/pixwel-sdk 2.1.10 → 2.1.12

package/dist/src/Ingest.js

@@ -554,20 +554,22 @@ var Ingest = function (_Model) {
 
 			var filename = this.mapFromFilename({ allTags: allTags });
 			var mediainfo = this.mapFromMediainfo();
-			var ingest = this.assemble({ filename: filename, mediainfo: mediainfo, order: order });
+
+			var assembled = this.assemble({ filename: filename, mediainfo: mediainfo, order: order });
+			this.set(assembled);
+
 			var name = this.renderFilename({ allTags: allTags, allTypes: allTypes });
 
 			var file = new _File2.default({
-				name: filename,
+				name: name,
 				path: this.renderPath() + "/" + name,
-				asset: ingest.asset._id,
-				generator: "ingest",
-				contextTag: ingest.context.tag,
-				language: ingest.selected.download.language,
-				country: ingest.selected.download.country,
-				tags: flatValues(ingest.selected.download.tags),
-				ingest: ingest._id,
-				workRequest: ingest.workRequest,
+				asset: this.asset._id,
+				contextTag: this.context.tag,
+				language: this.selected.download.language,
+				country: this.selected.download.country,
+				tags: flatValues(this.selected.download.tags),
+				ingest: this._id,
+				workRequest: this.workRequest,
 				verified: true
 			});
 

package/package.json

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

package/src/Ingest.js

@@ -522,20 +522,22 @@ export default class Ingest extends Model {
 
 		let filename = this.mapFromFilename({ allTags });
 		let mediainfo = this.mapFromMediainfo();
-		let ingest = this.assemble({ filename, mediainfo, order });
+
+		let assembled = this.assemble({ filename, mediainfo, order });
+		this.set(assembled);
+
 		let name = this.renderFilename({ allTags, allTypes });
 
 		let file = new File({
-			name: filename,
+			name: name,
 			path: `${this.renderPath()}/${name}`,
-			asset: ingest.asset._id,
-			generator: "ingest",
-			contextTag: ingest.context.tag,
-			language: ingest.selected.download.language,
-			country: ingest.selected.download.country,
-			tags: flatValues(ingest.selected.download.tags),
-			ingest: ingest._id,
-			workRequest: ingest.workRequest,
+			asset: this.asset._id,
+			contextTag: this.context.tag,
+			language: this.selected.download.language,
+			country: this.selected.download.country,
+			tags: flatValues(this.selected.download.tags),
+			ingest: this._id,
+			workRequest: this.workRequest,
 			verified: true
 		});
 

package/test/Ingest.spec.js

@@ -39,7 +39,7 @@ describe("Ingest", () => {
 				},
 				filename: {
 					file: {
-						ext: 'mp4'
+						ext: "mp4"
 					}
 				},
 				selected: {
@@ -188,7 +188,7 @@ describe("Ingest", () => {
 				},
 				filename: {
 					file: {
-						ext: 'mp4'
+						ext: "mp4"
 					}
 				},
 				selected: {
@@ -700,7 +700,9 @@ describe("Ingest", () => {
 			let allTags = [];
 			let allTypes = [{ name: "film-clip.intl" }];
 			let name = ingest.renderFilename({ allTags, allTypes });
-			expect(name).toBe("TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_H264_1080p2398.mp4");
+			expect(name).toBe(
+				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_H264_1080p2398.mp4"
+			);
 		});
 		it("throws exception if missing Frame Mode", function() {
 			let data = {
@@ -967,7 +969,7 @@ describe("Ingest", () => {
 				filename: {
 					asset: {},
 					file: {
-						ext: 'mp4',
+						ext: "mp4",
 						tags: ["sub"]
 					}
 				},
@@ -993,17 +995,18 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let file = ingest.createFile({ allTags, allTypes, order });
 			let expected = {
-				name: "PROJECT_TV-SPOT-INTL_ASSET_ENG-US_PRORES_768p24.mp4",
-				path: "paramount/project/tv-spot.intl/PROJECT_TV-SPOT-INTL_ASSET_ENG-US_PRORES_768p24.mp4",
+				_id: undefined,
 				asset: "a1b2c3",
-				generator: "ingest",
 				contextTag: "FRIDAY",
-				language: "ENG",
 				country: "US",
-				tags: ["FRIDAY", "prores", "1024x768", "24", "progressive"],
 				ingest: "a1b2c3",
-				workRequest: "a1b2c3",
-				verified: true
+				language: "ENG",
+				name: "PROJECT_TV-SPOT-INTL_ASSET_ENG-US_FRIDAY_PRORES_768p24.mp4",
+				path:
+					"paramount/project/tv-spot.intl/PROJECT_TV-SPOT-INTL_ASSET_ENG-US_FRIDAY_PRORES_768p24.mp4",
+				tags: ["prores", "1024x768", "24", "progressive", "FRIDAY"],
+				verified: true,
+				workRequest: "a1b2c3"
 			};
 			expect(file.data()).toEqual(expected);
 		});
@@ -1033,7 +1036,7 @@ describe("Ingest", () => {
 				context: {}
 			};
 			let filename = {
-				asset: { _id: "a1b2c3" },
+				asset: { _id: "a1b2c3" }
 			};
 			let order = new Order();
 			let ingest = new Ingest(original);