@pixwel/pixwel-sdk 2.1.14 → 2.1.16

package/dist/index.js

@@ -94,15 +94,6 @@ Object.defineProperty(exports, 'Tag', {
 	}
 });
 
-var _TimeFormat = require('./src/TimeFormat');
-
-Object.defineProperty(exports, 'TimeFormat', {
-	enumerable: true,
-	get: function get() {
-		return _interopRequireDefault(_TimeFormat).default;
-	}
-});
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var Pixwel = exports.Pixwel = {

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");
@@ -257,6 +255,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;
 

package/index.js

@@ -15,6 +15,5 @@ export { default as IngestFile } from './src/IngestFile';
 export { default as Model } from './src/Model';
 export { default as Order } from './src/Order';
 export { default as Tag } from './src/Tag';
-export { default as TimeFormat } from './src/TimeFormat';
 
 

package/npm-update.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+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.14",
+	"version": "2.1.16",
 	"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");
@@ -227,6 +226,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;
 

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: {