@pixwel/pixwel-sdk 2.1.15 → 2.1.17

package/dist/src/Ingest.js

@@ -119,6 +119,7 @@ var Ingest = function (_Model) {
 				tags: {
 					Usage: null,
 					Aspect: null,
+					Standard: null,
 					SubDub: {
 						sub: null,
 						dub: null
@@ -255,6 +256,12 @@ var Ingest = function (_Model) {
 				return part.toUpperCase();
 			});
 
+			// if Aspect and Standard are available, then set the encodeName accoring to naming standard
+			if (mediaType == 'video' && tags.Aspect && tags.Standard) {
+				var encodeName = tags.Standard.toUpperCase() + "-" + tags.Aspect.replace(':', 'X');
+				parts = parts.push("" + encodeName);
+			}
+
 			var matchedSet = matchSet(allTags, options.tags);
 			var requiredInfo = tags.Resolution && tags["Frame Mode"] && tags.Framerate;
 
@@ -262,9 +269,6 @@ var Ingest = function (_Model) {
 				parts = parts.push(matchedSet);
 			} else if (mediaType == "video" && tags.Resolution && !requiredInfo) {
 				parts = parts.push(tags.Resolution.replace(/\d+x/, ""));
-			} else if (mediaType == "video" && tags.Aspect && tags.Standard) {
-				var encodeName = tags.Standard.toUpperCase() + "-" + tags.Aspect.replace(':', 'X');
-				parts = parts.push("" + encodeName);
 			} else if (mediaType == "image" && tags.Resolution) {
 				parts = parts.push(tags.Resolution);
 			}

package/npm-update.sh

@@ -4,4 +4,5 @@ npm run build
 npm publish
 
 ( cd ../slurpee2 && npm update )
+( cd ../slurpee3/createFile && npm update )
 ( cd ../ui && npm update )

package/package.json

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

package/src/Ingest.js

@@ -70,6 +70,7 @@ export default class Ingest extends Model {
 			tags: {
 				Usage: null,
 				Aspect: null,
+				Standard: null,
 				SubDub: {
 					sub: null,
 					dub: null
@@ -226,6 +227,12 @@ export default class Ingest extends Model {
 			.filter()
 			.map(part => part.toUpperCase());
 
+		// if Aspect and Standard are available, then set the encodeName accoring to naming standard
+		if (mediaType == 'video' && tags.Aspect && tags.Standard) {
+			let encodeName = `${tags.Standard.toUpperCase()}-${tags.Aspect.replace(':', 'X')}`;
+			parts = parts.push(`${encodeName}`);
+		}
+
 		let matchedSet = matchSet(allTags, options.tags);
 		let requiredInfo = tags.Resolution && tags["Frame Mode"] && tags.Framerate;
 
@@ -233,9 +240,6 @@ export default class Ingest extends Model {
 			parts = parts.push(matchedSet);
 		} else if (mediaType == "video" && tags.Resolution && !requiredInfo) {
 			parts = parts.push(tags.Resolution.replace(/\d+x/, ""));
-		} else if (mediaType == "video" && tags.Aspect && tags.Standard) {
-			let encodeName = `${tags.Standard.toUpperCase()}-${tags.Aspect.replace(':', 'X')}`;
-			parts = parts.push(`${encodeName}`);
 		} else if (mediaType == "image" && tags.Resolution) {
 			parts = parts.push(tags.Resolution);
 		}

package/test/Ingest.spec.js

@@ -698,14 +698,19 @@ describe("Ingest", () => {
 						language: "ENG",
 						country: "WW",
 						tags: {
+							Extra: [],
+							SubDub: {
+								sub: null,
+								dub: null
+							},
+							Resolution: "720x486",
+							Codec: "prores",
+							"Frame Mode": "progressive",
+							Framerate: "23.98",
 							Standard: "ntsc",
+							Usage: "broadcast",
 							Aspect: "16:9",
-							Resolution: "1920x1080",
-							"Frame Mode": "progressive",
-							Framerate: "29.97",
-							Text: "txtd",
-							Extra: ["COMING-SOON", "HOJE"],
-							Codec: "PRORES"
+							Text: "txtd"
 						}
 					}
 				}
@@ -716,7 +721,7 @@ describe("Ingest", () => {
 			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
-				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_NTSC-16X9_1080p2997.mp4"
+				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_PRORES_NTSC-16X9_486p2398.mp4"
 			);
 		});
 		it("renders `set` tags when all tags in `set` are specified but retains `codec`", function() {