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