@pixwel/pixwel-sdk 2.1.7 → 2.1.9

package/dist/src/Tag.js

@@ -4,39 +4,50 @@ Object.defineProperty(exports, "__esModule", {
 	value: true
 });
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
 
-var _Model2 = require('./Model');
+var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
 
-var _Model3 = _interopRequireDefault(_Model2);
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _createClass2 = require('babel-runtime/helpers/createClass');
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+var _createClass3 = _interopRequireDefault(_createClass2);
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require('babel-runtime/helpers/inherits');
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
+var _Model2 = require('./Model');
+
+var _Model3 = _interopRequireDefault(_Model2);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var Tag = function (_Model) {
-	_inherits(Tag, _Model);
+	(0, _inherits3.default)(Tag, _Model);
 
 	function Tag(data) {
-		_classCallCheck(this, Tag);
+		(0, _classCallCheck3.default)(this, Tag);
 
-		var _this = _possibleConstructorReturn(this, (Tag.__proto__ || Object.getPrototypeOf(Tag)).call(this, data));
+		var _this = (0, _possibleConstructorReturn3.default)(this, (Tag.__proto__ || (0, _getPrototypeOf2.default)(Tag)).call(this, data));
 
 		_this._resource = 'tags';
 		return _this;
 	}
 
-	_createClass(Tag, null, [{
+	(0, _createClass3.default)(Tag, null, [{
 		key: '_resource',
 		get: function get() {
 			return 'tags';
 		}
 	}]);
-
 	return Tag;
 }(_Model3.default);
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@pixwel/pixwel-sdk",
 	"description": "",
-	"version": "2.1.7",
+	"version": "2.1.9",
 	"author": "Pixwel",
 	"license": "UNLICENSED",
 	"main": "./dist/index.js",
@@ -21,7 +21,6 @@
 	},
 	"dependencies": {
 		"axios": "^0.19.0",
-		"babel-runtime": "^6.26.0",
 		"deep-object-diff": "^1.1.0",
 		"lodash": "^4.17.15",
 		"ramda": "^0.26.1",

package/src/Ingest.js

@@ -46,6 +46,7 @@ export default class Ingest extends Model {
 		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");
@@ -264,7 +265,7 @@ export default class Ingest extends Model {
 			name += tags.Framerate.replace(".", "").toUpperCase();
 		}
 
-		return name;
+		return `${name}.${filename.file.ext}`;
 	}
 	/**
 	 * Returns the mediaType of the ingest

package/test/Ingest.spec.js

@@ -37,6 +37,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: 'mp4'
+					}
+				},
 				selected: {
 					download: {
 						language: "PFR-FLE",
@@ -57,7 +62,7 @@ describe("Ingest", () => {
 			let allTypes = [];
 			let name = ingest.renderFilename({ allTags, allTypes });
 			expect(name).toBe(
-				"TESTPROJECT_ITR-TEST-ASSET-A_PFR-FLE_TXTD_COMING-SOON_HOJE_PRORES_480p2398"
+				"TESTPROJECT_ITR-TEST-ASSET-A_PFR-FLE_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
 			);
 		});
 		it("throws exception if missing Framerate", function() {
@@ -102,6 +107,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: "jpg"
+					}
+				},
 				selected: {
 					download: {
 						language: "ENG",
@@ -117,7 +127,7 @@ describe("Ingest", () => {
 			let allTags = [];
 			let allTypes = [];
 			let name = ingest.renderFilename({ allTags, allTypes });
-			expect(name).toBe("TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_640x480");
+			expect(name).toBe("TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_640x480.jpg");
 		});
 		it("throws exception if missing asset.project.filePrefix", function() {
 			let data = {
@@ -176,6 +186,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: 'mp4'
+					}
+				},
 				selected: {
 					download: {
 						language: "ENG",
@@ -195,7 +210,7 @@ describe("Ingest", () => {
 			let allTypes = [];
 			let name = ingest.renderFilename({ allTags, allTypes });
 			expect(name).toBe(
-				"TESTPROJECT_ITR-TEST-ASSET-A_ENG-US_TXTD_PRORES_480p2398"
+				"TESTPROJECT_ITR-TEST-ASSET-A_ENG-US_TXTD_PRORES_480p2398.mp4"
 			);
 		});
 		it("renders domestic trailer type with custom name", function() {
@@ -209,6 +224,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
 				selected: {
 					download: {
 						language: "ENG",
@@ -227,7 +247,7 @@ describe("Ingest", () => {
 			let allTypes = [];
 			let name = ingest.renderFilename({ allTags, allTypes });
 			expect(name).toBe(
-				"TESTPROJECT_DTR-TEST-ASSET-A_ENG_TXTD_PRORES_480p2398"
+				"TESTPROJECT_DTR-TEST-ASSET-A_ENG_TXTD_PRORES_480p2398.mp4"
 			);
 		});
 		it("renders generic trailer type", function() {
@@ -241,6 +261,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
 				selected: {
 					download: {
 						language: "ENG",
@@ -259,7 +284,7 @@ describe("Ingest", () => {
 			let allTypes = [];
 			let name = ingest.renderFilename({ allTags, allTypes });
 			expect(name).toBe(
-				"TESTPROJECT_TR-GENERIC-TRAILER_ENG_TXTD_PRORES_480p2398"
+				"TESTPROJECT_TR-GENERIC-TRAILER_ENG_TXTD_PRORES_480p2398.mp4"
 			);
 		});
 		it("throws an error if asset type does not exist", function() {
@@ -304,6 +329,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
 				selected: {
 					download: {
 						language: "ENG",
@@ -322,7 +352,7 @@ describe("Ingest", () => {
 			let allTypes = [{ _id: "tv-spot.intl", name: "tv-spot.intl" }];
 			let name = ingest.renderFilename({ allTags, allTypes });
 			expect(name).toBe(
-				"TESTPROJECT_TV-SPOT-INTL_COOL-SPOT-15_ENG_TXTD_PRORES_480p2398"
+				"TESTPROJECT_TV-SPOT-INTL_COOL-SPOT-15_ENG_TXTD_PRORES_480p2398.mp4"
 			);
 		});
 		it("throws exception if missing options.tags.Text", function() {
@@ -406,6 +436,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
 				selected: {
 					download: {
 						language: "ENG",
@@ -424,21 +459,21 @@ describe("Ingest", () => {
 			let allTypes = [{ name: "film-clip.intl" }];
 			let name = ingest.renderFilename({ allTags, allTypes });
 			expect(name).toBe(
-				"TESTPROJECT_FILM-CLIP-INTL_ULTRA-VIOLENCE_1MIN3SEC_ENG_TXTD_PRORES_480p2398"
+				"TESTPROJECT_FILM-CLIP-INTL_ULTRA-VIOLENCE_1MIN3SEC_ENG_TXTD_PRORES_480p2398.mp4"
 			);
 
 			ingest.asset.length = 60;
 			name = ingest.renderFilename({ allTags, allTypes });
 
 			expect(name).toBe(
-				"TESTPROJECT_FILM-CLIP-INTL_ULTRA-VIOLENCE_1MIN_ENG_TXTD_PRORES_480p2398"
+				"TESTPROJECT_FILM-CLIP-INTL_ULTRA-VIOLENCE_1MIN_ENG_TXTD_PRORES_480p2398.mp4"
 			);
 
 			ingest.asset.length = 45;
 			name = ingest.renderFilename({ allTags, allTypes });
 
 			expect(name).toBe(
-				"TESTPROJECT_FILM-CLIP-INTL_ULTRA-VIOLENCE_45SEC_ENG_TXTD_PRORES_480p2398"
+				"TESTPROJECT_FILM-CLIP-INTL_ULTRA-VIOLENCE_45SEC_ENG_TXTD_PRORES_480p2398.mp4"
 			);
 		});
 		it("does not redundantly include tag info", function() {
@@ -452,6 +487,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
 				selected: {
 					download: {
 						language: "ENG",
@@ -472,7 +512,7 @@ describe("Ingest", () => {
 			let allTypes = [{ name: "film-clip.intl" }];
 			let name = ingest.renderFilename({ allTags, allTypes });
 			expect(name).toBe(
-				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_1080i2997"
+				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_1080i2997.mp4"
 			);
 
 			ingest.selected.download = {
@@ -492,7 +532,7 @@ describe("Ingest", () => {
 			name = ingest.renderFilename({ allTags, allTypes });
 
 			expect(name).toBe(
-				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_H264_1080p2997"
+				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_H264_1080p2997.mp4"
 			);
 		});
 		it("converts asset names containing `int'l` to `intl`", function() {
@@ -506,6 +546,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
 				selected: {
 					download: {
 						language: "ENG",
@@ -526,7 +571,7 @@ describe("Ingest", () => {
 			let allTypes = [{ name: "film-clip.intl" }, { name: "tv-spot.intl" }];
 			let name = ingest.renderFilename({ allTags, allTypes });
 			expect(name).toBe(
-				"TESTPROJECT_TV-SPOT-INTL_TEST-ASSET-INTL-10_ENG_TXTD_COMING-SOON_HOJE_PRORES_480p2398"
+				"TESTPROJECT_TV-SPOT-INTL_TEST-ASSET-INTL-10_ENG_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
 			);
 		});
 		it("renders sub and dub tags", function() {
@@ -540,6 +585,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
 				selected: {
 					download: {
 						language: "ENG",
@@ -563,7 +613,7 @@ describe("Ingest", () => {
 			let allTypes = [{ name: "film-clip.intl" }, { name: "tv-spot.intl" }];
 			let name = ingest.renderFilename({ allTags, allTypes });
 			expect(name).toBe(
-				"TESTPROJECT_TV-SPOT-INTL_TEST-ASSET-INTL-10_ENG_SUB_COMING-SOON_HOJE_PRORES_480p2398"
+				"TESTPROJECT_TV-SPOT-INTL_TEST-ASSET-INTL-10_ENG_SUB_COMING-SOON_HOJE_PRORES_480p2398.mp4"
 			);
 
 			Object.assign(ingest.selected.download.tags.SubDub, {
@@ -574,7 +624,7 @@ describe("Ingest", () => {
 			name = ingest.renderFilename({ allTags, allTypes });
 
 			expect(name).toBe(
-				"TESTPROJECT_TV-SPOT-INTL_TEST-ASSET-INTL-10_ENG_SUB_DUB_COMING-SOON_HOJE_PRORES_480p2398"
+				"TESTPROJECT_TV-SPOT-INTL_TEST-ASSET-INTL-10_ENG_SUB_DUB_COMING-SOON_HOJE_PRORES_480p2398.mp4"
 			);
 		});
 		it("includes `Frame mode` and `Framerate`", function() {
@@ -588,6 +638,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
 				selected: {
 					download: {
 						language: "ENG",
@@ -608,7 +663,7 @@ describe("Ingest", () => {
 			let allTypes = [{ name: "film-clip.intl" }];
 			let name = ingest.renderFilename({ allTags, allTypes });
 			expect(name).toBe(
-				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_1080p2997"
+				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_1080p2997.mp4"
 			);
 		});
 		it("renders `set` tags when all tags in `set` are specified but retains `codec`", function() {
@@ -622,6 +677,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
 				selected: {
 					download: {
 						language: "ENG",
@@ -640,7 +700,7 @@ describe("Ingest", () => {
 			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");
+			expect(name).toBe("TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_H264_1080p2398.mp4");
 		});
 		it("throws exception if missing Frame Mode", function() {
 			let data = {
@@ -736,6 +796,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
 				selected: {
 					download: {
 						language: "ENG",
@@ -756,7 +821,7 @@ describe("Ingest", () => {
 			let allTypes = [];
 			let name = ingest.renderFilename({ allTags, allTypes });
 			expect(name).toBe(
-				"TESTPROJECT_ITR-TEST-ASSET-A_ENG-US_TXTD_COMING-SOON_HOJE_PRORES_480p2398"
+				"TESTPROJECT_ITR-TEST-ASSET-A_ENG-US_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
 			);
 		});
 		it("renders version", function() {
@@ -770,6 +835,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
 				selected: {
 					download: {
 						version: "rev",
@@ -789,7 +859,7 @@ describe("Ingest", () => {
 			let allTypes = [];
 			let name = ingest.renderFilename({ allTags, allTypes });
 			expect(name).toEqual(
-				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_REV_PRORES_480p2398"
+				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_REV_PRORES_480p2398.mp4"
 			);
 		});
 		it("renders asset names with contractions correctly", function() {
@@ -803,6 +873,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
 				selected: {
 					download: {
 						language: "ENG",
@@ -821,7 +896,7 @@ describe("Ingest", () => {
 			let allTypes = [];
 			let name = ingest.renderFilename({ allTags, allTypes });
 			expect(name).toBe(
-				"TESTPROJECT_ITR-CANT-INTL-10_ENG_TXTD_PRORES_480p2398"
+				"TESTPROJECT_ITR-CANT-INTL-10_ENG_TXTD_PRORES_480p2398.mp4"
 			);
 		});
 		it("renders tags as an underscore-separated string", function() {
@@ -835,6 +910,11 @@ describe("Ingest", () => {
 						filePrefix: "TESTPROJECT"
 					}
 				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
 				selected: {
 					download: {
 						language: "ENG",
@@ -855,7 +935,7 @@ describe("Ingest", () => {
 			let allTypes = [];
 			let name = ingest.renderFilename({ allTags, allTypes });
 			expect(name).toBe(
-				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_480p2398"
+				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
 			);
 		});
 	});
@@ -887,6 +967,7 @@ describe("Ingest", () => {
 				filename: {
 					asset: {},
 					file: {
+						ext: 'mp4',
 						tags: ["sub"]
 					}
 				},
@@ -912,7 +993,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let file = ingest.createFile({ allTags, allTypes, order });
 			let expected = {
-				name: "PROJECT_TV-SPOT-INTL_ASSET_ENG-US_PRORES_768p24",
+				name: "PROJECT_TV-SPOT-INTL_ASSET_ENG-US_PRORES_768p24.mp4",
 				path: "paramount/project/tv-spot.intl",
 				asset: "a1b2c3",
 				generator: "ingest",