@pixwel/pixwel-sdk 2.1.31 → 2.1.33

package/dist/src/Ingest.js

@@ -263,14 +263,12 @@ var Ingest = function (_Model) {
 				    width = _tags$Resolution$spli2[0],
 				    height = _tags$Resolution$spli2[1];
 
-				var isHD = height === '1080' ? true : false;
-
 				var aspect = tags.Aspect.replace(':', 'X');
 				var standard = tags.Standard.toUpperCase();
 				var frameModeToken = tags["Frame Mode"][0].toLowerCase();
 				var frameRate = tags.Framerate.replace(".", "");
 
-				if (tags.Usage === "broadcast" && !isHD) {
+				if ((height === '576' || height === '486') && (tags.Aspect === '4:3' || tags.Aspect === '16:9')) {
 					parts = parts.push(standard + "-" + aspect);
 				}
 
@@ -570,9 +568,20 @@ var Ingest = function (_Model) {
 				tags: flatValues(this.selected.download.tags),
 				ingest: this._id,
 				workRequest: this.workRequest,
-				verified: true
+				verified: true,
+				embargo: {
+					event: false
+				}
 			});
 
+			if (this.selected.download.embargo.end) {
+				file.embargo.end = this.selected.download.embargo.end;
+			}
+
+			if (this.selected.download.embargo.start) {
+				file.embargo.start = this.selected.download.embargo.start;
+			}
+
 			return file;
 		}
 		/**

package/package.json

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

package/src/Ingest.js

@@ -222,14 +222,13 @@ export default class Ingest extends Model {
 		if (mediaType === 'video' && tags.Aspect && tags.Resolution && tags.Standard && tags.Framerate && tags['Frame Mode']) {
 
 			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) {
+			if ((height === '576' || height === '486') && (tags.Aspect === '4:3' || tags.Aspect === '16:9')) {
 				parts = parts.push(`${standard}-${aspect}`);
 			}
 
@@ -516,9 +515,20 @@ export default class Ingest extends Model {
 			tags: flatValues(this.selected.download.tags),
 			ingest: this._id,
 			workRequest: this.workRequest,
-			verified: true
+			verified: true,
+			embargo: {
+				event: false
+			}
 		});
 
+		if (this.selected.download.embargo.end) {
+			file.embargo.end = this.selected.download.embargo.end;
+		}
+
+		if (this.selected.download.embargo.start) {
+			file.embargo.start = this.selected.download.embargo.start;
+		}
+
 		return file;
 	}
 	/**

package/test/Ingest.spec.js

@@ -26,6 +26,55 @@ describe("Ingest", () => {
 		});
 	});
 	describe("renderFilename", () => {
+		it("should not render EncodeName for PRORES 1080x1920", function() {
+			let data = {
+				asset: {
+					name: "HELLO",
+					slug: "HELLO",
+					type: "trailer.intl",
+					mediaType: "video",
+					project: {
+						filePrefix: "TESTPROJECT"
+					}
+				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
+				selected: {
+					download: {
+						enabled: false,
+						tags: {
+							Extra: ["REDUX"],
+							Framerate: "23.98",
+							Codec: "prores",
+							Resolution: "1080x1920",
+							"Frame Mode": "interlaced",
+							Text: "txtd2",
+							SubDub: {
+								sub: null,
+								dub: null
+							},
+							Standard: "ntsc",
+							Usage: "broadcast",
+							Aspect: "16:9"
+						},
+						embargo: { enabled: false },
+						country: "US",
+						language: "ENG"
+					}
+				}
+			};
+			let ingest = new Ingest(data);
+			let allTags = [];
+			let allTypes = [];
+			let extension = "mp4";
+			let name = ingest.renderFilename({ allTags, allTypes, extension });
+			expect(name).toBe(
+				"TESTPROJECT_ITR-HELLO_ENG-US_TXTD2_REDUX_PRORES_1920i2398.mp4"
+			);
+		});
 		it("renders EncodeName for interlaced HD 1080i2398", function() {
 			let data = {
 				asset: {
@@ -1237,6 +1286,10 @@ describe("Ingest", () => {
 							Resolution: "1024x768",
 							Framerate: "24",
 							"Frame Mode": "progressive"
+						},
+						embargo: {
+							enabled: true,
+							end: 1574834400
 						}
 					}
 				}
@@ -1252,12 +1305,24 @@ describe("Ingest", () => {
 				asset: "a1b2c3",
 				contextTag: "FRIDAY",
 				country: "US",
+				embargo: {
+					end: 1574834400,
+					event: false
+				},
 				ingest: "a1b2c3",
 				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: ["4:3", "ntsc", "prores", "1024x768", "24", "progressive", "FRIDAY"],
+				tags: [
+					"4:3",
+					"ntsc",
+					"prores",
+					"1024x768",
+					"24",
+					"progressive",
+					"FRIDAY"
+				],
 				verified: true,
 				workRequest: "a1b2c3"
 			};