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