@pixwel/pixwel-sdk 2.1.18 → 2.1.20

package/dist/src/Ingest.js

@@ -327,19 +327,19 @@ var Ingest = function (_Model) {
 
 			var tags = {};
 
-			if (!info.File) {
-				throw "missing info.File";
+			if (!info.media) {
+				throw "missing info.media";
 			}
 
-			if (!info.File.track) {
-				throw "missing info.File.track";
+			if (!info.media.track) {
+				throw "missing info.media.track";
 			}
 
 			var general = void 0;
-			if (!Array.isArray(info["File"]["track"])) {
-				general = info["File"]["track"];
+			if (!Array.isArray(info["media"]["track"])) {
+				general = info["media"]["track"];
 			} else {
-				general = _lodash2.default.find(info["File"]["track"], { _type: "General" });
+				general = _lodash2.default.find(info["media"]["track"], { '@type': "General" });
 			}
 
 			switch (mediaType) {
@@ -366,8 +366,8 @@ var Ingest = function (_Model) {
 				ScanType: ""
 			};
 
-			var media = _lodash2.default.find(info["File"]["track"], {
-				_type: mediaType
+			var media = _lodash2.default.find(info["media"]["track"], {
+				'@type': mediaType
 			});
 			media = _lodash2.default.merge({}, mediainfoDefaults, media);
 

package/package.json

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

package/src/Ingest.js

@@ -302,19 +302,19 @@ export default class Ingest extends Model {
 
 		let tags = {};
 
-		if (!info.File) {
-			throw "missing info.File";
+		if (!info.media) {
+			throw "missing info.media";
 		}
 
-		if (!info.File.track) {
-			throw "missing info.File.track";
+		if (!info.media.track) {
+			throw "missing info.media.track";
 		}
 
 		let general;
-		if (!Array.isArray(info["File"]["track"])) {
-			general = info["File"]["track"];
+		if (!Array.isArray(info["media"]["track"])) {
+			general = info["media"]["track"];
 		} else {
-			general = _.find(info["File"]["track"], { _type: "General" });
+			general = _.find(info["media"]["track"], { '@type': "General" });
 		}
 
 		switch (mediaType) {
@@ -341,8 +341,8 @@ export default class Ingest extends Model {
 			ScanType: ""
 		};
 
-		let media = _.find(info["File"]["track"], {
-			_type: mediaType
+		let media = _.find(info["media"]["track"], {
+			'@type': mediaType
 		});
 		media = _.merge({}, mediainfoDefaults, media);
 

package/test/Ingest.spec.js

@@ -1,6 +1,7 @@
 import { Ingest, Order } from "../index";
 
 import mock from "./mocks/mediainfo.mock";
+import mock4x3 from "./mocks/mediainfo-4x3.mock";
 import proresMock from "./mocks/prores.mock";
 import pngMock from "./mocks/mediainfo.png.mock";
 import mxfMock from "./mocks/mediainfo.mxf.mock";
@@ -698,19 +699,14 @@ 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",
-							Text: "txtd"
+							Resolution: "1920x1080",
+							"Frame Mode": "progressive",
+							Framerate: "29.97",
+							Text: "txtd",
+							Extra: ["COMING-SOON", "HOJE"],
+							Codec: "PRORES"
 						}
 					}
 				}
@@ -721,7 +717,7 @@ describe("Ingest", () => {
 			let extension = "mp4";
 			let name = ingest.renderFilename({ allTags, allTypes, extension });
 			expect(name).toBe(
-				"TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_PRORES_NTSC-16X9_486p2398.mp4"
+				"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() {
@@ -1037,7 +1033,7 @@ describe("Ingest", () => {
 					}
 				},
 				mediainfo: {
-					File: { track: {} }
+					media: { track: {} }
 				},
 				selected: {
 					download: {
@@ -1319,7 +1315,7 @@ describe("Ingest", () => {
 		});
 	});
 	describe("mapFromMediainfo", () => {
-		it("should throw exception if missing File object", () => {
+		it("should throw exception if missing media object", () => {
 			let meta = {};
 			expect(() => {
 				let ingest = new Ingest({
@@ -1327,20 +1323,20 @@ describe("Ingest", () => {
 					mediainfo: meta
 				});
 				let info = ingest.mapFromMediainfo();
-			}).toThrow("missing info.File");
+			}).toThrow("missing info.media");
 		});
-		it("should throw exception if missing File.track object", () => {
-			let meta = { File: {} };
+		it("should throw exception if missing media.track object", () => {
+			let meta = { media: {} };
 			expect(() => {
 				let ingest = new Ingest({
 					source: { mediaType: "video" },
 					mediainfo: meta
 				});
 				let info = ingest.mapFromMediainfo();
-			}).toThrow("missing info.File.track");
+			}).toThrow("missing info.media.track");
 		});
 		it("should return empty object of tags if no metadata supplied", () => {
-			let meta = { File: { track: {} } };
+			let meta = { media: { track: {} } };
 			let ingest = new Ingest({
 				source: { mediaType: "video" },
 				mediainfo: meta

package/test/mocks/mediainfo-4x3.mock.js

@@ -0,0 +1,76 @@
+
+module.exports = {
+	File: {
+		track: [
+			{
+				Complete_name:
+					"https://slurpee3-encode-bucket.s3.us-west-2.amazonaws.com/encoded/5d729ee130c5782b008b456e.mov?AWSAccessKeyId=ASIA6POTFMFMZCJQFKMU&Expires=1567796481&Signature=LgyMuh65spyyt%2F%2FSyOnr4Jxqs0g%3D&x-amz-security-token=AgoJb3JpZ2luX2VjEKr%2F%2F%2F%2F%2F%2F%2F%2F%2F%2FwEaCXVzLXdlc3QtMiJHMEUCIQDieWUmrxT0AzYzVxzFv%2FPPorrdWtMNQwGo8L9UdlGvgQIgW7JgNXI5uU3fmv1DWCatjm8A17HvMucz6%2BvamgIlxRAqmwIIYxAAGgw5OTUyNjQ2NTE2MDkiDBnCi08PK03Wx7FM4Cr4AZKz6X7mA%2B4uRPysQxLquVuGhm%2BT3y5LN0naVSJri79wGtMskSHTGcLSO1mR5YMJgPM%2BLG%2BK1O8UdxohgNitGYgdsSvVKqUYQoVbRFvCkwMtxHVUuh37rBgjug26BkfyWm7F9dJEuLDP2YMIshhP0Iys81dX%2BU6p7tuA2KDY10Or0%2Bo6j3OgvKezwnL40aFM3bLR7Mjc7CcwKIeUj3%2FLADhlAfxxd4jVHCNyYs8d0oXE689PWhAUjqnLfm5s7sG5dR7bJhq8Bgv%2BrdbVcvKODOg2y33JsweUXJG0hnydMACnsOjJmUxgE7hlrVkBz%2BKE5aYgNOF7w8%2FSMPC9yusFOrQB90%2BMdanLrtCez%2Bl9fg5Eas3sNdg9Kflg4MxGZ70yU6ukLKGILmi1fneLBa2CxR1UrtOJJiT5ECRrUY68RdRq4OlZRrSXW5AxTjyn2KLn5OVPHY8VcxfwdkxzQbxmDyoFGWSnsch5nS5LU0snKRQe4h7dGUYLNnWsUR5PceG9dZJeORP6YXHtB%2FmVG%2Fv0AlpGo8Z7qXicVMLL6MuPPT3bPa%2BVKb%2FrZCWF5jw5l1kjHx%2FxzmzS",
+				Format: "MPEG-4",
+				Format_profile: "QuickTime",
+				Codec_ID: "qt   2005.03 (qt  )",
+				File_size: "8.03 MiB",
+				Duration: "1 s 68 ms",
+				Overall_bit_rate_mode: "Variable",
+				Overall_bit_rate: "63.1 Mb/s",
+				Encoded_date: "UTC 2019-09-06 18:01:18",
+				Tagged_date: "UTC 2019-09-06 18:01:18",
+				FileExtension_Invalid:
+					"mov mp4 m4v m4a m4b m4p 3gpp 3gp 3gpp2 3g2 k3g jpm jpx mqv ismv isma ismt f4v",
+				'@type': "General"
+			},
+			{
+				ID: "1",
+				Format: "ProRes",
+				Format_version: "Version 0",
+				Format_profile: "422 HQ",
+				Codec_ID: "apch",
+				Duration: "1 s 68 ms",
+				Bit_rate_mode: "Variable",
+				Bit_rate: "61.2 Mb/s",
+				Width: "720 pixels",
+				Clean_aperture_width: "704 pixels",
+				Height: "486 pixels",
+				Clean_aperture_height: "480 pixels",
+				Display_aspect_ratio: "4:3",
+				Clean_aperture_display_aspect_ratio: "4:3",
+				Frame_rate_mode: "Constant",
+				Frame_rate: "29.970 (30000/1001) FPS",
+				Standard: "NTSC",
+				Color_space: "YUV",
+				Chroma_subsampling: "4:2:2",
+				Scan_type: "Progressive",
+				Bits__Pixel_Frame_: "5.833",
+				Stream_size: "7.79 MiB (97%)",
+				Writing_library: "ael0",
+				Language: "English",
+				Encoded_date: "UTC 2019-09-06 18:01:18",
+				Tagged_date: "UTC 2019-09-06 18:01:18",
+				Color_primaries: "BT.709",
+				Transfer_characteristics: "BT.709",
+				Matrix_coefficients: "BT.709",
+				matrix_coefficients_Original: "BT.601",
+				'@type': "Video"
+			},
+			{
+				ID: "2",
+				Format: "PCM",
+				Format_settings__Endianness: "Little",
+				Format_settings__Sign: "Signed",
+				Codec_ID: "lpcm",
+				Duration: "1 s 61 ms",
+				Bit_rate_mode: "Constant",
+				Bit_rate: "1 536 kb/s",
+				Channel_s_: "2 channels",
+				Channel_positions: "Front: L R",
+				Sampling_rate: "48.0 kHz",
+				Bit_depth: "16 bits",
+				Stream_size: "199 KiB (2%)",
+				Language: "English",
+				Encoded_date: "UTC 2019-09-06 18:01:18",
+				Tagged_date: "UTC 2019-09-06 18:01:18",
+				'@type': "Audio"
+			}
+		]
+	},
+	_version: "0.7.92.1"
+};

package/test/mocks/mediainfo.mock.js

@@ -1,5 +1,5 @@
 module.exports = {
-	File: {
+	media: {
 		track: [
 			{
 				VideoCount: "1",
@@ -19,7 +19,7 @@ module.exports = {
 				FooterSize: "8875",
 				IsStreamable: "No",
 				Encoded_Application: "Lavf57.83.100",
-				_type: "General"
+				'@type': "General"
 			},
 			{
 				StreamOrder: "0",
@@ -55,7 +55,7 @@ module.exports = {
 				Encoded_Library_Settings:
 					"cabac=1 / ref=3 / deblock=1:0:0 / analyse=0x3:0x113 / me=hex / subme=7 / psy=1 / psy_rd=1.00:0.00 / mixed_ref=1 / me_range=16 / chroma_me=1 / trellis=1 / 8x8dct=1 / cqm=0 / deadzone=21,11 / fast_pskip=1 / chroma_qp_offset=-2 / threads=6 / lookahead_threads=1 / sliced_threads=0 / nr=0 / decimate=1 / interlaced=0 / bluray_compat=0 / constrained_intra=0 / bframes=3 / b_pyramid=2 / b_adapt=1 / b_bias=0 / direct=1 / weightb=1 / open_gop=0 / weightp=2 / keyint=250 / keyint_min=23 / scenecut=40 / intra_refresh=0 / rc_lookahead=40 / rc=crf / mbtree=1 / crf=23.0 / qcomp=0.60 / qpmin=0 / qpmax=69 / qpstep=4 / ip_ratio=1.40 / aq=1:1.00",
 				Language: "en",
-				_type: "Video"
+				'@type': "Video"
 			},
 			{
 				StreamOrder: "1",
@@ -81,7 +81,7 @@ module.exports = {
 				Language: "en",
 				Default: "Yes",
 				AlternateGroup: "1",
-				_type: "Audio"
+				'@type': "Audio"
 			}
 		],
 		_ref:

package/test/mocks/mediainfo.mxf.mock.js

@@ -1,5 +1,5 @@
 module.exports = {
-	File: {
+	media: {
 		track: [
 			{
 				Format: "MXF",
@@ -15,7 +15,7 @@ module.exports = {
 				Encoded_date: "2018-07-03 01:23:26.180",
 				Writing_application: "OpenCube MXFTk Advanced 2.6.4.0.1",
 				Writing_library: "Darwin 15.6.0 x86_64 2.6.4.0.1",
-				_type: "General"
+				'@type': "General"
 			},
 			{
 				ID: "2",
@@ -51,7 +51,7 @@ module.exports = {
 				Color_primaries: "BT.709",
 				Transfer_characteristics: "BT.709",
 				Matrix_coefficients: "BT.709",
-				_type: "Video"
+				'@type': "Video"
 			},
 			{
 				ID: "3",
@@ -68,7 +68,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "1"
 			},
 			{
@@ -86,7 +86,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "2"
 			},
 			{
@@ -104,7 +104,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "3"
 			},
 			{
@@ -122,7 +122,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "4"
 			},
 			{
@@ -140,7 +140,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "5"
 			},
 			{
@@ -158,7 +158,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "6"
 			},
 			{
@@ -176,7 +176,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "7"
 			},
 			{
@@ -194,7 +194,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "8"
 			},
 			{
@@ -204,7 +204,7 @@ module.exports = {
 				Time_code_of_first_frame: "00:00:00:00",
 				Time_code_settings: "Material Package",
 				Time_code__striped: "Yes",
-				_type: "Other",
+				'@type': "Other",
 				_typeorder: "1"
 			},
 			{
@@ -214,7 +214,7 @@ module.exports = {
 				Time_code_of_first_frame: "00:00:00:00",
 				Time_code_settings: "Source Package",
 				Time_code__striped: "Yes",
-				_type: "Other",
+				'@type': "Other",
 				_typeorder: "2"
 			},
 			{
@@ -222,7 +222,7 @@ module.exports = {
 				Format: "SMPTE TC",
 				Muxing_mode: "SDTI",
 				Time_code_of_first_frame: "00:00:00:00",
-				_type: "Other",
+				'@type': "Other",
 				_typeorder: "3"
 			}
 		]

package/test/mocks/mediainfo.png.mock.js

@@ -1,11 +1,11 @@
 module.exports = {
-	File: {
+	media: {
 		track: [
 			{
 				Format: "PNG",
 				Format_Info: "Portable Network Graphic",
 				File_size: "518 KiB",
-				_type: "General"
+				'@type': "General"
 			},
 			{
 				Format: "PNG",
@@ -15,7 +15,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Compression_mode: "Lossless",
 				Stream_size: "518 KiB (100%)",
-				_type: "Image"
+				'@type': "Image"
 			}
 		]
 	}

package/test/mocks/prores.mock.js

@@ -1,8 +1,8 @@
 module.exports = {
-	File: {
+	media: {
 		track: [
 			{
-				_type: "General",
+				'@type': "General",
 				VideoCount: "1",
 				AudioCount: "1",
 				OtherCount: "1",
@@ -34,7 +34,7 @@ module.exports = {
 				}
 			},
 			{
-				_type: "Video",
+				'@type': "Video",
 				StreamOrder: "0",
 				ID: "1",
 				Format: "ProRes",
@@ -72,7 +72,7 @@ module.exports = {
 				}
 			},
 			{
-				_type: "Audio",
+				'@type': "Audio",
 				StreamOrder: "1",
 				ID: "2",
 				Format: "PCM",
@@ -101,7 +101,7 @@ module.exports = {
 				}
 			},
 			{
-				_type: "Other",
+				'@type': "Other",
 				StreamOrder: "2",
 				ID: "3",
 				Type: "Time code",