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