@pixwel/pixwel-sdk 2.1.11 → 2.1.13

package/dist/src/Ingest.js

@@ -90,7 +90,8 @@ var Ingest = function (_Model) {
 			var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : params = {},
 			    allTags = _ref.allTags,
 			    allTypes = _ref.allTypes,
-			    order = _ref.order;
+			    order = _ref.order,
+			    extension = _ref.extension;
 
 			var asset = this.data().asset;
 			var options = this.data().selected.download;
@@ -284,7 +285,7 @@ var Ingest = function (_Model) {
 				name += tags.Framerate.replace(".", "").toUpperCase();
 			}
 
-			return name + "." + filename.file.ext;
+			return name + "." + extension;
 		}
 		/**
    * Returns the mediaType of the ingest
@@ -549,24 +550,28 @@ var Ingest = function (_Model) {
 		value: function createFile(params) {
 			var allTags = params.allTags,
 			    allTypes = params.allTypes,
-			    order = params.order;
+			    order = params.order,
+			    extension = params.extension;
 
 
 			var filename = this.mapFromFilename({ allTags: allTags });
 			var mediainfo = this.mapFromMediainfo();
-			var ingest = this.assemble({ filename: filename, mediainfo: mediainfo, order: order });
-			var name = this.renderFilename({ allTags: allTags, allTypes: allTypes });
+
+			var assembled = this.assemble({ filename: filename, mediainfo: mediainfo, order: order });
+			this.set(assembled);
+
+			var name = this.renderFilename({ allTags: allTags, allTypes: allTypes, extension: extension });
 
 			var file = new _File2.default({
 				name: name,
 				path: this.renderPath() + "/" + name,
-				asset: ingest.asset._id,
-				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/npm-update.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+npm run build
+npm publish
+
+( cd ../slurpee2 && npm update )
+( cd ../ui && npm update )

package/package.json

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

package/src/Ingest.js

@@ -42,7 +42,7 @@ export default class Ingest extends Model {
 	 *
 	 * @param {object} params
 	 */
-	renderFilename({ allTags, allTypes, order } = (params = {})) {
+	renderFilename({ allTags, allTypes, order, extension } = (params = {})) {
 		let asset = this.data().asset;
 		let options = this.data().selected.download;
 		let mediaType = this.data().asset.mediaType;
@@ -265,7 +265,7 @@ export default class Ingest extends Model {
 			name += tags.Framerate.replace(".", "").toUpperCase();
 		}
 
-		return `${name}.${filename.file.ext}`;
+		return `${name}.${extension}`;
 	}
 	/**
 	 * Returns the mediaType of the ingest
@@ -518,23 +518,26 @@ export default class Ingest extends Model {
 	 * @param {object} params
 	 */
 	createFile(params) {
-		let { allTags, allTypes, order } = params;
+		let { allTags, allTypes, order, extension } = params;
 
 		let filename = this.mapFromFilename({ allTags });
 		let mediainfo = this.mapFromMediainfo();
-		let ingest = this.assemble({ filename, mediainfo, order });
-		let name = this.renderFilename({ allTags, allTypes });
+
+		let assembled = this.assemble({ filename, mediainfo, order });
+		this.set(assembled);
+
+		let name = this.renderFilename({ allTags, allTypes, extension });
 
 		let file = new File({
 			name: name,
 			path: `${this.renderPath()}/${name}`,
-			asset: ingest.asset._id,
-			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: {
@@ -60,7 +60,8 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-TEST-ASSET-A_PFR-FLE_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
 			);
@@ -126,7 +127,8 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'jpg';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe("TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_640x480.jpg");
 		});
 		it("throws exception if missing asset.project.filePrefix", function() {
@@ -188,7 +190,7 @@ describe("Ingest", () => {
 				},
 				filename: {
 					file: {
-						ext: 'mp4'
+						ext: "mp4"
 					}
 				},
 				selected: {
@@ -208,7 +210,8 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG-US_TXTD_PRORES_480p2398.mp4"
 			);
@@ -245,7 +248,8 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_DTR-TEST-ASSET-A_ENG_TXTD_PRORES_480p2398.mp4"
 			);
@@ -282,7 +286,8 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_TR-GENERIC-TRAILER_ENG_TXTD_PRORES_480p2398.mp4"
 			);
@@ -350,7 +355,8 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [{ _id: "tv-spot.intl", name: "tv-spot.intl" }];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_TV-SPOT-INTL_COOL-SPOT-15_ENG_TXTD_PRORES_480p2398.mp4"
 			);
@@ -457,20 +463,21 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [{ name: "film-clip.intl" }];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_FILM-CLIP-INTL_ULTRA-VIOLENCE_1MIN3SEC_ENG_TXTD_PRORES_480p2398.mp4"
 			);
 
 			ingest.asset.length = 60;
-			name = ingest.renderFilename({ allTags, allTypes });
+			name = ingest.renderFilename({ allTags, allTypes, extension });
 
 			expect(name).toBe(
 				"TESTPROJECT_FILM-CLIP-INTL_ULTRA-VIOLENCE_1MIN_ENG_TXTD_PRORES_480p2398.mp4"
 			);
 
 			ingest.asset.length = 45;
-			name = ingest.renderFilename({ allTags, allTypes });
+			name = ingest.renderFilename({ allTags, allTypes, extension });
 
 			expect(name).toBe(
 				"TESTPROJECT_FILM-CLIP-INTL_ULTRA-VIOLENCE_45SEC_ENG_TXTD_PRORES_480p2398.mp4"
@@ -510,7 +517,8 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [{ name: "film-clip.intl" }];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_1080i2997.mp4"
 			);
@@ -529,7 +537,7 @@ describe("Ingest", () => {
 					Extra: ["COMING-SOON", "HOJE"]
 				}
 			};
-			name = ingest.renderFilename({ allTags, allTypes });
+			name = ingest.renderFilename({ allTags, allTypes, extension });
 
 			expect(name).toBe(
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_H264_1080p2997.mp4"
@@ -569,7 +577,8 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [{ name: "film-clip.intl" }, { name: "tv-spot.intl" }];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_TV-SPOT-INTL_TEST-ASSET-INTL-10_ENG_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
 			);
@@ -611,7 +620,8 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [{ name: "film-clip.intl" }, { name: "tv-spot.intl" }];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_TV-SPOT-INTL_TEST-ASSET-INTL-10_ENG_SUB_COMING-SOON_HOJE_PRORES_480p2398.mp4"
 			);
@@ -621,7 +631,7 @@ describe("Ingest", () => {
 				dub: true
 			});
 
-			name = ingest.renderFilename({ allTags, allTypes });
+			name = ingest.renderFilename({ allTags, allTypes, extension });
 
 			expect(name).toBe(
 				"TESTPROJECT_TV-SPOT-INTL_TEST-ASSET-INTL-10_ENG_SUB_DUB_COMING-SOON_HOJE_PRORES_480p2398.mp4"
@@ -661,7 +671,8 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [{ name: "film-clip.intl" }];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_1080p2997.mp4"
 			);
@@ -699,8 +710,11 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			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");
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
+			expect(name).toBe(
+				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_H264_1080p2398.mp4"
+			);
 		});
 		it("throws exception if missing Frame Mode", function() {
 			let data = {
@@ -819,7 +833,8 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG-US_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
 			);
@@ -857,7 +872,8 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toEqual(
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_REV_PRORES_480p2398.mp4"
 			);
@@ -894,7 +910,8 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-CANT-INTL-10_ENG_TXTD_PRORES_480p2398.mp4"
 			);
@@ -933,7 +950,8 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let name = ingest.renderFilename({ allTags, allTypes });
+			let extension = 'mp4';
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
 			);
@@ -967,7 +985,7 @@ describe("Ingest", () => {
 				filename: {
 					asset: {},
 					file: {
-						ext: 'mp4',
+						ext: "mp4",
 						tags: ["sub"]
 					}
 				},
@@ -990,19 +1008,22 @@ describe("Ingest", () => {
 			let allTags = [];
 			let allTypes = [{ name: "tv-spot.intl" }];
 			let order = new Order();
+			let extension = 'mp4';
 			let ingest = new Ingest(data);
-			let file = ingest.createFile({ allTags, allTypes, order });
+			let file = ingest.createFile({ allTags, allTypes, order, extension });
 			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",
 				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);
 		});
@@ -1032,7 +1053,7 @@ describe("Ingest", () => {
 				context: {}
 			};
 			let filename = {
-				asset: { _id: "a1b2c3" },
+				asset: { _id: "a1b2c3" }
 			};
 			let order = new Order();
 			let ingest = new Ingest(original);