@pixwel/pixwel-sdk 2.1.27 → 2.1.29

package/dist/src/Ingest.js

@@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", {
 	value: true
 });
 
+var _stringify = require("babel-runtime/core-js/json/stringify");
+
+var _stringify2 = _interopRequireDefault(_stringify);
+
 var _getPrototypeOf = require("babel-runtime/core-js/object/get-prototype-of");
 
 var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
@@ -96,6 +100,9 @@ var Ingest = function (_Model) {
 			var options = this.data().selected.download;
 			var mediaType = this.data().asset.mediaType;
 
+			console.log('Ingest.renderFilename.options');
+			console.log((0, _stringify2.default)(options));
+
 			if (!asset.project) {
 				throw new Error("missing asset.project");
 			}
@@ -269,8 +276,8 @@ var Ingest = function (_Model) {
 
 			var name = parts.join("_");
 
-			var hasResInfo = name.match(/\d+(i|p)/i);
-			var hasAllInfo = name.match(/\d+(i|p)\d+/i);
+			var hasResInfo = null;
+			var hasAllInfo = null;
 
 			if (requiredInfo && !hasResInfo && !hasAllInfo) {
 				var res = tags.Resolution;

package/package.json

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

package/src/Ingest.js

@@ -47,6 +47,9 @@ export default class Ingest extends Model {
 		let options = this.data().selected.download;
 		let mediaType = this.data().asset.mediaType;
 
+		console.log('Ingest.renderFilename.options');
+		console.log(JSON.stringify(options));
+
 		if (!asset.project) {
 			throw new Error("missing asset.project");
 		}
@@ -240,8 +243,8 @@ export default class Ingest extends Model {
 
 		let name = parts.join("_");
 
-		let hasResInfo = name.match(/\d+(i|p)/i);
-		let hasAllInfo = name.match(/\d+(i|p)\d+/i);
+		let hasResInfo = null;
+		let hasAllInfo = null;
 
 		if (requiredInfo && !hasResInfo && !hasAllInfo) {
 			let res = tags.Resolution;

package/test/Ingest.spec.js

@@ -26,6 +26,49 @@ describe("Ingest", () => {
 		});
 	});
 	describe("renderFilename", () => {
+		it("renders correctly when name contains resolution information", function() {
+			let data = {
+				asset: {
+					name: "24P",
+					slug: "24P",
+					type: "trailer.intl",
+					mediaType: "video",
+					project: {
+						filePrefix: "TESTPROJECT"
+					}
+				},
+				filename: {
+					file: {
+						ext: "mp4"
+					}
+				},
+				selected: {
+					download: {
+						enabled: false,
+						tags: {
+							Extra: ["tag1"],
+							SubDub: { sub: null, dub: null },
+							Framerate: "25",
+							Codec: "h264",
+							Resolution: "854x480",
+							"Frame Mode": "progressive",
+							Standard: "pal",
+							Usage: "online",
+							Text: "txtd"
+						},
+						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-24P_ENG-US_TXTD_TAG1_H264_480p25.mp4");
+		});
 		it("renders language only for dual-language codes", function() {
 			let data = {
 				asset: {
@@ -60,7 +103,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-TEST-ASSET-A_PFR-FLE_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
@@ -127,7 +170,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let extension = 'jpg';
+			let extension = "jpg";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe("TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_640x480.jpg");
 		});
@@ -210,7 +253,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG-US_TXTD_PRORES_480p2398.mp4"
@@ -248,7 +291,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_DTR-TEST-ASSET-A_ENG_TXTD_PRORES_480p2398.mp4"
@@ -286,7 +329,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_TR-GENERIC-TRAILER_ENG_TXTD_PRORES_480p2398.mp4"
@@ -355,7 +398,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [{ _id: "tv-spot.intl", name: "tv-spot.intl" }];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_TV-SPOT-INTL_COOL-SPOT-15_ENG_TXTD_PRORES_480p2398.mp4"
@@ -463,7 +506,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [{ name: "film-clip.intl" }];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_FILM-CLIP-INTL_ULTRA-VIOLENCE_1MIN3SEC_ENG_TXTD_PRORES_480p2398.mp4"
@@ -517,7 +560,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [{ name: "film-clip.intl" }];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_1080i2997.mp4"
@@ -577,7 +620,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [{ name: "film-clip.intl" }, { name: "tv-spot.intl" }];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_TV-SPOT-INTL_TEST-ASSET-INTL-10_ENG_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
@@ -620,7 +663,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [{ name: "film-clip.intl" }, { name: "tv-spot.intl" }];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_TV-SPOT-INTL_TEST-ASSET-INTL-10_ENG_SUB_COMING-SOON_HOJE_PRORES_480p2398.mp4"
@@ -671,7 +714,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [{ name: "film-clip.intl" }];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_1080p2997.mp4"
@@ -710,7 +753,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [{ name: "film-clip.intl" }];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_H264_1080p2398.mp4"
@@ -833,7 +876,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG-US_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
@@ -872,7 +915,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toEqual(
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_REV_PRORES_480p2398.mp4"
@@ -910,7 +953,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-CANT-INTL-10_ENG_TXTD_PRORES_480p2398.mp4"
@@ -950,7 +993,7 @@ describe("Ingest", () => {
 			let ingest = new Ingest(data);
 			let allTags = [];
 			let allTypes = [];
-			let extension = 'mp4';
+			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
 				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
@@ -1008,7 +1051,7 @@ describe("Ingest", () => {
 			let allTags = [];
 			let allTypes = [{ name: "tv-spot.intl" }];
 			let order = new Order();
-			let extension = 'mp4';
+			let extension = "mp4";
 			let ingest = new Ingest(data);
 			let file = ingest.createFile({ allTags, allTypes, order, extension });
 			let expected = {