@pixwel/pixwel-sdk 2.1.13 → 2.1.15

package/dist/src/Ingest.js

@@ -90,13 +90,11 @@ var Ingest = function (_Model) {
 			var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : params = {},
 			    allTags = _ref.allTags,
 			    allTypes = _ref.allTypes,
-			    order = _ref.order,
 			    extension = _ref.extension;
 
 			var asset = this.data().asset;
 			var options = this.data().selected.download;
 			var mediaType = this.data().asset.mediaType;
-			var filename = this.data().filename;
 
 			if (!asset.project) {
 				throw new Error("missing asset.project");
@@ -264,6 +262,9 @@ 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/package.json

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

package/src/Ingest.js

@@ -42,11 +42,10 @@ export default class Ingest extends Model {
 	 *
 	 * @param {object} params
 	 */
-	renderFilename({ allTags, allTypes, order, extension } = (params = {})) {
+	renderFilename({ allTags, allTypes, extension } = (params = {})) {
 		let asset = this.data().asset;
 		let options = this.data().selected.download;
 		let mediaType = this.data().asset.mediaType;
-		let filename = this.data().filename;
 
 		if (!asset.project) {
 			throw new Error("missing asset.project");
@@ -234,6 +233,9 @@ 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

@@ -677,6 +677,48 @@ describe("Ingest", () => {
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_1080p2997.mp4"
 			);
 		});
+		it("includes Standard and Aspect", function() {
+			let data = {
+				asset: {
+					name: "Test Asset A",
+					slug: "test-asset-a",
+					type: "trailer.intl",
+					mediaType: "video",
+					project: {
+						filePrefix: "TESTPROJECT"
+					}
+				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
+				selected: {
+					download: {
+						language: "ENG",
+						country: "WW",
+						tags: {
+							Standard: "ntsc",
+							Aspect: "16:9",
+							Resolution: "1920x1080",
+							"Frame Mode": "progressive",
+							Framerate: "29.97",
+							Text: "txtd",
+							Extra: ["COMING-SOON", "HOJE"],
+							Codec: "PRORES"
+						}
+					}
+				}
+			};
+			let ingest = new Ingest(data);
+			let allTags = [];
+			let allTypes = [{ name: "film-clip.intl" }];
+			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"
+			);
+		});
 		it("renders `set` tags when all tags in `set` are specified but retains `codec`", function() {
 			let data = {
 				asset: {