@pixwel/pixwel-sdk 2.1.26 → 2.1.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -269,8 +269,8 @@ var Ingest = function (_Model) {
269
269
 
270
270
  var name = parts.join("_");
271
271
 
272
- var hasResInfo = name.match(/\d+(i|p)/i);
273
- var hasAllInfo = name.match(/\d+(i|p)\d+/i);
272
+ var hasResInfo = null;
273
+ var hasAllInfo = null;
274
274
 
275
275
  if (requiredInfo && !hasResInfo && !hasAllInfo) {
276
276
  var res = tags.Resolution;
package/dist/src/Order.js CHANGED
@@ -56,6 +56,7 @@ var Order = function () {
56
56
  if (!this.dng) {
57
57
  return null;
58
58
  }
59
+ if (this.dng === "Graphics Only") return false;
59
60
  if (this.dng.dialogue.includes("Dedicated / Localized")) {
60
61
  return true;
61
62
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@pixwel/pixwel-sdk",
3
3
  "description": "",
4
- "version": "2.1.26",
4
+ "version": "2.1.28",
5
5
  "author": "Pixwel",
6
6
  "license": "UNLICENSED",
7
7
  "main": "./dist/index.js",
package/src/Ingest.js CHANGED
@@ -240,8 +240,8 @@ export default class Ingest extends Model {
240
240
 
241
241
  let name = parts.join("_");
242
242
 
243
- let hasResInfo = name.match(/\d+(i|p)/i);
244
- let hasAllInfo = name.match(/\d+(i|p)\d+/i);
243
+ let hasResInfo = null;
244
+ let hasAllInfo = null;
245
245
 
246
246
  if (requiredInfo && !hasResInfo && !hasAllInfo) {
247
247
  let res = tags.Resolution;
package/src/Order.js CHANGED
@@ -21,6 +21,7 @@ export default class Order {
21
21
  if (!this.dng) {
22
22
  return null;
23
23
  }
24
+ if (this.dng === "Graphics Only") return false;
24
25
  if (this.dng.dialogue.includes("Dedicated / Localized")) {
25
26
  return true;
26
27
  }
@@ -26,6 +26,51 @@ describe("Ingest", () => {
26
26
  });
27
27
  });
28
28
  describe("renderFilename", () => {
29
+ it("renders correctly when name contains resolution information", function() {
30
+ let data = {
31
+ asset: {
32
+ name: "24P",
33
+ slug: "24P",
34
+ type: "trailer.intl",
35
+ mediaType: "video",
36
+ project: {
37
+ filePrefix: "TESTPROJECT"
38
+ }
39
+ },
40
+ filename: {
41
+ file: {
42
+ ext: "mp4"
43
+ }
44
+ },
45
+ selected: {
46
+ download: {
47
+ enabled: false,
48
+ tags: {
49
+ Extra: ["tag1"],
50
+ SubDub: { sub: null, dub: null },
51
+ Framerate: "25",
52
+ Codec: "h264",
53
+ Resolution: "854x480",
54
+ "Frame Mode": "progressive",
55
+ Standard: "pal",
56
+ Usage: "online",
57
+ Text: "txtd"
58
+ },
59
+ embargo: { enabled: false },
60
+ country: "US",
61
+ language: "ENG"
62
+ }
63
+ }
64
+ };
65
+ let ingest = new Ingest(data);
66
+ let allTags = [];
67
+ let allTypes = [];
68
+ let extension = "mp4";
69
+ let name = ingest.renderFilename({ allTags, allTypes, extension });
70
+ expect(name).toBe(
71
+ "TESTPROJECT_ITR-24P_ENG-US_TXTD_TAG1_H264_480p25.mp4"
72
+ );
73
+ });
29
74
  it("renders language only for dual-language codes", function() {
30
75
  let data = {
31
76
  asset: {
@@ -60,7 +105,7 @@ describe("Ingest", () => {
60
105
  let ingest = new Ingest(data);
61
106
  let allTags = [];
62
107
  let allTypes = [];
63
- let extension = 'mp4';
108
+ let extension = "mp4";
64
109
  let name = ingest.renderFilename({ allTags, allTypes, extension });
65
110
  expect(name).toBe(
66
111
  "TESTPROJECT_ITR-TEST-ASSET-A_PFR-FLE_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
@@ -127,7 +172,7 @@ describe("Ingest", () => {
127
172
  let ingest = new Ingest(data);
128
173
  let allTags = [];
129
174
  let allTypes = [];
130
- let extension = 'jpg';
175
+ let extension = "jpg";
131
176
  let name = ingest.renderFilename({ allTags, allTypes, extension });
132
177
  expect(name).toBe("TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_640x480.jpg");
133
178
  });
@@ -210,7 +255,7 @@ describe("Ingest", () => {
210
255
  let ingest = new Ingest(data);
211
256
  let allTags = [];
212
257
  let allTypes = [];
213
- let extension = 'mp4';
258
+ let extension = "mp4";
214
259
  let name = ingest.renderFilename({ allTags, allTypes, extension });
215
260
  expect(name).toBe(
216
261
  "TESTPROJECT_ITR-TEST-ASSET-A_ENG-US_TXTD_PRORES_480p2398.mp4"
@@ -248,7 +293,7 @@ describe("Ingest", () => {
248
293
  let ingest = new Ingest(data);
249
294
  let allTags = [];
250
295
  let allTypes = [];
251
- let extension = 'mp4';
296
+ let extension = "mp4";
252
297
  let name = ingest.renderFilename({ allTags, allTypes, extension });
253
298
  expect(name).toBe(
254
299
  "TESTPROJECT_DTR-TEST-ASSET-A_ENG_TXTD_PRORES_480p2398.mp4"
@@ -286,7 +331,7 @@ describe("Ingest", () => {
286
331
  let ingest = new Ingest(data);
287
332
  let allTags = [];
288
333
  let allTypes = [];
289
- let extension = 'mp4';
334
+ let extension = "mp4";
290
335
  let name = ingest.renderFilename({ allTags, allTypes, extension });
291
336
  expect(name).toBe(
292
337
  "TESTPROJECT_TR-GENERIC-TRAILER_ENG_TXTD_PRORES_480p2398.mp4"
@@ -355,7 +400,7 @@ describe("Ingest", () => {
355
400
  let ingest = new Ingest(data);
356
401
  let allTags = [];
357
402
  let allTypes = [{ _id: "tv-spot.intl", name: "tv-spot.intl" }];
358
- let extension = 'mp4';
403
+ let extension = "mp4";
359
404
  let name = ingest.renderFilename({ allTags, allTypes, extension });
360
405
  expect(name).toBe(
361
406
  "TESTPROJECT_TV-SPOT-INTL_COOL-SPOT-15_ENG_TXTD_PRORES_480p2398.mp4"
@@ -463,7 +508,7 @@ describe("Ingest", () => {
463
508
  let ingest = new Ingest(data);
464
509
  let allTags = [];
465
510
  let allTypes = [{ name: "film-clip.intl" }];
466
- let extension = 'mp4';
511
+ let extension = "mp4";
467
512
  let name = ingest.renderFilename({ allTags, allTypes, extension });
468
513
  expect(name).toBe(
469
514
  "TESTPROJECT_FILM-CLIP-INTL_ULTRA-VIOLENCE_1MIN3SEC_ENG_TXTD_PRORES_480p2398.mp4"
@@ -517,7 +562,7 @@ describe("Ingest", () => {
517
562
  let ingest = new Ingest(data);
518
563
  let allTags = [];
519
564
  let allTypes = [{ name: "film-clip.intl" }];
520
- let extension = 'mp4';
565
+ let extension = "mp4";
521
566
  let name = ingest.renderFilename({ allTags, allTypes, extension });
522
567
  expect(name).toBe(
523
568
  "TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_1080i2997.mp4"
@@ -577,7 +622,7 @@ describe("Ingest", () => {
577
622
  let ingest = new Ingest(data);
578
623
  let allTags = [];
579
624
  let allTypes = [{ name: "film-clip.intl" }, { name: "tv-spot.intl" }];
580
- let extension = 'mp4';
625
+ let extension = "mp4";
581
626
  let name = ingest.renderFilename({ allTags, allTypes, extension });
582
627
  expect(name).toBe(
583
628
  "TESTPROJECT_TV-SPOT-INTL_TEST-ASSET-INTL-10_ENG_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
@@ -620,7 +665,7 @@ describe("Ingest", () => {
620
665
  let ingest = new Ingest(data);
621
666
  let allTags = [];
622
667
  let allTypes = [{ name: "film-clip.intl" }, { name: "tv-spot.intl" }];
623
- let extension = 'mp4';
668
+ let extension = "mp4";
624
669
  let name = ingest.renderFilename({ allTags, allTypes, extension });
625
670
  expect(name).toBe(
626
671
  "TESTPROJECT_TV-SPOT-INTL_TEST-ASSET-INTL-10_ENG_SUB_COMING-SOON_HOJE_PRORES_480p2398.mp4"
@@ -671,7 +716,7 @@ describe("Ingest", () => {
671
716
  let ingest = new Ingest(data);
672
717
  let allTags = [];
673
718
  let allTypes = [{ name: "film-clip.intl" }];
674
- let extension = 'mp4';
719
+ let extension = "mp4";
675
720
  let name = ingest.renderFilename({ allTags, allTypes, extension });
676
721
  expect(name).toBe(
677
722
  "TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_1080p2997.mp4"
@@ -710,7 +755,7 @@ describe("Ingest", () => {
710
755
  let ingest = new Ingest(data);
711
756
  let allTags = [];
712
757
  let allTypes = [{ name: "film-clip.intl" }];
713
- let extension = 'mp4';
758
+ let extension = "mp4";
714
759
  let name = ingest.renderFilename({ allTags, allTypes, extension });
715
760
  expect(name).toBe(
716
761
  "TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_H264_1080p2398.mp4"
@@ -833,7 +878,7 @@ describe("Ingest", () => {
833
878
  let ingest = new Ingest(data);
834
879
  let allTags = [];
835
880
  let allTypes = [];
836
- let extension = 'mp4';
881
+ let extension = "mp4";
837
882
  let name = ingest.renderFilename({ allTags, allTypes, extension });
838
883
  expect(name).toBe(
839
884
  "TESTPROJECT_ITR-TEST-ASSET-A_ENG-US_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
@@ -872,7 +917,7 @@ describe("Ingest", () => {
872
917
  let ingest = new Ingest(data);
873
918
  let allTags = [];
874
919
  let allTypes = [];
875
- let extension = 'mp4';
920
+ let extension = "mp4";
876
921
  let name = ingest.renderFilename({ allTags, allTypes, extension });
877
922
  expect(name).toEqual(
878
923
  "TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_REV_PRORES_480p2398.mp4"
@@ -910,7 +955,7 @@ describe("Ingest", () => {
910
955
  let ingest = new Ingest(data);
911
956
  let allTags = [];
912
957
  let allTypes = [];
913
- let extension = 'mp4';
958
+ let extension = "mp4";
914
959
  let name = ingest.renderFilename({ allTags, allTypes, extension });
915
960
  expect(name).toBe(
916
961
  "TESTPROJECT_ITR-CANT-INTL-10_ENG_TXTD_PRORES_480p2398.mp4"
@@ -950,7 +995,7 @@ describe("Ingest", () => {
950
995
  let ingest = new Ingest(data);
951
996
  let allTags = [];
952
997
  let allTypes = [];
953
- let extension = 'mp4';
998
+ let extension = "mp4";
954
999
  let name = ingest.renderFilename({ allTags, allTypes, extension });
955
1000
  expect(name).toBe(
956
1001
  "TESTPROJECT_ITR-TEST-ASSET-A_ENG_TXTD_COMING-SOON_HOJE_PRORES_480p2398.mp4"
@@ -1008,7 +1053,7 @@ describe("Ingest", () => {
1008
1053
  let allTags = [];
1009
1054
  let allTypes = [{ name: "tv-spot.intl" }];
1010
1055
  let order = new Order();
1011
- let extension = 'mp4';
1056
+ let extension = "mp4";
1012
1057
  let ingest = new Ingest(data);
1013
1058
  let file = ingest.createFile({ allTags, allTypes, order, extension });
1014
1059
  let expected = {
@@ -22,6 +22,12 @@ describe("Order", () => {
22
22
  });
23
23
  expect(order.isDub()).toBe(false);
24
24
  });
25
+ it("should not set DUB if DNG is Graphics Only", () => {
26
+ let order = new Order({
27
+ dng: "Graphics Only"
28
+ });
29
+ expect(order.isDub()).toBe(false);
30
+ });
25
31
  });
26
32
  describe("isSub", () => {
27
33
  it("should set SUB if any DNG contains Subtitled", () => {
@@ -36,7 +42,7 @@ describe("Order", () => {
36
42
  });
37
43
  it("should not set SUB if DNG is Graphics Only", () => {
38
44
  let order = new Order({
39
- dng: "Grapghics Only"
45
+ dng: "Graphics Only"
40
46
  });
41
47
  expect(order.isSub()).toBe(false);
42
48
  });