@pixwel/pixwel-sdk 2.1.2 → 2.1.4
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.
- package/coverage/clover.xml +450 -457
- package/coverage/coverage-final.json +10 -10
- package/coverage/lcov-report/Ass.js.html +212 -212
- package/coverage/lcov-report/Asset.js.html +27 -27
- package/coverage/lcov-report/AssetType.js.html +1 -1
- package/coverage/lcov-report/Encode.js.html +1 -1
- package/coverage/lcov-report/File.js.html +13 -13
- package/coverage/lcov-report/Filename.js.html +1 -1
- package/coverage/lcov-report/Ingest.js.html +502 -511
- package/coverage/lcov-report/IngestFile.js.html +1 -1
- package/coverage/lcov-report/Model.js.html +25 -25
- package/coverage/lcov-report/Order.js.html +25 -25
- package/coverage/lcov-report/Srt.js.html +102 -102
- package/coverage/lcov-report/Sub.js.html +43 -43
- package/coverage/lcov-report/Tag.js.html +1 -1
- package/coverage/lcov-report/TimeFormat.js.html +63 -63
- package/coverage/lcov-report/fileType.js.html +4 -4
- package/coverage/lcov-report/index.html +93 -93
- package/coverage/lcov.info +834 -841
- package/dist/src/Ingest.js +11 -11
- package/dist/src/Model.js +5 -4
- package/package.json +2 -1
- package/src/Ingest.js +8 -11
- package/src/Model.js +2 -2
- package/test/Ingest.spec.js +73 -88
- package/test/Model.spec.js +3 -2
|
@@ -20,28 +20,28 @@
|
|
|
20
20
|
</h1>
|
|
21
21
|
<div class='clearfix'>
|
|
22
22
|
<div class='fl pad1y space-right2'>
|
|
23
|
-
<span class="strong">
|
|
23
|
+
<span class="strong">86.74% </span>
|
|
24
24
|
<span class="quiet">Statements</span>
|
|
25
|
-
<span class='fraction'>
|
|
25
|
+
<span class='fraction'>229/264</span>
|
|
26
26
|
</div>
|
|
27
27
|
<div class='fl pad1y space-right2'>
|
|
28
|
-
<span class="strong">
|
|
28
|
+
<span class="strong">84.48% </span>
|
|
29
29
|
<span class="quiet">Branches</span>
|
|
30
|
-
<span class='fraction'>
|
|
30
|
+
<span class='fraction'>196/232</span>
|
|
31
31
|
</div>
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">
|
|
33
|
+
<span class="strong">86.36% </span>
|
|
34
34
|
<span class="quiet">Functions</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>19/22</span>
|
|
36
36
|
</div>
|
|
37
37
|
<div class='fl pad1y space-right2'>
|
|
38
|
-
<span class="strong">
|
|
38
|
+
<span class="strong">86.69% </span>
|
|
39
39
|
<span class="quiet">Lines</span>
|
|
40
|
-
<span class='fraction'>
|
|
40
|
+
<span class='fraction'>228/263</span>
|
|
41
41
|
</div>
|
|
42
42
|
</div>
|
|
43
43
|
</div>
|
|
44
|
-
<div class='status-line
|
|
44
|
+
<div class='status-line high'></div>
|
|
45
45
|
<pre><table class="coverage">
|
|
46
46
|
<tr><td class="line-count quiet">1
|
|
47
47
|
2
|
|
@@ -699,10 +699,7 @@
|
|
|
699
699
|
654
|
|
700
700
|
655
|
|
701
701
|
656
|
|
702
|
-
657
|
|
703
|
-
658
|
|
704
|
-
659
|
|
705
|
-
660</td><td class="line-coverage quiet"><span class="cline-any cline-neutral"> </span>
|
|
702
|
+
657</td><td class="line-coverage quiet"><span class="cline-any cline-neutral"> </span>
|
|
706
703
|
<span class="cline-any cline-neutral"> </span>
|
|
707
704
|
<span class="cline-any cline-neutral"> </span>
|
|
708
705
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -714,8 +711,8 @@
|
|
|
714
711
|
<span class="cline-any cline-neutral"> </span>
|
|
715
712
|
<span class="cline-any cline-neutral"> </span>
|
|
716
713
|
<span class="cline-any cline-neutral"> </span>
|
|
717
|
-
<span class="cline-any cline-
|
|
718
|
-
<span class="cline-any cline-
|
|
714
|
+
<span class="cline-any cline-yes">52x</span>
|
|
715
|
+
<span class="cline-any cline-yes">52x</span>
|
|
719
716
|
<span class="cline-any cline-neutral"> </span>
|
|
720
717
|
<span class="cline-any cline-neutral"> </span>
|
|
721
718
|
<span class="cline-any cline-no"> </span>
|
|
@@ -725,17 +722,17 @@
|
|
|
725
722
|
<span class="cline-any cline-neutral"> </span>
|
|
726
723
|
<span class="cline-any cline-neutral"> </span>
|
|
727
724
|
<span class="cline-any cline-neutral"> </span>
|
|
728
|
-
<span class="cline-any cline-
|
|
729
|
-
<span class="cline-any cline-
|
|
725
|
+
<span class="cline-any cline-yes">2x</span>
|
|
726
|
+
<span class="cline-any cline-yes">2x</span>
|
|
730
727
|
<span class="cline-any cline-no"> </span>
|
|
731
728
|
<span class="cline-any cline-neutral"> </span>
|
|
732
|
-
<span class="cline-any cline-
|
|
729
|
+
<span class="cline-any cline-yes">2x</span>
|
|
733
730
|
<span class="cline-any cline-no"> </span>
|
|
734
731
|
<span class="cline-any cline-neutral"> </span>
|
|
735
|
-
<span class="cline-any cline-
|
|
732
|
+
<span class="cline-any cline-yes">2x</span>
|
|
736
733
|
<span class="cline-any cline-no"> </span>
|
|
737
734
|
<span class="cline-any cline-neutral"> </span>
|
|
738
|
-
<span class="cline-any cline-
|
|
735
|
+
<span class="cline-any cline-yes">2x</span>
|
|
739
736
|
<span class="cline-any cline-neutral"> </span>
|
|
740
737
|
<span class="cline-any cline-neutral"> </span>
|
|
741
738
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -747,27 +744,27 @@
|
|
|
747
744
|
<span class="cline-any cline-neutral"> </span>
|
|
748
745
|
<span class="cline-any cline-neutral"> </span>
|
|
749
746
|
<span class="cline-any cline-neutral"> </span>
|
|
750
|
-
<span class="cline-any cline-
|
|
751
|
-
<span class="cline-any cline-
|
|
752
|
-
<span class="cline-any cline-
|
|
747
|
+
<span class="cline-any cline-yes">31x</span>
|
|
748
|
+
<span class="cline-any cline-yes">31x</span>
|
|
749
|
+
<span class="cline-any cline-yes">31x</span>
|
|
753
750
|
<span class="cline-any cline-neutral"> </span>
|
|
754
|
-
<span class="cline-any cline-
|
|
755
|
-
<span class="cline-any cline-
|
|
751
|
+
<span class="cline-any cline-yes">31x</span>
|
|
752
|
+
<span class="cline-any cline-yes">1x</span>
|
|
756
753
|
<span class="cline-any cline-neutral"> </span>
|
|
757
754
|
<span class="cline-any cline-neutral"> </span>
|
|
758
|
-
<span class="cline-any cline-
|
|
759
|
-
<span class="cline-any cline-
|
|
755
|
+
<span class="cline-any cline-yes">30x</span>
|
|
756
|
+
<span class="cline-any cline-yes">1x</span>
|
|
760
757
|
<span class="cline-any cline-neutral"> </span>
|
|
761
758
|
<span class="cline-any cline-neutral"> </span>
|
|
762
|
-
<span class="cline-any cline-
|
|
763
|
-
<span class="cline-any cline-
|
|
759
|
+
<span class="cline-any cline-yes">29x</span>
|
|
760
|
+
<span class="cline-any cline-yes">1x</span>
|
|
764
761
|
<span class="cline-any cline-neutral"> </span>
|
|
765
762
|
<span class="cline-any cline-neutral"> </span>
|
|
766
|
-
<span class="cline-any cline-
|
|
767
|
-
<span class="cline-any cline-
|
|
763
|
+
<span class="cline-any cline-yes">28x</span>
|
|
764
|
+
<span class="cline-any cline-yes">1x</span>
|
|
768
765
|
<span class="cline-any cline-neutral"> </span>
|
|
769
766
|
<span class="cline-any cline-neutral"> </span>
|
|
770
|
-
<span class="cline-any cline-
|
|
767
|
+
<span class="cline-any cline-yes">27x</span>
|
|
771
768
|
<span class="cline-any cline-neutral"> </span>
|
|
772
769
|
<span class="cline-any cline-neutral"> </span>
|
|
773
770
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -786,134 +783,134 @@
|
|
|
786
783
|
<span class="cline-any cline-neutral"> </span>
|
|
787
784
|
<span class="cline-any cline-neutral"> </span>
|
|
788
785
|
<span class="cline-any cline-neutral"> </span>
|
|
789
|
-
<span class="cline-any cline-
|
|
786
|
+
<span class="cline-any cline-yes">27x</span>
|
|
790
787
|
<span class="cline-any cline-neutral"> </span>
|
|
791
|
-
<span class="cline-any cline-
|
|
792
|
-
<span class="cline-any cline-
|
|
788
|
+
<span class="cline-any cline-yes">27x</span>
|
|
789
|
+
<span class="cline-any cline-yes">2x</span>
|
|
793
790
|
<span class="cline-any cline-neutral"> </span>
|
|
794
791
|
<span class="cline-any cline-neutral"> </span>
|
|
795
|
-
<span class="cline-any cline-
|
|
792
|
+
<span class="cline-any cline-yes">25x</span>
|
|
796
793
|
<span class="cline-any cline-no"> </span>
|
|
797
794
|
<span class="cline-any cline-neutral"> </span>
|
|
798
795
|
<span class="cline-any cline-neutral"> </span>
|
|
799
|
-
<span class="cline-any cline-
|
|
800
|
-
<span class="cline-any cline-
|
|
796
|
+
<span class="cline-any cline-yes">25x</span>
|
|
797
|
+
<span class="cline-any cline-yes">1x</span>
|
|
801
798
|
<span class="cline-any cline-neutral"> </span>
|
|
802
799
|
<span class="cline-any cline-neutral"> </span>
|
|
803
|
-
<span class="cline-any cline-
|
|
804
|
-
<span class="cline-any cline-
|
|
800
|
+
<span class="cline-any cline-yes">24x</span>
|
|
801
|
+
<span class="cline-any cline-yes">1x</span>
|
|
805
802
|
<span class="cline-any cline-neutral"> </span>
|
|
806
803
|
<span class="cline-any cline-neutral"> </span>
|
|
807
|
-
<span class="cline-any cline-
|
|
808
|
-
<span class="cline-any cline-
|
|
804
|
+
<span class="cline-any cline-yes">23x</span>
|
|
805
|
+
<span class="cline-any cline-yes">1x</span>
|
|
809
806
|
<span class="cline-any cline-neutral"> </span>
|
|
810
807
|
<span class="cline-any cline-neutral"> </span>
|
|
811
808
|
<span class="cline-any cline-neutral"> </span>
|
|
812
|
-
<span class="cline-any cline-
|
|
813
|
-
<span class="cline-any cline-
|
|
809
|
+
<span class="cline-any cline-yes">22x</span>
|
|
810
|
+
<span class="cline-any cline-yes">13x</span>
|
|
814
811
|
<span class="cline-any cline-neutral"> </span>
|
|
815
812
|
<span class="cline-any cline-neutral"> </span>
|
|
816
|
-
<span class="cline-any cline-
|
|
817
|
-
<span class="cline-any cline-
|
|
818
|
-
<span class="cline-any cline-
|
|
813
|
+
<span class="cline-any cline-yes">9x</span>
|
|
814
|
+
<span class="cline-any cline-yes">9x</span>
|
|
815
|
+
<span class="cline-any cline-yes">1x</span>
|
|
819
816
|
<span class="cline-any cline-neutral"> </span>
|
|
820
817
|
<span class="cline-any cline-neutral"> </span>
|
|
821
|
-
<span class="cline-any cline-
|
|
818
|
+
<span class="cline-any cline-yes">8x</span>
|
|
822
819
|
<span class="cline-any cline-neutral"> </span>
|
|
823
820
|
<span class="cline-any cline-neutral"> </span>
|
|
824
821
|
<span class="cline-any cline-neutral"> </span>
|
|
825
822
|
<span class="cline-any cline-neutral"> </span>
|
|
826
823
|
<span class="cline-any cline-neutral"> </span>
|
|
827
|
-
<span class="cline-any cline-
|
|
828
|
-
<span class="cline-any cline-
|
|
829
|
-
<span class="cline-any cline-
|
|
830
|
-
<span class="cline-any cline-
|
|
824
|
+
<span class="cline-any cline-yes">21x</span>
|
|
825
|
+
<span class="cline-any cline-yes">21x</span>
|
|
826
|
+
<span class="cline-any cline-yes">21x</span>
|
|
827
|
+
<span class="cline-any cline-yes">13x</span>
|
|
831
828
|
<span class="cline-any cline-neutral"> </span>
|
|
832
|
-
<span class="cline-any cline-
|
|
833
|
-
<span class="cline-any cline-
|
|
834
|
-
<span class="cline-any cline-
|
|
829
|
+
<span class="cline-any cline-yes">11x</span>
|
|
830
|
+
<span class="cline-any cline-yes">11x</span>
|
|
831
|
+
<span class="cline-any cline-yes">11x</span>
|
|
835
832
|
<span class="cline-any cline-neutral"> </span>
|
|
836
|
-
<span class="cline-any cline-
|
|
837
|
-
<span class="cline-any cline-
|
|
838
|
-
<span class="cline-any cline-
|
|
833
|
+
<span class="cline-any cline-yes">1x</span>
|
|
834
|
+
<span class="cline-any cline-yes">1x</span>
|
|
835
|
+
<span class="cline-any cline-yes">1x</span>
|
|
839
836
|
<span class="cline-any cline-neutral"> </span>
|
|
840
|
-
<span class="cline-any cline-
|
|
841
|
-
<span class="cline-any cline-
|
|
842
|
-
<span class="cline-any cline-
|
|
837
|
+
<span class="cline-any cline-yes">1x</span>
|
|
838
|
+
<span class="cline-any cline-yes">1x</span>
|
|
839
|
+
<span class="cline-any cline-yes">1x</span>
|
|
843
840
|
<span class="cline-any cline-neutral"> </span>
|
|
844
841
|
<span class="cline-any cline-neutral"> </span>
|
|
845
|
-
<span class="cline-any cline-
|
|
842
|
+
<span class="cline-any cline-yes">21x</span>
|
|
846
843
|
<span class="cline-any cline-neutral"> </span>
|
|
847
844
|
<span class="cline-any cline-neutral"> </span>
|
|
848
845
|
<span class="cline-any cline-neutral"> </span>
|
|
849
|
-
<span class="cline-any cline-
|
|
850
|
-
<span class="cline-any cline-
|
|
851
|
-
<span class="cline-any cline-
|
|
846
|
+
<span class="cline-any cline-yes">21x</span>
|
|
847
|
+
<span class="cline-any cline-yes">21x</span>
|
|
848
|
+
<span class="cline-any cline-yes">18x</span>
|
|
852
849
|
<span class="cline-any cline-neutral"> </span>
|
|
853
850
|
<span class="cline-any cline-neutral"> </span>
|
|
854
|
-
<span class="cline-any cline-
|
|
855
|
-
<span class="cline-any cline-
|
|
851
|
+
<span class="cline-any cline-yes">3x</span>
|
|
852
|
+
<span class="cline-any cline-yes">3x</span>
|
|
856
853
|
<span class="cline-any cline-neutral"> </span>
|
|
857
|
-
<span class="cline-any cline-
|
|
854
|
+
<span class="cline-any cline-yes">3x</span>
|
|
858
855
|
<span class="cline-any cline-neutral"> </span>
|
|
859
|
-
<span class="cline-any cline-
|
|
860
|
-
<span class="cline-any cline-
|
|
856
|
+
<span class="cline-any cline-yes">3x</span>
|
|
857
|
+
<span class="cline-any cline-yes">2x</span>
|
|
861
858
|
<span class="cline-any cline-neutral"> </span>
|
|
862
859
|
<span class="cline-any cline-neutral"> </span>
|
|
863
|
-
<span class="cline-any cline-
|
|
864
|
-
<span class="cline-any cline-
|
|
860
|
+
<span class="cline-any cline-yes">3x</span>
|
|
861
|
+
<span class="cline-any cline-yes">2x</span>
|
|
865
862
|
<span class="cline-any cline-neutral"> </span>
|
|
866
863
|
<span class="cline-any cline-neutral"> </span>
|
|
867
|
-
<span class="cline-any cline-
|
|
864
|
+
<span class="cline-any cline-yes">3x</span>
|
|
868
865
|
<span class="cline-any cline-neutral"> </span>
|
|
869
866
|
<span class="cline-any cline-neutral"> </span>
|
|
870
867
|
<span class="cline-any cline-neutral"> </span>
|
|
871
|
-
<span class="cline-any cline-
|
|
872
|
-
<span class="cline-any cline-
|
|
868
|
+
<span class="cline-any cline-yes">21x</span>
|
|
869
|
+
<span class="cline-any cline-yes">1x</span>
|
|
873
870
|
<span class="cline-any cline-neutral"> </span>
|
|
874
|
-
<span class="cline-any cline-
|
|
871
|
+
<span class="cline-any cline-yes">21x</span>
|
|
875
872
|
<span class="cline-any cline-neutral"> </span>
|
|
876
|
-
<span class="cline-any cline-
|
|
873
|
+
<span class="cline-any cline-yes">42x</span>
|
|
877
874
|
<span class="cline-any cline-neutral"> </span>
|
|
878
875
|
<span class="cline-any cline-neutral"> </span>
|
|
879
876
|
<span class="cline-any cline-neutral"> </span>
|
|
880
877
|
<span class="cline-any cline-neutral"> </span>
|
|
881
878
|
<span class="cline-any cline-neutral"> </span>
|
|
882
|
-
<span class="cline-any cline-
|
|
883
|
-
<span class="cline-any cline-
|
|
879
|
+
<span class="cline-any cline-yes">21x</span>
|
|
880
|
+
<span class="cline-any cline-yes">19x</span>
|
|
884
881
|
<span class="cline-any cline-neutral"> </span>
|
|
885
882
|
<span class="cline-any cline-neutral"> </span>
|
|
886
|
-
<span class="cline-any cline-
|
|
887
|
-
<span class="cline-any cline-
|
|
888
|
-
<span class="cline-any cline-
|
|
883
|
+
<span class="cline-any cline-yes">2x</span>
|
|
884
|
+
<span class="cline-any cline-yes">2x</span>
|
|
885
|
+
<span class="cline-any cline-yes">2x</span>
|
|
889
886
|
<span class="cline-any cline-neutral"> </span>
|
|
890
887
|
<span class="cline-any cline-neutral"> </span>
|
|
891
|
-
<span class="cline-any cline-
|
|
892
|
-
<span class="cline-any cline-
|
|
888
|
+
<span class="cline-any cline-yes">2x</span>
|
|
889
|
+
<span class="cline-any cline-yes">1x</span>
|
|
893
890
|
<span class="cline-any cline-neutral"> </span>
|
|
894
891
|
<span class="cline-any cline-neutral"> </span>
|
|
895
|
-
<span class="cline-any cline-
|
|
892
|
+
<span class="cline-any cline-yes">2x</span>
|
|
896
893
|
<span class="cline-any cline-neutral"> </span>
|
|
897
894
|
<span class="cline-any cline-neutral"> </span>
|
|
898
895
|
<span class="cline-any cline-neutral"> </span>
|
|
899
|
-
<span class="cline-any cline-
|
|
896
|
+
<span class="cline-any cline-yes">21x</span>
|
|
900
897
|
<span class="cline-any cline-neutral"> </span>
|
|
901
898
|
<span class="cline-any cline-neutral"> </span>
|
|
902
899
|
<span class="cline-any cline-neutral"> </span>
|
|
903
900
|
<span class="cline-any cline-neutral"> </span>
|
|
904
|
-
<span class="cline-any cline-
|
|
901
|
+
<span class="cline-any cline-yes">21x</span>
|
|
905
902
|
<span class="cline-any cline-neutral"> </span>
|
|
906
903
|
<span class="cline-any cline-neutral"> </span>
|
|
907
904
|
<span class="cline-any cline-no"> </span>
|
|
908
905
|
<span class="cline-any cline-neutral"> </span>
|
|
909
906
|
<span class="cline-any cline-neutral"> </span>
|
|
910
|
-
<span class="cline-any cline-
|
|
907
|
+
<span class="cline-any cline-yes">21x</span>
|
|
911
908
|
<span class="cline-any cline-no"> </span>
|
|
912
909
|
<span class="cline-any cline-neutral"> </span>
|
|
913
910
|
<span class="cline-any cline-neutral"> </span>
|
|
914
911
|
<span class="cline-any cline-neutral"> </span>
|
|
915
|
-
<span class="cline-any cline-
|
|
916
|
-
<span class="cline-any cline-
|
|
912
|
+
<span class="cline-any cline-yes">22x</span>
|
|
913
|
+
<span class="cline-any cline-yes">22x</span>
|
|
917
914
|
<span class="cline-any cline-neutral"> </span>
|
|
918
915
|
<span class="cline-any cline-neutral"> </span>
|
|
919
916
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -925,30 +922,30 @@
|
|
|
925
922
|
<span class="cline-any cline-neutral"> </span>
|
|
926
923
|
<span class="cline-any cline-neutral"> </span>
|
|
927
924
|
<span class="cline-any cline-neutral"> </span>
|
|
928
|
-
<span class="cline-any cline-
|
|
925
|
+
<span class="cline-any cline-yes">21x</span>
|
|
929
926
|
<span class="cline-any cline-neutral"> </span>
|
|
930
927
|
<span class="cline-any cline-neutral"> </span>
|
|
931
|
-
<span class="cline-any cline-
|
|
928
|
+
<span class="cline-any cline-yes">125x</span>
|
|
932
929
|
<span class="cline-any cline-neutral"> </span>
|
|
933
|
-
<span class="cline-any cline-
|
|
934
|
-
<span class="cline-any cline-
|
|
930
|
+
<span class="cline-any cline-yes">21x</span>
|
|
931
|
+
<span class="cline-any cline-yes">21x</span>
|
|
935
932
|
<span class="cline-any cline-neutral"> </span>
|
|
933
|
+
<span class="cline-any cline-yes">21x</span>
|
|
936
934
|
<span class="cline-any cline-no"> </span>
|
|
935
|
+
<span class="cline-any cline-yes">21x</span>
|
|
937
936
|
<span class="cline-any cline-no"> </span>
|
|
938
|
-
<span class="cline-any cline-
|
|
939
|
-
<span class="cline-any cline-
|
|
940
|
-
<span class="cline-any cline-no"> </span>
|
|
941
|
-
<span class="cline-any cline-no"> </span>
|
|
937
|
+
<span class="cline-any cline-yes">21x</span>
|
|
938
|
+
<span class="cline-any cline-yes">1x</span>
|
|
942
939
|
<span class="cline-any cline-neutral"> </span>
|
|
943
940
|
<span class="cline-any cline-neutral"> </span>
|
|
944
|
-
<span class="cline-any cline-
|
|
941
|
+
<span class="cline-any cline-yes">21x</span>
|
|
945
942
|
<span class="cline-any cline-neutral"> </span>
|
|
946
|
-
<span class="cline-any cline-
|
|
947
|
-
<span class="cline-any cline-
|
|
943
|
+
<span class="cline-any cline-yes">21x</span>
|
|
944
|
+
<span class="cline-any cline-yes">21x</span>
|
|
948
945
|
<span class="cline-any cline-neutral"> </span>
|
|
949
|
-
<span class="cline-any cline-
|
|
950
|
-
<span class="cline-any cline-
|
|
951
|
-
<span class="cline-any cline-
|
|
946
|
+
<span class="cline-any cline-yes">21x</span>
|
|
947
|
+
<span class="cline-any cline-yes">20x</span>
|
|
948
|
+
<span class="cline-any cline-yes">20x</span>
|
|
952
949
|
<span class="cline-any cline-neutral"> </span>
|
|
953
950
|
<span class="cline-any cline-neutral"> </span>
|
|
954
951
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -956,19 +953,19 @@
|
|
|
956
953
|
<span class="cline-any cline-neutral"> </span>
|
|
957
954
|
<span class="cline-any cline-neutral"> </span>
|
|
958
955
|
<span class="cline-any cline-neutral"> </span>
|
|
959
|
-
<span class="cline-any cline-
|
|
956
|
+
<span class="cline-any cline-yes">60x</span>
|
|
960
957
|
<span class="cline-any cline-neutral"> </span>
|
|
961
958
|
<span class="cline-any cline-neutral"> </span>
|
|
962
959
|
<span class="cline-any cline-neutral"> </span>
|
|
963
|
-
<span class="cline-any cline-
|
|
964
|
-
<span class="cline-any cline-
|
|
960
|
+
<span class="cline-any cline-yes">20x</span>
|
|
961
|
+
<span class="cline-any cline-yes">20x</span>
|
|
965
962
|
<span class="cline-any cline-neutral"> </span>
|
|
966
963
|
<span class="cline-any cline-neutral"> </span>
|
|
967
|
-
<span class="cline-any cline-
|
|
964
|
+
<span class="cline-any cline-yes">1x</span>
|
|
968
965
|
<span class="cline-any cline-no"> </span>
|
|
969
966
|
<span class="cline-any cline-neutral"> </span>
|
|
970
967
|
<span class="cline-any cline-neutral"> </span>
|
|
971
|
-
<span class="cline-any cline-
|
|
968
|
+
<span class="cline-any cline-yes">21x</span>
|
|
972
969
|
<span class="cline-any cline-neutral"> </span>
|
|
973
970
|
<span class="cline-any cline-neutral"> </span>
|
|
974
971
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -981,10 +978,10 @@
|
|
|
981
978
|
<span class="cline-any cline-neutral"> </span>
|
|
982
979
|
<span class="cline-any cline-neutral"> </span>
|
|
983
980
|
<span class="cline-any cline-neutral"> </span>
|
|
984
|
-
<span class="cline-any cline-
|
|
985
|
-
<span class="cline-any cline-
|
|
981
|
+
<span class="cline-any cline-yes">8x</span>
|
|
982
|
+
<span class="cline-any cline-yes">8x</span>
|
|
986
983
|
<span class="cline-any cline-neutral"> </span>
|
|
987
|
-
<span class="cline-any cline-
|
|
984
|
+
<span class="cline-any cline-yes">8x</span>
|
|
988
985
|
<span class="cline-any cline-neutral"> </span>
|
|
989
986
|
<span class="cline-any cline-neutral"> </span>
|
|
990
987
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -997,38 +994,38 @@
|
|
|
997
994
|
<span class="cline-any cline-neutral"> </span>
|
|
998
995
|
<span class="cline-any cline-neutral"> </span>
|
|
999
996
|
<span class="cline-any cline-neutral"> </span>
|
|
1000
|
-
<span class="cline-any cline-
|
|
997
|
+
<span class="cline-any cline-yes">8x</span>
|
|
1001
998
|
<span class="cline-any cline-neutral"> </span>
|
|
1002
|
-
<span class="cline-any cline-
|
|
1003
|
-
<span class="cline-any cline-
|
|
999
|
+
<span class="cline-any cline-yes">8x</span>
|
|
1000
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1004
1001
|
<span class="cline-any cline-neutral"> </span>
|
|
1005
1002
|
<span class="cline-any cline-neutral"> </span>
|
|
1006
|
-
<span class="cline-any cline-
|
|
1007
|
-
<span class="cline-any cline-
|
|
1003
|
+
<span class="cline-any cline-yes">7x</span>
|
|
1004
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1008
1005
|
<span class="cline-any cline-neutral"> </span>
|
|
1009
1006
|
<span class="cline-any cline-neutral"> </span>
|
|
1010
1007
|
<span class="cline-any cline-neutral"> </span>
|
|
1011
|
-
<span class="cline-any cline-
|
|
1012
|
-
<span class="cline-any cline-
|
|
1008
|
+
<span class="cline-any cline-yes">6x</span>
|
|
1009
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1013
1010
|
<span class="cline-any cline-neutral"> </span>
|
|
1014
|
-
<span class="cline-any cline-
|
|
1011
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1015
1012
|
<span class="cline-any cline-neutral"> </span>
|
|
1016
1013
|
<span class="cline-any cline-neutral"> </span>
|
|
1017
|
-
<span class="cline-any cline-
|
|
1014
|
+
<span class="cline-any cline-yes">6x</span>
|
|
1018
1015
|
<span class="cline-any cline-neutral"> </span>
|
|
1019
|
-
<span class="cline-any cline-
|
|
1020
|
-
<span class="cline-any cline-
|
|
1016
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1017
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1021
1018
|
<span class="cline-any cline-neutral"> </span>
|
|
1022
|
-
<span class="cline-any cline-
|
|
1023
|
-
<span class="cline-any cline-
|
|
1019
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1020
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1024
1021
|
<span class="cline-any cline-neutral"> </span>
|
|
1025
|
-
<span class="cline-any cline-
|
|
1026
|
-
<span class="cline-any cline-
|
|
1022
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1023
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1027
1024
|
<span class="cline-any cline-neutral"> </span>
|
|
1028
|
-
<span class="cline-any cline-
|
|
1025
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1029
1026
|
<span class="cline-any cline-neutral"> </span>
|
|
1030
1027
|
<span class="cline-any cline-neutral"> </span>
|
|
1031
|
-
<span class="cline-any cline-
|
|
1028
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1032
1029
|
<span class="cline-any cline-neutral"> </span>
|
|
1033
1030
|
<span class="cline-any cline-neutral"> </span>
|
|
1034
1031
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1038,28 +1035,28 @@
|
|
|
1038
1035
|
<span class="cline-any cline-neutral"> </span>
|
|
1039
1036
|
<span class="cline-any cline-neutral"> </span>
|
|
1040
1037
|
<span class="cline-any cline-neutral"> </span>
|
|
1041
|
-
<span class="cline-any cline-
|
|
1038
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1042
1039
|
<span class="cline-any cline-neutral"> </span>
|
|
1043
1040
|
<span class="cline-any cline-neutral"> </span>
|
|
1044
|
-
<span class="cline-any cline-
|
|
1041
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1045
1042
|
<span class="cline-any cline-neutral"> </span>
|
|
1046
|
-
<span class="cline-any cline-
|
|
1047
|
-
<span class="cline-any cline-
|
|
1048
|
-
<span class="cline-any cline-
|
|
1049
|
-
<span class="cline-any cline-
|
|
1050
|
-
<span class="cline-any cline-
|
|
1043
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1044
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1045
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1046
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1047
|
+
<span class="cline-any cline-yes">3x</span>
|
|
1051
1048
|
<span class="cline-any cline-neutral"> </span>
|
|
1052
1049
|
<span class="cline-any cline-neutral"> </span>
|
|
1053
|
-
<span class="cline-any cline-
|
|
1054
|
-
<span class="cline-any cline-
|
|
1050
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1051
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1055
1052
|
<span class="cline-any cline-no"> </span>
|
|
1056
1053
|
<span class="cline-any cline-neutral"> </span>
|
|
1057
1054
|
<span class="cline-any cline-neutral"> </span>
|
|
1058
|
-
<span class="cline-any cline-
|
|
1059
|
-
<span class="cline-any cline-
|
|
1055
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1056
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1060
1057
|
<span class="cline-any cline-neutral"> </span>
|
|
1061
|
-
<span class="cline-any cline-
|
|
1062
|
-
<span class="cline-any cline-
|
|
1058
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1059
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1063
1060
|
<span class="cline-any cline-neutral"> </span>
|
|
1064
1061
|
<span class="cline-any cline-no"> </span>
|
|
1065
1062
|
<span class="cline-any cline-no"> </span>
|
|
@@ -1076,20 +1073,20 @@
|
|
|
1076
1073
|
<span class="cline-any cline-no"> </span>
|
|
1077
1074
|
<span class="cline-any cline-no"> </span>
|
|
1078
1075
|
<span class="cline-any cline-neutral"> </span>
|
|
1079
|
-
<span class="cline-any cline-
|
|
1080
|
-
<span class="cline-any cline-
|
|
1081
|
-
<span class="cline-any cline-
|
|
1082
|
-
<span class="cline-any cline-
|
|
1076
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1077
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1078
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1079
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1083
1080
|
<span class="cline-any cline-neutral"> </span>
|
|
1084
1081
|
<span class="cline-any cline-neutral"> </span>
|
|
1085
|
-
<span class="cline-any cline-
|
|
1086
|
-
<span class="cline-any cline-
|
|
1082
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1083
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1087
1084
|
<span class="cline-any cline-neutral"> </span>
|
|
1088
1085
|
<span class="cline-any cline-neutral"> </span>
|
|
1089
1086
|
<span class="cline-any cline-neutral"> </span>
|
|
1090
1087
|
<span class="cline-any cline-neutral"> </span>
|
|
1091
|
-
<span class="cline-any cline-
|
|
1092
|
-
<span class="cline-any cline-
|
|
1088
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1089
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1093
1090
|
<span class="cline-any cline-neutral"> </span>
|
|
1094
1091
|
<span class="cline-any cline-neutral"> </span>
|
|
1095
1092
|
<span class="cline-any cline-no"> </span>
|
|
@@ -1098,31 +1095,31 @@
|
|
|
1098
1095
|
<span class="cline-any cline-neutral"> </span>
|
|
1099
1096
|
<span class="cline-any cline-neutral"> </span>
|
|
1100
1097
|
<span class="cline-any cline-neutral"> </span>
|
|
1101
|
-
<span class="cline-any cline-
|
|
1098
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1102
1099
|
<span class="cline-any cline-neutral"> </span>
|
|
1103
|
-
<span class="cline-any cline-
|
|
1104
|
-
<span class="cline-any cline-
|
|
1100
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1101
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1105
1102
|
<span class="cline-any cline-neutral"> </span>
|
|
1106
|
-
<span class="cline-any cline-
|
|
1107
|
-
<span class="cline-any cline-
|
|
1103
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1104
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1108
1105
|
<span class="cline-any cline-neutral"> </span>
|
|
1109
|
-
<span class="cline-any cline-
|
|
1110
|
-
<span class="cline-any cline-
|
|
1106
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1107
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1111
1108
|
<span class="cline-any cline-neutral"> </span>
|
|
1112
1109
|
<span class="cline-any cline-neutral"> </span>
|
|
1113
|
-
<span class="cline-any cline-
|
|
1114
|
-
<span class="cline-any cline-
|
|
1110
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1111
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1115
1112
|
<span class="cline-any cline-neutral"> </span>
|
|
1116
1113
|
<span class="cline-any cline-neutral"> </span>
|
|
1117
|
-
<span class="cline-any cline-
|
|
1118
|
-
<span class="cline-any cline-
|
|
1114
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1115
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1119
1116
|
<span class="cline-any cline-neutral"> </span>
|
|
1120
1117
|
<span class="cline-any cline-neutral"> </span>
|
|
1121
|
-
<span class="cline-any cline-
|
|
1118
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1122
1119
|
<span class="cline-any cline-no"> </span>
|
|
1123
1120
|
<span class="cline-any cline-neutral"> </span>
|
|
1124
1121
|
<span class="cline-any cline-neutral"> </span>
|
|
1125
|
-
<span class="cline-any cline-
|
|
1122
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1126
1123
|
<span class="cline-any cline-neutral"> </span>
|
|
1127
1124
|
<span class="cline-any cline-no"> </span>
|
|
1128
1125
|
<span class="cline-any cline-no"> </span>
|
|
@@ -1133,8 +1130,8 @@
|
|
|
1133
1130
|
<span class="cline-any cline-no"> </span>
|
|
1134
1131
|
<span class="cline-any cline-no"> </span>
|
|
1135
1132
|
<span class="cline-any cline-neutral"> </span>
|
|
1136
|
-
<span class="cline-any cline-
|
|
1137
|
-
<span class="cline-any cline-
|
|
1133
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1134
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1138
1135
|
<span class="cline-any cline-neutral"> </span>
|
|
1139
1136
|
<span class="cline-any cline-no"> </span>
|
|
1140
1137
|
<span class="cline-any cline-no"> </span>
|
|
@@ -1143,12 +1140,12 @@
|
|
|
1143
1140
|
<span class="cline-any cline-no"> </span>
|
|
1144
1141
|
<span class="cline-any cline-neutral"> </span>
|
|
1145
1142
|
<span class="cline-any cline-neutral"> </span>
|
|
1146
|
-
<span class="cline-any cline-
|
|
1147
|
-
<span class="cline-any cline-
|
|
1148
|
-
<span class="cline-any cline-
|
|
1143
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1144
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1145
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1149
1146
|
<span class="cline-any cline-neutral"> </span>
|
|
1150
1147
|
<span class="cline-any cline-neutral"> </span>
|
|
1151
|
-
<span class="cline-any cline-
|
|
1148
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1152
1149
|
<span class="cline-any cline-neutral"> </span>
|
|
1153
1150
|
<span class="cline-any cline-neutral"> </span>
|
|
1154
1151
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1156,7 +1153,7 @@
|
|
|
1156
1153
|
<span class="cline-any cline-neutral"> </span>
|
|
1157
1154
|
<span class="cline-any cline-neutral"> </span>
|
|
1158
1155
|
<span class="cline-any cline-neutral"> </span>
|
|
1159
|
-
<span class="cline-any cline-
|
|
1156
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1160
1157
|
<span class="cline-any cline-neutral"> </span>
|
|
1161
1158
|
<span class="cline-any cline-neutral"> </span>
|
|
1162
1159
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1164,31 +1161,31 @@
|
|
|
1164
1161
|
<span class="cline-any cline-neutral"> </span>
|
|
1165
1162
|
<span class="cline-any cline-neutral"> </span>
|
|
1166
1163
|
<span class="cline-any cline-neutral"> </span>
|
|
1167
|
-
<span class="cline-any cline-
|
|
1168
|
-
<span class="cline-any cline-
|
|
1169
|
-
<span class="cline-any cline-
|
|
1164
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1165
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1166
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1170
1167
|
<span class="cline-any cline-neutral"> </span>
|
|
1171
1168
|
<span class="cline-any cline-neutral"> </span>
|
|
1172
1169
|
<span class="cline-any cline-neutral"> </span>
|
|
1173
1170
|
<span class="cline-any cline-neutral"> </span>
|
|
1174
1171
|
<span class="cline-any cline-neutral"> </span>
|
|
1175
|
-
<span class="cline-any cline-
|
|
1176
|
-
<span class="cline-any cline-
|
|
1177
|
-
<span class="cline-any cline-
|
|
1178
|
-
<span class="cline-any cline-
|
|
1179
|
-
<span class="cline-any cline-
|
|
1180
|
-
<span class="cline-any cline-
|
|
1172
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1173
|
+
<span class="cline-any cline-yes">8x</span>
|
|
1174
|
+
<span class="cline-any cline-yes">8x</span>
|
|
1175
|
+
<span class="cline-any cline-yes">7x</span>
|
|
1176
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1177
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1181
1178
|
<span class="cline-any cline-neutral"> </span>
|
|
1182
|
-
<span class="cline-any cline-
|
|
1183
|
-
<span class="cline-any cline-
|
|
1179
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1180
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1184
1181
|
<span class="cline-any cline-neutral"> </span>
|
|
1185
1182
|
<span class="cline-any cline-neutral"> </span>
|
|
1186
|
-
<span class="cline-any cline-
|
|
1183
|
+
<span class="cline-any cline-yes">3x</span>
|
|
1187
1184
|
<span class="cline-any cline-neutral"> </span>
|
|
1188
1185
|
<span class="cline-any cline-neutral"> </span>
|
|
1189
1186
|
<span class="cline-any cline-neutral"> </span>
|
|
1190
|
-
<span class="cline-any cline-
|
|
1191
|
-
<span class="cline-any cline-
|
|
1187
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1188
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1192
1189
|
<span class="cline-any cline-neutral"> </span>
|
|
1193
1190
|
<span class="cline-any cline-neutral"> </span>
|
|
1194
1191
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1196,24 +1193,24 @@
|
|
|
1196
1193
|
<span class="cline-any cline-neutral"> </span>
|
|
1197
1194
|
<span class="cline-any cline-neutral"> </span>
|
|
1198
1195
|
<span class="cline-any cline-neutral"> </span>
|
|
1199
|
-
<span class="cline-any cline-
|
|
1196
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1200
1197
|
<span class="cline-any cline-neutral"> </span>
|
|
1201
1198
|
<span class="cline-any cline-neutral"> </span>
|
|
1202
1199
|
<span class="cline-any cline-neutral"> </span>
|
|
1203
|
-
<span class="cline-any cline-
|
|
1204
|
-
<span class="cline-any cline-
|
|
1205
|
-
<span class="cline-any cline-
|
|
1206
|
-
<span class="cline-any cline-
|
|
1207
|
-
<span class="cline-any cline-
|
|
1200
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1201
|
+
<span class="cline-any cline-yes">3x</span>
|
|
1202
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1203
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1204
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1208
1205
|
<span class="cline-any cline-neutral"> </span>
|
|
1209
|
-
<span class="cline-any cline-
|
|
1210
|
-
<span class="cline-any cline-
|
|
1211
|
-
<span class="cline-any cline-
|
|
1206
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1207
|
+
<span class="cline-any cline-yes">3x</span>
|
|
1208
|
+
<span class="cline-any cline-yes">3x</span>
|
|
1212
1209
|
<span class="cline-any cline-neutral"> </span>
|
|
1213
|
-
<span class="cline-any cline-
|
|
1214
|
-
<span class="cline-any cline-
|
|
1210
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1211
|
+
<span class="cline-any cline-yes">3x</span>
|
|
1215
1212
|
<span class="cline-any cline-neutral"> </span>
|
|
1216
|
-
<span class="cline-any cline-
|
|
1213
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1217
1214
|
<span class="cline-any cline-neutral"> </span>
|
|
1218
1215
|
<span class="cline-any cline-neutral"> </span>
|
|
1219
1216
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1221,14 +1218,14 @@
|
|
|
1221
1218
|
<span class="cline-any cline-neutral"> </span>
|
|
1222
1219
|
<span class="cline-any cline-neutral"> </span>
|
|
1223
1220
|
<span class="cline-any cline-neutral"> </span>
|
|
1224
|
-
<span class="cline-any cline-
|
|
1221
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1225
1222
|
<span class="cline-any cline-neutral"> </span>
|
|
1226
|
-
<span class="cline-any cline-
|
|
1227
|
-
<span class="cline-any cline-
|
|
1223
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1224
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1228
1225
|
<span class="cline-any cline-neutral"> </span>
|
|
1229
|
-
<span class="cline-any cline-
|
|
1226
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1230
1227
|
<span class="cline-any cline-neutral"> </span>
|
|
1231
|
-
<span class="cline-any cline-
|
|
1228
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1232
1229
|
<span class="cline-any cline-neutral"> </span>
|
|
1233
1230
|
<span class="cline-any cline-neutral"> </span>
|
|
1234
1231
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1242,7 +1239,7 @@
|
|
|
1242
1239
|
<span class="cline-any cline-neutral"> </span>
|
|
1243
1240
|
<span class="cline-any cline-neutral"> </span>
|
|
1244
1241
|
<span class="cline-any cline-neutral"> </span>
|
|
1245
|
-
<span class="cline-any cline-
|
|
1242
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1246
1243
|
<span class="cline-any cline-neutral"> </span>
|
|
1247
1244
|
<span class="cline-any cline-neutral"> </span>
|
|
1248
1245
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1250,13 +1247,11 @@
|
|
|
1250
1247
|
<span class="cline-any cline-neutral"> </span>
|
|
1251
1248
|
<span class="cline-any cline-neutral"> </span>
|
|
1252
1249
|
<span class="cline-any cline-neutral"> </span>
|
|
1253
|
-
<span class="cline-any cline-
|
|
1254
|
-
<span class="cline-any cline-no"> </span>
|
|
1255
|
-
<span class="cline-any cline-no"> </span>
|
|
1250
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1256
1251
|
<span class="cline-any cline-neutral"> </span>
|
|
1257
|
-
<span class="cline-any cline-
|
|
1252
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1258
1253
|
<span class="cline-any cline-neutral"> </span>
|
|
1259
|
-
<span class="cline-any cline-
|
|
1254
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1260
1255
|
<span class="cline-any cline-neutral"> </span>
|
|
1261
1256
|
<span class="cline-any cline-neutral"> </span>
|
|
1262
1257
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1283,69 +1278,68 @@
|
|
|
1283
1278
|
<span class="cline-any cline-neutral"> </span>
|
|
1284
1279
|
<span class="cline-any cline-neutral"> </span>
|
|
1285
1280
|
<span class="cline-any cline-neutral"> </span>
|
|
1286
|
-
<span class="cline-any cline-
|
|
1287
|
-
<span class="cline-any cline-neutral"> </span>
|
|
1288
|
-
<span class="cline-any cline-no"> </span>
|
|
1289
|
-
<span class="cline-any cline-no"> </span>
|
|
1281
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1290
1282
|
<span class="cline-any cline-neutral"> </span>
|
|
1283
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1284
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1291
1285
|
<span class="cline-any cline-neutral"> </span>
|
|
1292
|
-
<span class="cline-any cline-no"> </span>
|
|
1293
|
-
<span class="cline-any cline-no"> </span>
|
|
1294
1286
|
<span class="cline-any cline-neutral"> </span>
|
|
1287
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1288
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1295
1289
|
<span class="cline-any cline-neutral"> </span>
|
|
1296
|
-
<span class="cline-any cline-no"> </span>
|
|
1297
|
-
<span class="cline-any cline-no"> </span>
|
|
1298
|
-
<span class="cline-any cline-no"> </span>
|
|
1299
|
-
<span class="cline-any cline-no"> </span>
|
|
1300
1290
|
<span class="cline-any cline-neutral"> </span>
|
|
1291
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1292
|
+
<span class="cline-any cline-yes">3x</span>
|
|
1293
|
+
<span class="cline-any cline-yes">3x</span>
|
|
1294
|
+
<span class="cline-any cline-yes">3x</span>
|
|
1301
1295
|
<span class="cline-any cline-neutral"> </span>
|
|
1302
|
-
<span class="cline-any cline-no"> </span>
|
|
1303
|
-
<span class="cline-any cline-no"> </span>
|
|
1304
1296
|
<span class="cline-any cline-neutral"> </span>
|
|
1297
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1298
|
+
<span class="cline-any cline-yes">3x</span>
|
|
1305
1299
|
<span class="cline-any cline-neutral"> </span>
|
|
1306
|
-
<span class="cline-any cline-no"> </span>
|
|
1307
|
-
<span class="cline-any cline-no"> </span>
|
|
1308
1300
|
<span class="cline-any cline-neutral"> </span>
|
|
1301
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1302
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1309
1303
|
<span class="cline-any cline-neutral"> </span>
|
|
1310
|
-
<span class="cline-any cline-no"> </span>
|
|
1311
|
-
<span class="cline-any cline-no"> </span>
|
|
1312
1304
|
<span class="cline-any cline-neutral"> </span>
|
|
1313
|
-
<span class="cline-any cline-
|
|
1314
|
-
<span class="cline-any cline-
|
|
1315
|
-
<span class="cline-any cline-no"> </span>
|
|
1305
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1306
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1316
1307
|
<span class="cline-any cline-neutral"> </span>
|
|
1317
|
-
<span class="cline-any cline-
|
|
1318
|
-
<span class="cline-any cline-
|
|
1308
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1309
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1310
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1319
1311
|
<span class="cline-any cline-neutral"> </span>
|
|
1320
|
-
<span class="cline-any cline-
|
|
1321
|
-
<span class="cline-any cline-
|
|
1312
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1313
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1322
1314
|
<span class="cline-any cline-neutral"> </span>
|
|
1315
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1316
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1323
1317
|
<span class="cline-any cline-neutral"> </span>
|
|
1324
1318
|
<span class="cline-any cline-neutral"> </span>
|
|
1325
1319
|
<span class="cline-any cline-neutral"> </span>
|
|
1326
|
-
<span class="cline-any cline-no"> </span>
|
|
1327
|
-
<span class="cline-any cline-no"> </span>
|
|
1328
1320
|
<span class="cline-any cline-neutral"> </span>
|
|
1329
|
-
<span class="cline-any cline-
|
|
1330
|
-
<span class="cline-any cline-
|
|
1321
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1322
|
+
<span class="cline-any cline-yes">3x</span>
|
|
1331
1323
|
<span class="cline-any cline-neutral"> </span>
|
|
1332
|
-
<span class="cline-any cline-
|
|
1333
|
-
<span class="cline-any cline-
|
|
1324
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1325
|
+
<span class="cline-any cline-yes">3x</span>
|
|
1334
1326
|
<span class="cline-any cline-neutral"> </span>
|
|
1327
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1328
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1335
1329
|
<span class="cline-any cline-neutral"> </span>
|
|
1336
|
-
<span class="cline-any cline-no"> </span>
|
|
1337
1330
|
<span class="cline-any cline-neutral"> </span>
|
|
1338
|
-
<span class="cline-any cline-
|
|
1339
|
-
<span class="cline-any cline-no"> </span>
|
|
1331
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1340
1332
|
<span class="cline-any cline-neutral"> </span>
|
|
1333
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1334
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1341
1335
|
<span class="cline-any cline-neutral"> </span>
|
|
1342
1336
|
<span class="cline-any cline-neutral"> </span>
|
|
1343
1337
|
<span class="cline-any cline-neutral"> </span>
|
|
1344
1338
|
<span class="cline-any cline-neutral"> </span>
|
|
1345
1339
|
<span class="cline-any cline-neutral"> </span>
|
|
1346
1340
|
<span class="cline-any cline-neutral"> </span>
|
|
1347
|
-
<span class="cline-any cline-no"> </span>
|
|
1348
1341
|
<span class="cline-any cline-neutral"> </span>
|
|
1342
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1349
1343
|
<span class="cline-any cline-neutral"> </span>
|
|
1350
1344
|
<span class="cline-any cline-neutral"> </span>
|
|
1351
1345
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1354,12 +1348,12 @@
|
|
|
1354
1348
|
<span class="cline-any cline-neutral"> </span>
|
|
1355
1349
|
<span class="cline-any cline-neutral"> </span>
|
|
1356
1350
|
<span class="cline-any cline-neutral"> </span>
|
|
1357
|
-
<span class="cline-any cline-no"> </span>
|
|
1358
|
-
<span class="cline-any cline-no"> </span>
|
|
1359
|
-
<span class="cline-any cline-no"> </span>
|
|
1360
1351
|
<span class="cline-any cline-neutral"> </span>
|
|
1361
|
-
<span class="cline-any cline-
|
|
1352
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1353
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1354
|
+
<span class="cline-any cline-yes">2x</span>
|
|
1362
1355
|
<span class="cline-any cline-neutral"> </span>
|
|
1356
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1363
1357
|
<span class="cline-any cline-neutral"> </span>
|
|
1364
1358
|
<span class="cline-any cline-neutral"> </span></td><td class="text"><pre class="prettyprint lang-js">import _ from "lodash";
|
|
1365
1359
|
import File from "./File";
|
|
@@ -1372,29 +1366,29 @@ import { clone, keys, flatten, filter, values } from "ramda";
|
|
|
1372
1366
|
* @type {[type]}
|
|
1373
1367
|
*/
|
|
1374
1368
|
export default class Ingest extends Model {
|
|
1375
|
-
|
|
1376
|
-
|
|
1377
|
-
|
|
1369
|
+
constructor(data) {
|
|
1370
|
+
super(data);
|
|
1371
|
+
this._resource = "ingests";
|
|
1378
1372
|
}
|
|
1379
1373
|
<span class="fstat-no" title="function not covered" > st</span>atic get _resource() {
|
|
1380
|
-
<span class="cstat-no" title="statement not covered" > return
|
|
1374
|
+
<span class="cstat-no" title="statement not covered" > return "ingests";</span>
|
|
1381
1375
|
}
|
|
1382
1376
|
/**
|
|
1383
1377
|
* Returns path given an ingest record
|
|
1384
1378
|
*
|
|
1385
1379
|
*/
|
|
1386
|
-
|
|
1387
|
-
let ingest =
|
|
1388
|
-
<span class="
|
|
1380
|
+
renderPath() {
|
|
1381
|
+
let ingest = this.data();
|
|
1382
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (!ingest.asset.project.studio.slug) {
|
|
1389
1383
|
<span class="cstat-no" title="statement not covered" > throw new Error("missing studio slug");</span>
|
|
1390
1384
|
}
|
|
1391
|
-
<span class="
|
|
1385
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (!ingest.asset.project.slug) {
|
|
1392
1386
|
<span class="cstat-no" title="statement not covered" > throw new Error("missing asset.project.slug");</span>
|
|
1393
1387
|
}
|
|
1394
|
-
<span class="
|
|
1388
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (!ingest.asset.project.slug) {
|
|
1395
1389
|
<span class="cstat-no" title="statement not covered" > throw new Error("missing asset.project.slug");</span>
|
|
1396
1390
|
}
|
|
1397
|
-
|
|
1391
|
+
return [
|
|
1398
1392
|
ingest.asset.project.studio.slug,
|
|
1399
1393
|
ingest.asset.project.slug,
|
|
1400
1394
|
ingest.asset.type
|
|
@@ -1405,28 +1399,28 @@ export default class Ingest extends Model {
|
|
|
1405
1399
|
*
|
|
1406
1400
|
* @param {object} params
|
|
1407
1401
|
*/
|
|
1408
|
-
|
|
1409
|
-
let asset =
|
|
1410
|
-
let options =
|
|
1411
|
-
let mediaType =
|
|
1402
|
+
renderFilename({ allTags, allTypes, order } = (<span class="branch-0 cbranch-no" title="branch not covered" >params = {})</span>) {
|
|
1403
|
+
let asset = this.data().asset;
|
|
1404
|
+
let options = this.data().selected.download;
|
|
1405
|
+
let mediaType = this.data().asset.mediaType;
|
|
1412
1406
|
|
|
1413
|
-
|
|
1414
|
-
|
|
1407
|
+
if (!asset.project) {
|
|
1408
|
+
throw new Error("missing asset.project");
|
|
1415
1409
|
}
|
|
1416
1410
|
|
|
1417
|
-
|
|
1418
|
-
|
|
1411
|
+
if (asset.project && !asset.project.filePrefix) {
|
|
1412
|
+
throw new Error("missing asset.project.filePrefix");
|
|
1419
1413
|
}
|
|
1420
1414
|
|
|
1421
|
-
|
|
1422
|
-
|
|
1415
|
+
if (!asset.name) {
|
|
1416
|
+
throw new Error("missing asset.name");
|
|
1423
1417
|
}
|
|
1424
1418
|
|
|
1425
|
-
|
|
1426
|
-
|
|
1419
|
+
if (!asset.type) {
|
|
1420
|
+
throw new Error("missing asset.type");
|
|
1427
1421
|
}
|
|
1428
1422
|
|
|
1429
|
-
let defaults =
|
|
1423
|
+
let defaults = {
|
|
1430
1424
|
language: null,
|
|
1431
1425
|
country: null,
|
|
1432
1426
|
version: null,
|
|
@@ -1445,134 +1439,134 @@ export default class Ingest extends Model {
|
|
|
1445
1439
|
Extra: []
|
|
1446
1440
|
}
|
|
1447
1441
|
};
|
|
1448
|
-
|
|
1442
|
+
options = _.merge(defaults, options);
|
|
1449
1443
|
|
|
1450
|
-
|
|
1451
|
-
|
|
1444
|
+
if (!options.language) {
|
|
1445
|
+
throw new Error("missing options.language");
|
|
1452
1446
|
}
|
|
1453
1447
|
|
|
1454
|
-
<span class="
|
|
1448
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (mediaType && mediaType == "video" && !options.tags.Codec) {
|
|
1455
1449
|
<span class="cstat-no" title="statement not covered" > throw new Error("missing options.tags.Codec");</span>
|
|
1456
1450
|
}
|
|
1457
1451
|
|
|
1458
|
-
|
|
1459
|
-
|
|
1452
|
+
if (mediaType && mediaType == "video" && !options.tags.Resolution) {
|
|
1453
|
+
throw new Error("missing options.tags.Resolution");
|
|
1460
1454
|
}
|
|
1461
1455
|
|
|
1462
|
-
|
|
1463
|
-
|
|
1456
|
+
if (mediaType && mediaType == "video" && !options.tags.Framerate) {
|
|
1457
|
+
throw new Error("missing options.tags.Framerate");
|
|
1464
1458
|
}
|
|
1465
1459
|
|
|
1466
|
-
|
|
1467
|
-
|
|
1460
|
+
if (mediaType == "video" && !options.tags["Frame Mode"]) {
|
|
1461
|
+
throw new Error("missing options.tags[Frame Mode]");
|
|
1468
1462
|
}
|
|
1469
1463
|
|
|
1470
|
-
function
|
|
1471
|
-
|
|
1472
|
-
|
|
1464
|
+
function assetType(asset, types) {
|
|
1465
|
+
if (/trailer/.test(asset.type)) {
|
|
1466
|
+
return false;
|
|
1473
1467
|
}
|
|
1474
1468
|
|
|
1475
|
-
let matchingType =
|
|
1476
|
-
|
|
1477
|
-
|
|
1469
|
+
let matchingType = _.find(types, { name: asset.type });
|
|
1470
|
+
if (!matchingType) {
|
|
1471
|
+
throw new Error(`Asset type "${asset.type}" could not be found`);
|
|
1478
1472
|
}
|
|
1479
1473
|
|
|
1480
|
-
|
|
1474
|
+
return (
|
|
1481
1475
|
matchingType.file || matchingType.name.replace(".", "-").toUpperCase()
|
|
1482
1476
|
);
|
|
1483
1477
|
}
|
|
1484
1478
|
|
|
1485
|
-
function
|
|
1486
|
-
let prefix =
|
|
1487
|
-
let name =
|
|
1488
|
-
|
|
1489
|
-
|
|
1479
|
+
function assetTitle(asset) {
|
|
1480
|
+
let prefix = "";
|
|
1481
|
+
let name = asset.slug.toUpperCase().replace("INT-L", "INTL");
|
|
1482
|
+
if (/trailer/.test(asset.type)) {
|
|
1483
|
+
switch (asset.type) {
|
|
1490
1484
|
case "trailer.intl":
|
|
1491
|
-
|
|
1492
|
-
|
|
1493
|
-
|
|
1485
|
+
prefix = "ITR-";
|
|
1486
|
+
name = name.replace(/INTL-TRAILER-/, "");
|
|
1487
|
+
break;
|
|
1494
1488
|
case "trailer":
|
|
1495
|
-
|
|
1496
|
-
|
|
1497
|
-
|
|
1489
|
+
prefix = "TR-";
|
|
1490
|
+
name = name.replace(/TRAILER-/, "");
|
|
1491
|
+
break;
|
|
1498
1492
|
case "trailer.us":
|
|
1499
|
-
|
|
1500
|
-
|
|
1501
|
-
|
|
1493
|
+
prefix = "DTR-";
|
|
1494
|
+
name = name.replace(/DOMESTIC-TRAILER-/, "");
|
|
1495
|
+
break;
|
|
1502
1496
|
}
|
|
1503
1497
|
}
|
|
1504
|
-
|
|
1498
|
+
return prefix + name;
|
|
1505
1499
|
}
|
|
1506
1500
|
|
|
1507
|
-
function
|
|
1508
|
-
let matches =
|
|
1509
|
-
|
|
1510
|
-
|
|
1501
|
+
function runningTime(asset) {
|
|
1502
|
+
let matches = asset.type.match(/^film-clip|^featurette/);
|
|
1503
|
+
if (!matches) {
|
|
1504
|
+
return;
|
|
1511
1505
|
}
|
|
1512
1506
|
|
|
1513
|
-
let minutes =
|
|
1514
|
-
let seconds =
|
|
1507
|
+
let minutes = Math.floor(asset.length / 60);
|
|
1508
|
+
let seconds = asset.length % 60;
|
|
1515
1509
|
|
|
1516
|
-
let result =
|
|
1510
|
+
let result = "";
|
|
1517
1511
|
|
|
1518
|
-
|
|
1519
|
-
|
|
1512
|
+
if (minutes > 0) {
|
|
1513
|
+
result += minutes + "min";
|
|
1520
1514
|
}
|
|
1521
1515
|
|
|
1522
|
-
|
|
1523
|
-
|
|
1516
|
+
if (seconds > 0) {
|
|
1517
|
+
result += seconds + "sec";
|
|
1524
1518
|
}
|
|
1525
1519
|
|
|
1526
|
-
|
|
1520
|
+
return result;
|
|
1527
1521
|
}
|
|
1528
1522
|
|
|
1529
|
-
function
|
|
1530
|
-
|
|
1531
|
-
|
|
1523
|
+
function locale(country, language) {
|
|
1524
|
+
if (language.includes("-")) {
|
|
1525
|
+
country = "";
|
|
1532
1526
|
}
|
|
1533
|
-
|
|
1534
|
-
.filter(
|
|
1535
|
-
|
|
1527
|
+
return [language, country]
|
|
1528
|
+
.filter(str => {
|
|
1529
|
+
return !!str && str !== "WW";
|
|
1536
1530
|
})
|
|
1537
1531
|
.join("-");
|
|
1538
1532
|
}
|
|
1539
1533
|
|
|
1540
|
-
function
|
|
1541
|
-
|
|
1542
|
-
|
|
1534
|
+
function textType(subDub, text) {
|
|
1535
|
+
if (!subDub || (!subDub.sub && !subDub.dub)) {
|
|
1536
|
+
return text;
|
|
1543
1537
|
}
|
|
1544
1538
|
|
|
1545
|
-
let result =
|
|
1546
|
-
<span class="
|
|
1547
|
-
|
|
1539
|
+
let result = [];
|
|
1540
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (subDub.sub) {
|
|
1541
|
+
result.push("sub");
|
|
1548
1542
|
}
|
|
1549
1543
|
|
|
1550
|
-
|
|
1551
|
-
|
|
1544
|
+
if (subDub.dub) {
|
|
1545
|
+
result.push("dub");
|
|
1552
1546
|
}
|
|
1553
1547
|
|
|
1554
|
-
|
|
1548
|
+
return result;
|
|
1555
1549
|
}
|
|
1556
1550
|
|
|
1557
|
-
function
|
|
1558
|
-
let selectedTags =
|
|
1551
|
+
function matchSet(allTags, tags) {
|
|
1552
|
+
let selectedTags = _(tags)
|
|
1559
1553
|
.values()
|
|
1560
1554
|
.flatten()
|
|
1561
1555
|
.value();
|
|
1562
1556
|
|
|
1563
|
-
let setTag =
|
|
1557
|
+
let setTag = _(allTags)
|
|
1564
1558
|
.filter("set")
|
|
1565
1559
|
.find(<span class="fstat-no" title="function not covered" >se</span>tTag => {
|
|
1566
1560
|
<span class="cstat-no" title="statement not covered" > return _.difference(setTag.set, selectedTags).length === 0;</span>
|
|
1567
1561
|
});
|
|
1568
1562
|
|
|
1569
|
-
<span class="
|
|
1563
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (setTag) {
|
|
1570
1564
|
<span class="cstat-no" title="statement not covered" > return setTag.name;</span>
|
|
1571
1565
|
}
|
|
1572
1566
|
}
|
|
1573
1567
|
|
|
1574
|
-
let tags =
|
|
1575
|
-
parts =
|
|
1568
|
+
let tags = options.tags,
|
|
1569
|
+
parts = [
|
|
1576
1570
|
asset.project.filePrefix,
|
|
1577
1571
|
assetType(asset, allTypes),
|
|
1578
1572
|
assetTitle(asset),
|
|
@@ -1584,50 +1578,50 @@ export default class Ingest extends Model {
|
|
|
1584
1578
|
tags.Codec
|
|
1585
1579
|
];
|
|
1586
1580
|
|
|
1587
|
-
|
|
1581
|
+
parts = _(parts)
|
|
1588
1582
|
.flatten()
|
|
1589
1583
|
.filter()
|
|
1590
|
-
.map(
|
|
1584
|
+
.map(part => part.toUpperCase());
|
|
1591
1585
|
|
|
1592
|
-
let matchedSet =
|
|
1593
|
-
let requiredInfo =
|
|
1586
|
+
let matchedSet = matchSet(allTags, options.tags);
|
|
1587
|
+
let requiredInfo = tags.Resolution && tags["Frame Mode"] && tags.Framerate;
|
|
1594
1588
|
|
|
1595
|
-
<span class="
|
|
1589
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (matchedSet) {
|
|
1596
1590
|
<span class="cstat-no" title="statement not covered" > parts = parts.push(matchedSet);</span>
|
|
1597
|
-
} else <span class="
|
|
1591
|
+
} else <span class="missing-if-branch" title="if path not taken" >I</span>if (mediaType == "video" && tags.Resolution && !requiredInfo) {
|
|
1598
1592
|
<span class="cstat-no" title="statement not covered" > parts = parts.push(tags.Resolution.replace(/\d+x/, ""));</span>
|
|
1599
|
-
} else
|
|
1600
|
-
|
|
1593
|
+
} else if (mediaType == "image" && tags.Resolution) {
|
|
1594
|
+
parts = parts.push(tags.Resolution);
|
|
1601
1595
|
}
|
|
1602
1596
|
|
|
1603
|
-
let name =
|
|
1597
|
+
let name = parts.join("_");
|
|
1604
1598
|
|
|
1605
|
-
let hasResInfo =
|
|
1606
|
-
let hasAllInfo =
|
|
1599
|
+
let hasResInfo = name.match(/\d+(i|p)/i);
|
|
1600
|
+
let hasAllInfo = name.match(/\d+(i|p)\d+/i);
|
|
1607
1601
|
|
|
1608
|
-
|
|
1609
|
-
let res =
|
|
1610
|
-
let encodeTag =
|
|
1611
|
-
hasResInfo ? ""
|
|
1602
|
+
if (requiredInfo && !hasResInfo && !hasAllInfo) {
|
|
1603
|
+
let res = tags.Resolution;
|
|
1604
|
+
let encodeTag = [
|
|
1605
|
+
hasResInfo ? <span class="branch-0 cbranch-no" title="branch not covered" >"" </span>: res.indexOf("x") ? res.replace(/\d+x/, "") : <span class="branch-1 cbranch-no" title="branch not covered" >res,</span>
|
|
1612
1606
|
res.match(/i|p/i) && !hasResInfo
|
|
1613
1607
|
? ""
|
|
1614
1608
|
: tags["Frame Mode"].toLowerCase().slice(0, 1),
|
|
1615
1609
|
tags.Framerate.replace(".", "").toUpperCase()
|
|
1616
1610
|
]
|
|
1617
|
-
.filter(
|
|
1618
|
-
|
|
1611
|
+
.filter(val => {
|
|
1612
|
+
return val;
|
|
1619
1613
|
})
|
|
1620
1614
|
.join("");
|
|
1621
1615
|
|
|
1622
|
-
let match =
|
|
1623
|
-
|
|
1624
|
-
? name.replace(match, encodeTag)
|
|
1616
|
+
let match = new RegExp(encodeTag, "i");
|
|
1617
|
+
name = name.match(match)
|
|
1618
|
+
? <span class="branch-0 cbranch-no" title="branch not covered" >name.replace(match, encodeTag)</span>
|
|
1625
1619
|
: name + "_" + encodeTag;
|
|
1626
|
-
} else <span class="
|
|
1620
|
+
} else <span class="missing-if-branch" title="if path not taken" >I</span>if (hasResInfo && <span class="branch-1 cbranch-no" title="branch not covered" >!hasAllInfo </span>&& <span class="branch-2 cbranch-no" title="branch not covered" >tags.Framerate)</span> {
|
|
1627
1621
|
<span class="cstat-no" title="statement not covered" > name += tags.Framerate.replace(".", "").toUpperCase();</span>
|
|
1628
1622
|
}
|
|
1629
1623
|
|
|
1630
|
-
|
|
1624
|
+
return name;
|
|
1631
1625
|
}
|
|
1632
1626
|
/**
|
|
1633
1627
|
* Returns the mediaType of the ingest
|
|
@@ -1639,11 +1633,11 @@ export default class Ingest extends Model {
|
|
|
1639
1633
|
* Maps mediainfo metadata into ingest Tag format
|
|
1640
1634
|
*
|
|
1641
1635
|
*/
|
|
1642
|
-
|
|
1643
|
-
let info =
|
|
1644
|
-
let mediaType =
|
|
1636
|
+
mapFromMediainfo() {
|
|
1637
|
+
let info = this.mediainfo;
|
|
1638
|
+
let mediaType = this.asset.mediaType;
|
|
1645
1639
|
|
|
1646
|
-
let schema =
|
|
1640
|
+
let schema = {
|
|
1647
1641
|
Aspect: null,
|
|
1648
1642
|
Standard: null,
|
|
1649
1643
|
Resolution: null,
|
|
@@ -1656,38 +1650,38 @@ export default class Ingest extends Model {
|
|
|
1656
1650
|
Duration: null
|
|
1657
1651
|
};
|
|
1658
1652
|
|
|
1659
|
-
let tags =
|
|
1653
|
+
let tags = {};
|
|
1660
1654
|
|
|
1661
|
-
|
|
1662
|
-
|
|
1655
|
+
if (!info.File) {
|
|
1656
|
+
throw "missing info.File";
|
|
1663
1657
|
}
|
|
1664
1658
|
|
|
1665
|
-
|
|
1666
|
-
|
|
1659
|
+
if (!info.File.track) {
|
|
1660
|
+
throw "missing info.File.track";
|
|
1667
1661
|
}
|
|
1668
1662
|
|
|
1669
1663
|
let general;
|
|
1670
|
-
|
|
1671
|
-
|
|
1664
|
+
if (!Array.isArray(info["File"]["track"])) {
|
|
1665
|
+
general = info["File"]["track"];
|
|
1672
1666
|
} else {
|
|
1673
|
-
|
|
1667
|
+
general = _.find(info["File"]["track"], { _type: "General" });
|
|
1674
1668
|
}
|
|
1675
1669
|
|
|
1676
|
-
|
|
1670
|
+
switch (mediaType) {
|
|
1677
1671
|
case "video":
|
|
1678
|
-
|
|
1679
|
-
|
|
1672
|
+
mediaType = "Video";
|
|
1673
|
+
break;
|
|
1680
1674
|
case "image":
|
|
1681
|
-
|
|
1682
|
-
|
|
1675
|
+
mediaType = "Image";
|
|
1676
|
+
break;
|
|
1683
1677
|
default:
|
|
1684
|
-
<span class="
|
|
1685
|
-
|
|
1678
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (general.Format && general.Format == "MXF") {
|
|
1679
|
+
tags.Usage = "broadcast";
|
|
1686
1680
|
}
|
|
1687
|
-
|
|
1681
|
+
return tags;
|
|
1688
1682
|
}
|
|
1689
1683
|
|
|
1690
|
-
let mediainfoDefaults =
|
|
1684
|
+
let mediainfoDefaults = {
|
|
1691
1685
|
DisplayAspectRatio: "",
|
|
1692
1686
|
Format: "",
|
|
1693
1687
|
Standard: "",
|
|
@@ -1697,117 +1691,117 @@ export default class Ingest extends Model {
|
|
|
1697
1691
|
ScanType: ""
|
|
1698
1692
|
};
|
|
1699
1693
|
|
|
1700
|
-
let media =
|
|
1694
|
+
let media = _.find(info["File"]["track"], {
|
|
1701
1695
|
_type: mediaType
|
|
1702
1696
|
});
|
|
1703
|
-
|
|
1697
|
+
media = _.merge({}, mediainfoDefaults, media);
|
|
1704
1698
|
|
|
1705
|
-
let width =
|
|
1706
|
-
let height =
|
|
1707
|
-
let Resolution =
|
|
1708
|
-
|
|
1709
|
-
|
|
1699
|
+
let width = parseInt(media["Width"].replace(" ", "").match(/[0-9 ]+/));
|
|
1700
|
+
let height = parseInt(media["Height"].replace(" ", "").match(/[0-9 ]+/));
|
|
1701
|
+
let Resolution = width && height ? `${width}x${height}` : null;
|
|
1702
|
+
if (Resolution) {
|
|
1703
|
+
tags.Resolution = Resolution;
|
|
1710
1704
|
}
|
|
1711
1705
|
|
|
1712
|
-
let Standard = <span class="
|
|
1713
|
-
<span class="
|
|
1706
|
+
let Standard = media["Standard"] ? <span class="branch-0 cbranch-no" title="branch not covered" >media["Standard"].toLowerCase() </span>: null;
|
|
1707
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (Standard) {
|
|
1714
1708
|
<span class="cstat-no" title="statement not covered" > tags.Standard = Standard;</span>
|
|
1715
1709
|
}
|
|
1716
1710
|
|
|
1717
|
-
let framerate =
|
|
1718
|
-
|
|
1711
|
+
let framerate = media["FrameRate"];
|
|
1712
|
+
switch (framerate) {
|
|
1719
1713
|
case "23.976":
|
|
1720
|
-
|
|
1721
|
-
|
|
1722
|
-
case "24.000"
|
|
1714
|
+
framerate = "23.98";
|
|
1715
|
+
break;
|
|
1716
|
+
<span class="branch-1 cbranch-no" title="branch not covered" > case "24.000":</span>
|
|
1723
1717
|
<span class="cstat-no" title="statement not covered" > framerate = "24";</span>
|
|
1724
1718
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
1725
|
-
case "25.000"
|
|
1719
|
+
<span class="branch-2 cbranch-no" title="branch not covered" > case "25.000":</span>
|
|
1726
1720
|
<span class="cstat-no" title="statement not covered" > framerate = "25";</span>
|
|
1727
1721
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
1728
|
-
case "29.970"
|
|
1722
|
+
<span class="branch-3 cbranch-no" title="branch not covered" > case "29.970":</span>
|
|
1729
1723
|
<span class="cstat-no" title="statement not covered" > framerate = "29.97";</span>
|
|
1730
1724
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
1731
|
-
case "50.000"
|
|
1725
|
+
<span class="branch-4 cbranch-no" title="branch not covered" > case "50.000":</span>
|
|
1732
1726
|
<span class="cstat-no" title="statement not covered" > framerate = "50";</span>
|
|
1733
1727
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
1734
|
-
case "59.940"
|
|
1728
|
+
<span class="branch-5 cbranch-no" title="branch not covered" > case "59.940":</span>
|
|
1735
1729
|
<span class="cstat-no" title="statement not covered" > framerate = "59.94";</span>
|
|
1736
1730
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
1737
1731
|
}
|
|
1738
|
-
|
|
1739
|
-
|
|
1740
|
-
|
|
1741
|
-
|
|
1732
|
+
framerate = parseFloat(framerate).toString();
|
|
1733
|
+
framerate = framerate != "NaN" ? framerate : null;
|
|
1734
|
+
if (framerate) {
|
|
1735
|
+
tags.Framerate = framerate;
|
|
1742
1736
|
}
|
|
1743
1737
|
|
|
1744
|
-
<span class="
|
|
1745
|
-
|
|
1746
|
-
case "24"
|
|
1738
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (!tags.Standard) {
|
|
1739
|
+
switch (tags.Framerate) {
|
|
1740
|
+
<span class="branch-0 cbranch-no" title="branch not covered" > case "24":</span>
|
|
1747
1741
|
case "23.98":
|
|
1748
1742
|
case "29.97":
|
|
1749
1743
|
case "59.94":
|
|
1750
|
-
|
|
1751
|
-
|
|
1752
|
-
case "25"
|
|
1753
|
-
case "50"
|
|
1744
|
+
tags.Standard = "ntsc";
|
|
1745
|
+
break;
|
|
1746
|
+
<span class="branch-4 cbranch-no" title="branch not covered" > case "25":</span>
|
|
1747
|
+
<span class="branch-5 cbranch-no" title="branch not covered" > case "50":</span>
|
|
1754
1748
|
<span class="cstat-no" title="statement not covered" > tags.Standard = "pal";</span>
|
|
1755
1749
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
1756
1750
|
}
|
|
1757
1751
|
}
|
|
1758
1752
|
|
|
1759
1753
|
let Codec;
|
|
1760
|
-
|
|
1754
|
+
switch (media["Format"]) {
|
|
1761
1755
|
case "AVC":
|
|
1762
|
-
|
|
1763
|
-
|
|
1756
|
+
Codec = "h264";
|
|
1757
|
+
break;
|
|
1764
1758
|
case "ProRes":
|
|
1765
|
-
|
|
1766
|
-
|
|
1759
|
+
Codec = "prores";
|
|
1760
|
+
break;
|
|
1767
1761
|
}
|
|
1768
|
-
|
|
1769
|
-
|
|
1762
|
+
if (Codec) {
|
|
1763
|
+
tags.Codec = Codec;
|
|
1770
1764
|
}
|
|
1771
1765
|
|
|
1772
|
-
|
|
1773
|
-
|
|
1766
|
+
if (tags.Codec == "h264") {
|
|
1767
|
+
tags.Usage = "online";
|
|
1774
1768
|
}
|
|
1775
1769
|
|
|
1776
|
-
|
|
1777
|
-
|
|
1770
|
+
if (tags.Codec == "prores") {
|
|
1771
|
+
tags.Usage = "broadcast";
|
|
1778
1772
|
}
|
|
1779
1773
|
|
|
1780
|
-
<span class="
|
|
1774
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (general && general["Format"] == "MXF") {
|
|
1781
1775
|
<span class="cstat-no" title="statement not covered" > tags.Usage = "broadcast";</span>
|
|
1782
1776
|
}
|
|
1783
1777
|
|
|
1784
|
-
|
|
1785
|
-
case "1.000"
|
|
1778
|
+
switch (media["DisplayAspectRatio"]) {
|
|
1779
|
+
<span class="branch-0 cbranch-no" title="branch not covered" > case "1.000":</span>
|
|
1786
1780
|
<span class="cstat-no" title="statement not covered" > tags.Aspect = "1:1";</span>
|
|
1787
1781
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
1788
|
-
case "1.347"
|
|
1782
|
+
<span class="branch-1 cbranch-no" title="branch not covered" > case "1.347":</span>
|
|
1789
1783
|
<span class="cstat-no" title="statement not covered" > tags.Aspect = "4:3";</span>
|
|
1790
1784
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
1791
|
-
case "1.756"
|
|
1785
|
+
<span class="branch-2 cbranch-no" title="branch not covered" > case "1.756":</span>
|
|
1792
1786
|
<span class="cstat-no" title="statement not covered" > tags.Aspect = "16:9";</span>
|
|
1793
1787
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
1794
1788
|
case "1.778":
|
|
1795
|
-
|
|
1796
|
-
|
|
1797
|
-
case "1.366"
|
|
1789
|
+
tags.Aspect = "16:9";
|
|
1790
|
+
break;
|
|
1791
|
+
<span class="branch-4 cbranch-no" title="branch not covered" > case "1.366":</span>
|
|
1798
1792
|
<span class="cstat-no" title="statement not covered" > tags.Aspect = "4:3";</span>
|
|
1799
1793
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
1800
|
-
case "0.562"
|
|
1794
|
+
<span class="branch-5 cbranch-no" title="branch not covered" > case "0.562":</span>
|
|
1801
1795
|
<span class="cstat-no" title="statement not covered" > tags.Aspect = "9:16";</span>
|
|
1802
1796
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
1803
1797
|
}
|
|
1804
1798
|
|
|
1805
|
-
let ScanType =
|
|
1806
|
-
|
|
1807
|
-
|
|
1799
|
+
let ScanType = media["ScanType"].toLowerCase() || null;
|
|
1800
|
+
if (ScanType) {
|
|
1801
|
+
tags["Frame Mode"] = ScanType;
|
|
1808
1802
|
}
|
|
1809
1803
|
|
|
1810
|
-
let ingest =
|
|
1804
|
+
let ingest = {
|
|
1811
1805
|
selected: {
|
|
1812
1806
|
download: {
|
|
1813
1807
|
tags: tags
|
|
@@ -1815,39 +1809,39 @@ export default class Ingest extends Model {
|
|
|
1815
1809
|
}
|
|
1816
1810
|
};
|
|
1817
1811
|
|
|
1818
|
-
|
|
1812
|
+
return ingest;
|
|
1819
1813
|
}
|
|
1820
1814
|
/**
|
|
1821
1815
|
* Maps parsed filename data to a partial ingest record for later merging
|
|
1822
1816
|
* @param {*} filename
|
|
1823
1817
|
* @param {*} allTags
|
|
1824
1818
|
*/
|
|
1825
|
-
|
|
1826
|
-
let { allTags } =
|
|
1827
|
-
let filename =
|
|
1828
|
-
let tags =
|
|
1819
|
+
mapFromFilename(params) {
|
|
1820
|
+
let { allTags } = params;
|
|
1821
|
+
let filename = this.filename;
|
|
1822
|
+
let tags = {
|
|
1829
1823
|
SubDub: {
|
|
1830
1824
|
sub: null,
|
|
1831
1825
|
dub: null
|
|
1832
1826
|
}
|
|
1833
1827
|
};
|
|
1834
|
-
|
|
1835
|
-
let foundTag =
|
|
1836
|
-
|
|
1837
|
-
|
|
1838
|
-
|
|
1839
|
-
|
|
1828
|
+
filename.file.tags.forEach(tag => {
|
|
1829
|
+
let foundTag = _.find(allTags, { name: tag });
|
|
1830
|
+
if (foundTag) {
|
|
1831
|
+
if (foundTag.type == "SubDub") {
|
|
1832
|
+
if (foundTag.name == "sub") {
|
|
1833
|
+
tags.SubDub.sub = true;
|
|
1840
1834
|
}
|
|
1841
|
-
|
|
1842
|
-
|
|
1835
|
+
if (foundTag.name == "dub") {
|
|
1836
|
+
tags.SubDub.dub = true;
|
|
1843
1837
|
}
|
|
1844
1838
|
} else {
|
|
1845
|
-
|
|
1839
|
+
tags[foundTag.type] = foundTag.name;
|
|
1846
1840
|
}
|
|
1847
1841
|
}
|
|
1848
1842
|
});
|
|
1849
|
-
|
|
1850
|
-
let ingest =
|
|
1843
|
+
tags.Extra = filename.extra;
|
|
1844
|
+
let ingest = {
|
|
1851
1845
|
selected: {
|
|
1852
1846
|
download: {
|
|
1853
1847
|
tags: tags
|
|
@@ -1855,43 +1849,43 @@ export default class Ingest extends Model {
|
|
|
1855
1849
|
preview: {}
|
|
1856
1850
|
}
|
|
1857
1851
|
};
|
|
1858
|
-
|
|
1852
|
+
if (
|
|
1859
1853
|
filename.file.tags.includes("sub") &&
|
|
1860
1854
|
filename.file.tags.includes("dub")
|
|
1861
1855
|
) {
|
|
1862
|
-
|
|
1863
|
-
} else
|
|
1864
|
-
|
|
1865
|
-
} else <span class="
|
|
1866
|
-
|
|
1856
|
+
ingest.selected.preview.type = "both";
|
|
1857
|
+
} else if (filename.file.tags.includes("sub")) {
|
|
1858
|
+
ingest.selected.preview.type = "sub";
|
|
1859
|
+
} else <span class="missing-if-branch" title="else path not taken" >E</span>if (filename.file.tags.includes("dub")) {
|
|
1860
|
+
ingest.selected.preview.type = "dub";
|
|
1867
1861
|
}
|
|
1868
|
-
|
|
1869
|
-
|
|
1870
|
-
|
|
1862
|
+
if (filename.file.language) {
|
|
1863
|
+
ingest.selected.preview.language = filename.file.language;
|
|
1864
|
+
ingest.selected.download.language = filename.file.language;
|
|
1871
1865
|
}
|
|
1872
|
-
|
|
1873
|
-
|
|
1866
|
+
if (filename.file.country) {
|
|
1867
|
+
ingest.selected.download.country = filename.file.country;
|
|
1874
1868
|
}
|
|
1875
|
-
|
|
1869
|
+
return ingest;
|
|
1876
1870
|
}
|
|
1877
1871
|
/**
|
|
1878
1872
|
* Create a File from an Ingest object
|
|
1879
1873
|
*
|
|
1880
|
-
* @param {object} params
|
|
1874
|
+
* @param {object} params
|
|
1881
1875
|
*/
|
|
1882
|
-
|
|
1883
|
-
let { allTags, allTypes, order } =
|
|
1876
|
+
createFile(params) {
|
|
1877
|
+
let { allTags, allTypes, order } = params;
|
|
1884
1878
|
|
|
1885
|
-
|
|
1886
|
-
|
|
1879
|
+
let filename = this.mapFromFilename({ allTags });
|
|
1880
|
+
let mediainfo = this.mapFromMediainfo();
|
|
1887
1881
|
|
|
1888
|
-
let ingest =
|
|
1882
|
+
let ingest = this.assemble({ filename, mediainfo, order });
|
|
1889
1883
|
|
|
1890
|
-
let file =
|
|
1884
|
+
let file = new File({
|
|
1891
1885
|
name: this.renderFilename({ allTags, allTypes }),
|
|
1892
1886
|
path: this.renderPath(),
|
|
1893
1887
|
asset: ingest.asset._id,
|
|
1894
|
-
generator:
|
|
1888
|
+
generator: "ingest",
|
|
1895
1889
|
contextTag: ingest.context.tag,
|
|
1896
1890
|
language: ingest.selected.download.language,
|
|
1897
1891
|
country: ingest.selected.download.country,
|
|
@@ -1901,21 +1895,19 @@ export default class Ingest extends Model {
|
|
|
1901
1895
|
verified: true
|
|
1902
1896
|
});
|
|
1903
1897
|
|
|
1904
|
-
|
|
1898
|
+
return file;
|
|
1905
1899
|
}
|
|
1906
1900
|
/**
|
|
1907
1901
|
* Merges ingest metadata sources
|
|
1908
1902
|
*
|
|
1909
1903
|
* @param {object} params
|
|
1910
1904
|
*/
|
|
1911
|
-
|
|
1912
|
-
let
|
|
1913
|
-
let filename = <span class="cstat-no" title="statement not covered" >this.data().filename;</span>
|
|
1914
|
-
let mediainfo = <span class="cstat-no" title="statement not covered" >this.data().mediainfo;</span>
|
|
1905
|
+
assemble(params) {
|
|
1906
|
+
let { filename, mediainfo, order, watermarks = [] } = params;
|
|
1915
1907
|
|
|
1916
|
-
let
|
|
1908
|
+
let original = this.data();
|
|
1917
1909
|
|
|
1918
|
-
let defaults =
|
|
1910
|
+
let defaults = {
|
|
1919
1911
|
workRequest: order._id,
|
|
1920
1912
|
selected: {
|
|
1921
1913
|
download: {
|
|
@@ -1942,68 +1934,68 @@ export default class Ingest extends Model {
|
|
|
1942
1934
|
}
|
|
1943
1935
|
};
|
|
1944
1936
|
|
|
1945
|
-
let ingest =
|
|
1937
|
+
let ingest = _.merge(defaults, filename, original, mediainfo);
|
|
1946
1938
|
|
|
1947
|
-
|
|
1948
|
-
|
|
1939
|
+
if (original.asset && original.asset.creative) {
|
|
1940
|
+
ingest.selected.preview.revision = "Unfinished";
|
|
1949
1941
|
}
|
|
1950
1942
|
|
|
1951
|
-
|
|
1952
|
-
|
|
1943
|
+
if (!original.context.asset && filename.asset && filename.asset._id) {
|
|
1944
|
+
ingest.selected.asset = filename.asset._id;
|
|
1953
1945
|
}
|
|
1954
1946
|
|
|
1955
|
-
|
|
1956
|
-
|
|
1957
|
-
|
|
1958
|
-
|
|
1947
|
+
if (ingest.workRequest) {
|
|
1948
|
+
ingest.selected.project = ingest.context.project;
|
|
1949
|
+
ingest.selected.asset = ingest.context.asset;
|
|
1950
|
+
ingest.selected.assetType = ingest.context.assetType;
|
|
1959
1951
|
}
|
|
1960
1952
|
|
|
1961
|
-
|
|
1962
|
-
|
|
1953
|
+
if (ingest.workRequest) {
|
|
1954
|
+
ingest.selected.download.tags.Extra = [];
|
|
1963
1955
|
}
|
|
1964
1956
|
|
|
1965
|
-
|
|
1966
|
-
|
|
1957
|
+
if (original.context.tag) {
|
|
1958
|
+
ingest.selected.download.tags.Extra = [original.context.tag];
|
|
1967
1959
|
}
|
|
1968
1960
|
|
|
1969
|
-
|
|
1970
|
-
|
|
1961
|
+
if (order.territory) {
|
|
1962
|
+
ingest.selected.download.country = order.territory;
|
|
1971
1963
|
}
|
|
1972
|
-
|
|
1973
|
-
|
|
1974
|
-
|
|
1964
|
+
if (order.language) {
|
|
1965
|
+
ingest.selected.preview.language = order.language;
|
|
1966
|
+
ingest.selected.download.language = order.language;
|
|
1975
1967
|
}
|
|
1976
|
-
|
|
1977
|
-
|
|
1968
|
+
if (order._id) {
|
|
1969
|
+
ingest.selected.download.tags.Text = "txtd";
|
|
1978
1970
|
}
|
|
1979
|
-
|
|
1980
|
-
|
|
1971
|
+
if (order.isSub() || order.isDub()) {
|
|
1972
|
+
ingest.selected.download.tags.SubDub = {
|
|
1981
1973
|
sub: order.isSub(),
|
|
1982
1974
|
dub: order.isDub()
|
|
1983
1975
|
};
|
|
1984
1976
|
}
|
|
1985
|
-
|
|
1986
|
-
|
|
1977
|
+
if (order.isSub()) {
|
|
1978
|
+
ingest.selected.preview.type = "sub";
|
|
1987
1979
|
}
|
|
1988
|
-
|
|
1989
|
-
|
|
1980
|
+
if (order.isDub()) {
|
|
1981
|
+
ingest.selected.preview.type = "dub";
|
|
1990
1982
|
}
|
|
1991
|
-
|
|
1992
|
-
|
|
1983
|
+
if (order.isSub() && order.isDub()) {
|
|
1984
|
+
ingest.selected.preview.type = "both";
|
|
1993
1985
|
}
|
|
1994
1986
|
|
|
1995
|
-
|
|
1987
|
+
ingest.selected.preview.watermark = watermarks[0] ? watermarks[0]._id : "";
|
|
1996
1988
|
|
|
1997
|
-
let tags =
|
|
1998
|
-
|
|
1989
|
+
let tags = ingest.selected.download.tags;
|
|
1990
|
+
ingest.selected.preview.enabled =
|
|
1999
1991
|
!!(
|
|
2000
1992
|
tags.Codec == "prores" &&
|
|
2001
1993
|
tags.Resolution.split("x")[1] == "1080" &&
|
|
2002
|
-
(tags.Framerate == "23.98" || tags.Framerate == "25") &&
|
|
1994
|
+
(tags.Framerate == "23.98" || <span class="branch-3 cbranch-no" title="branch not covered" >tags.Framerate == "25")</span> &&
|
|
2003
1995
|
watermarks.length
|
|
2004
1996
|
) || false;
|
|
2005
1997
|
|
|
2006
|
-
|
|
1998
|
+
return ingest;
|
|
2007
1999
|
}
|
|
2008
2000
|
}
|
|
2009
2001
|
|
|
@@ -2012,21 +2004,20 @@ export default class Ingest extends Model {
|
|
|
2012
2004
|
*
|
|
2013
2005
|
* @param {object} data
|
|
2014
2006
|
*/
|
|
2015
|
-
function
|
|
2016
|
-
let copy =
|
|
2017
|
-
<span class="
|
|
2018
|
-
|
|
2007
|
+
function flatValues(data) {
|
|
2008
|
+
let copy = clone(data);
|
|
2009
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (copy.SubDub) {
|
|
2010
|
+
copy.SubDub = keys(filter(val => !!val, copy.SubDub));
|
|
2019
2011
|
}
|
|
2020
|
-
|
|
2012
|
+
return flatten(values(copy));
|
|
2021
2013
|
}
|
|
2022
|
-
|
|
2023
2014
|
</pre></td></tr>
|
|
2024
2015
|
</table></pre>
|
|
2025
2016
|
<div class='push'></div><!-- for sticky footer -->
|
|
2026
2017
|
</div><!-- /wrapper -->
|
|
2027
2018
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
2028
2019
|
Code coverage
|
|
2029
|
-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at
|
|
2020
|
+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Aug 19 2019 10:23:38 GMT-0500 (Central Daylight Time)
|
|
2030
2021
|
</div>
|
|
2031
2022
|
</div>
|
|
2032
2023
|
<script src="prettify.js"></script>
|