Merge branch 'experimental' into master

This commit is contained in:
DebaucheryLibrarian 2020-09-04 03:18:21 +02:00
commit 5386f81cda
24 changed files with 185 additions and 9 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -0,0 +1,134 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="503.2px" height="62.4px" viewBox="0 0 503.2 62.4" style="enable-background:new 0 0 503.2 62.4;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
.st1{fill:#E3237F;}
</style>
<path class="st0" d="M26.4,55.5c-1.5,0.1-3.1-0.4-4.3-1.2c-1.1-0.9-1.7-2.2-1.6-3.6c0-0.6,0-1.3,0.1-1.9c0.1-0.7,0.2-1.4,0.3-2.1
h-0.4c-0.8,1.4-1.5,2.7-2.2,3.8c-0.7,1-1.5,2-2.5,2.8c-0.9,0.7-1.9,1.3-3.1,1.7c-1.3,0.4-2.6,0.6-3.9,0.6c-1.3,0-2.6-0.3-3.8-0.8
c-1.1-0.6-2-1.4-2.7-2.3c-0.8-1.1-1.3-2.3-1.6-3.5C0.2,47.4,0,45.9,0,44.4c0-1.7,0.2-3.4,0.5-5c0.8-3.6,2.3-7,4.4-10
c1.1-1.5,2.3-2.8,3.8-4c1.4-1.2,3-2.1,4.8-2.8c1.8-0.7,3.8-1,5.7-1c0.8,0,1.6,0.1,2.4,0.2c0.8,0.1,1.6,0.3,2.4,0.5
c0.7,0.2,1.4,0.4,2.1,0.7c0.6,0.2,1.1,0.5,1.7,0.8l3.3-1.5h3.2l-4,19c-0.1,0.3-0.2,0.8-0.3,1.3s-0.2,1.2-0.3,1.8s-0.2,1.2-0.3,1.8
c-0.1,0.5-0.1,1-0.1,1.5c-0.1,0.8,0.2,1.6,0.6,2.3c0.4,0.5,0.9,0.8,1.6,0.7c0.6,0,1.1-0.1,1.6-0.4c0.5-0.2,1.1-0.6,1.7-0.9l1.2,2.5
c-0.5,0.4-1.1,0.8-1.8,1.2c-0.7,0.5-1.4,0.8-2.2,1.2c-0.8,0.4-1.7,0.7-2.6,0.9C28.5,55.4,27.5,55.5,26.4,55.5z M9.3,44.4
c0,1,0.1,2,0.2,3c0.1,0.7,0.4,1.3,0.7,1.9c0.2,0.4,0.6,0.8,1,1c0.4,0.2,0.9,0.3,1.3,0.3c1-0.1,2-0.5,2.8-1.2c1.1-0.9,2-1.9,2.7-3.1
c0.9-1.4,1.6-2.8,2.2-4.3c0.7-1.6,1.2-3.2,1.5-4.8l2.1-10.1c-0.4-0.6-1-1-1.7-1.3c-0.7-0.3-1.5-0.4-2.2-0.4c-1.2,0-2.3,0.3-3.3,0.9
c-1,0.7-1.9,1.5-2.7,2.5c-0.8,1.1-1.5,2.3-2.1,3.5c-0.6,1.3-1.1,2.7-1.5,4.1c-0.4,1.4-0.7,2.8-0.9,4.2C9.4,41.9,9.3,43.2,9.3,44.4z"
/>
<path class="st0" d="M70.7,41.8c-0.1,0.3-0.2,0.7-0.3,1.3s-0.2,1.1-0.3,1.7s-0.2,1.2-0.2,1.8c-0.1,0.5-0.1,1-0.1,1.4
c-0.1,0.8,0.2,1.5,0.7,2.1c0.4,0.4,0.9,0.7,1.5,0.7c0.6,0,1.2-0.2,1.7-0.4c0.6-0.2,1.1-0.5,1.7-0.9l1.3,2.4
c-0.6,0.5-1.2,0.9-1.8,1.3c-0.7,0.4-1.5,0.8-2.2,1.2c-0.8,0.3-1.7,0.6-2.6,0.8c-1,0.2-2,0.3-3,0.3c-0.8,0-1.6-0.1-2.4-0.3
c-0.7-0.2-1.3-0.5-1.9-0.9c-0.5-0.4-0.9-0.9-1.2-1.5c-0.3-0.7-0.5-1.4-0.4-2.1c0-0.4,0-0.7,0-1s0-0.6,0.1-0.9s0.1-0.6,0.1-0.9
s0.1-0.7,0.2-1.1h-0.4c-0.7,1.4-1.5,2.7-2.4,4c-0.8,1-1.6,2-2.7,2.8c-0.9,0.7-1.9,1.2-3,1.6c-1.1,0.3-2.3,0.5-3.5,0.5
c-1.4,0-2.8-0.3-4-0.9c-1.1-0.6-2.1-1.4-2.8-2.4c-0.7-1.1-1.3-2.3-1.6-3.6c-0.3-1.4-0.5-2.8-0.5-4.3c0-1.7,0.2-3.4,0.6-5
c0.4-1.8,0.9-3.5,1.7-5.1c0.7-1.7,1.6-3.3,2.7-4.8c1-1.5,2.3-2.8,3.7-4c1.4-1.2,3-2.1,4.6-2.8c1.8-0.7,3.7-1,5.6-1
c1.1,0,2.2,0.1,3.3,0.4c1,0.2,1.9,0.6,2.7,1.1c0.1-0.2,0.1-0.6,0.2-0.9s0.1-0.7,0.2-1s0.1-0.7,0.2-1l0.2-0.7l0.5-2.4
c0.1-0.2,0.1-0.5,0.2-0.8s0.1-0.5,0.2-0.8s0.1-0.5,0.1-0.6s0-0.3,0-0.4c0-0.5,0-0.9-0.2-1.3c-0.1-0.3-0.3-0.6-0.6-0.8
c-0.3-0.2-0.6-0.3-1-0.4c-0.5-0.1-1-0.1-1.5-0.1h-1.4L63,8.6h14.7L70.7,41.8z M49.9,44.4c0,1,0.1,2,0.3,2.9c0.1,0.7,0.3,1.3,0.7,1.9
c0.5,0.9,1.4,1.4,2.4,1.4c1-0.1,2-0.5,2.8-1.2c1-0.9,1.9-1.9,2.7-3c0.9-1.4,1.6-2.8,2.2-4.3c0.7-1.6,1.2-3.2,1.5-4.9l2.2-10.1
c-0.5-0.6-1.1-1-1.8-1.3c-0.7-0.3-1.5-0.4-2.2-0.4c-1.1,0-2.2,0.3-3.2,0.9c-1,0.7-1.9,1.5-2.6,2.5c-0.8,1.1-1.5,2.3-2.1,3.5
c-0.6,1.3-1.1,2.7-1.6,4.1c-0.4,1.4-0.7,2.8-0.9,4.2C50,41.9,49.9,43.2,49.9,44.4z"/>
<path class="st0" d="M111.3,41.8c-0.1,0.3-0.1,0.7-0.3,1.3s-0.2,1.1-0.3,1.7s-0.2,1.2-0.2,1.8c-0.1,0.5-0.1,1-0.1,1.4
c-0.1,0.8,0.2,1.5,0.7,2.1c0.4,0.4,0.9,0.7,1.5,0.7c0.6,0,1.2-0.2,1.7-0.4c0.6-0.2,1.1-0.5,1.7-0.9l1.3,2.4
c-0.6,0.5-1.2,0.9-1.8,1.3c-0.7,0.4-1.5,0.8-2.2,1.2c-0.8,0.4-1.7,0.7-2.6,0.9c-1,0.2-2,0.3-3,0.3c-0.8,0-1.6-0.1-2.4-0.3
c-0.7-0.2-1.3-0.5-1.9-0.9c-0.5-0.4-0.9-0.9-1.2-1.5c-0.3-0.7-0.4-1.4-0.4-2.1c0-0.4,0-0.7,0-1s0-0.6,0.1-0.9s0.1-0.6,0.1-0.9
s0.1-0.7,0.2-1.1h-0.4c-0.7,1.4-1.5,2.7-2.4,4c-0.8,1-1.7,2-2.7,2.7c-0.9,0.7-1.9,1.2-3,1.6c-1.1,0.3-2.3,0.5-3.5,0.5
c-1.4,0-2.8-0.3-4-0.9c-1.1-0.6-2-1.4-2.8-2.4c-0.8-1.1-1.3-2.3-1.6-3.6c-0.3-1.4-0.5-2.8-0.5-4.3c0-1.7,0.2-3.4,0.6-5
c0.4-1.8,0.9-3.5,1.6-5.1c0.7-1.7,1.6-3.3,2.6-4.8c1-1.5,2.3-2.8,3.7-4c1.4-1.2,3-2.1,4.6-2.8c1.8-0.7,3.7-1,5.6-1
c1.1,0,2.2,0.1,3.3,0.4c1,0.2,1.9,0.6,2.8,1c0.1-0.2,0.1-0.6,0.2-0.9s0.1-0.7,0.2-1s0.1-0.7,0.2-1l0.2-0.7l0.5-2.4
c0.1-0.2,0.1-0.5,0.2-0.8s0.1-0.5,0.1-0.8s0.1-0.5,0.1-0.6s0-0.3,0-0.4c0-0.5,0-0.9-0.2-1.3c-0.1-0.3-0.3-0.6-0.6-0.8
c-0.3-0.2-0.6-0.3-1-0.4c-0.5-0.1-1-0.1-1.5-0.1h-1.4l0.6-3.2h14.7L111.3,41.8z M90.5,44.4c0,1,0.1,2,0.3,2.9
c0.1,0.7,0.4,1.3,0.7,1.9c0.5,0.9,1.4,1.4,2.4,1.4c1-0.1,2-0.5,2.8-1.2c1-0.9,1.9-1.9,2.7-3c0.9-1.4,1.6-2.8,2.2-4.3
c0.7-1.6,1.2-3.2,1.5-4.9l2.1-10.1c-0.5-0.6-1.1-1-1.8-1.3c-0.7-0.3-1.5-0.4-2.2-0.4c-1.1,0-2.2,0.3-3.2,0.9c-1,0.7-1.9,1.5-2.6,2.5
c-0.8,1.1-1.5,2.3-2.1,3.5c-0.6,1.3-1.1,2.7-1.5,4.1c-0.4,1.4-0.7,2.8-0.9,4.2C90.6,41.9,90.5,43.2,90.5,44.4z"/>
<path class="st0" d="M137.8,22.2L133.6,42c-0.2,1.1-0.4,2.2-0.6,3.1c-0.1,0.9-0.2,1.8-0.2,2.7c0,0.7,0.1,1.5,0.6,2.1
c0.4,0.5,1,0.7,1.6,0.7c0.6,0,1.2-0.1,1.8-0.4c0.6-0.3,1.3-0.6,1.9-1l1.5,2.1c-0.5,0.5-1.1,1.1-1.6,1.5c-0.6,0.5-1.3,1-2.1,1.4
c-1.7,0.9-3.7,1.3-5.6,1.3c-1.9,0.1-3.9-0.5-5.4-1.7c-1.3-1.2-2-2.9-1.9-4.6c0-1,0.1-2.1,0.2-3.1c0.2-1.2,0.4-2.6,0.7-4.1l2.4-11.4
c0.1-0.2,0.1-0.5,0.2-0.8s0.1-0.5,0.1-0.8s0.1-0.5,0.1-0.6s0-0.3,0-0.4c0-0.5,0-0.9-0.2-1.3c-0.1-0.3-0.3-0.6-0.6-0.8
c-0.3-0.2-0.6-0.3-1-0.4c-0.5-0.1-1-0.1-1.5-0.1h-1.1l0.5-3.2L137.8,22.2z M133.6,16.7c-0.6,0-1.3-0.1-1.9-0.2
c-0.5-0.1-1.1-0.4-1.5-0.7c-0.4-0.3-0.8-0.7-1-1.2c-0.3-0.5-0.4-1.1-0.4-1.7c0-0.8,0.1-1.6,0.5-2.3c0.3-0.6,0.7-1.1,1.2-1.6
c0.5-0.4,1.2-0.7,1.8-0.9c0.7-0.2,1.4-0.3,2.2-0.3c0.6,0,1.3,0.1,1.9,0.2c0.6,0.1,1.1,0.4,1.6,0.7c0.4,0.3,0.8,0.7,1.1,1.2
c0.3,0.5,0.4,1.1,0.4,1.8c0,0.8-0.2,1.5-0.5,2.2c-0.3,0.6-0.8,1.1-1.3,1.6c-0.6,0.4-1.2,0.7-1.9,0.9
C135.1,16.6,134.3,16.7,133.6,16.7L133.6,16.7z"/>
<path class="st0" d="M159.5,50.9c1,0,2-0.1,2.9-0.4c0.8-0.3,1.6-0.7,2.3-1.2c0.7-0.5,1.3-1,1.8-1.6c0.5-0.6,1-1.2,1.4-1.8
c0.3,0.3,0.5,0.7,0.7,1.1c0.2,0.5,0.3,1.1,0.3,1.6c0,0.9-0.3,1.7-0.7,2.4c-0.5,0.9-1.3,1.7-2.2,2.2c-1.2,0.7-2.4,1.3-3.7,1.6
c-1.8,0.5-3.6,0.7-5.4,0.6c-1.8,0-3.5-0.3-5.2-0.8c-1.6-0.5-3-1.3-4.3-2.3c-1.2-1.1-2.2-2.4-2.9-3.9c-0.8-1.8-1.1-3.6-1.1-5.6
c0-1.6,0.2-3.2,0.6-4.7c0.8-3.4,2.3-6.6,4.5-9.3c2.3-2.9,5.4-5.1,8.9-6.3c2-0.7,4-1,6.1-1c1.5,0,2.9,0.2,4.4,0.5
c1.1,0.3,2.1,0.8,3,1.4c0.7,0.5,1.3,1.2,1.7,2c0.4,0.8,0.6,1.6,0.6,2.5c0,0.6-0.1,1.3-0.4,1.9c-0.3,0.6-0.7,1.2-1.3,1.6
c-0.7,0.5-1.5,0.9-2.3,1.2c-1.1,0.3-2.3,0.5-3.4,0.4c0-1-0.1-2.1-0.3-3.1c-0.2-0.9-0.4-1.7-0.8-2.5c-0.3-0.7-0.8-1.3-1.4-1.7
c-0.6-0.4-1.2-0.6-1.9-0.6c-0.9,0-1.8,0.3-2.5,0.9c-0.8,0.6-1.5,1.4-2.1,2.3c-0.7,1.1-1.2,2.2-1.7,3.4c-0.5,1.3-0.9,2.5-1.2,3.8
c-0.3,1.3-0.6,2.6-0.8,3.9c-0.2,1.2-0.3,2.3-0.3,3.5c-0.1,2.1,0.5,4.1,1.7,5.8C155.7,50.3,157.5,51,159.5,50.9z"/>
<path class="st0" d="M189.6,50.5c0.9,0,1.8-0.2,2.6-0.5c0.8-0.3,1.5-0.7,2.2-1.1l1.4,2.3c-0.7,0.6-1.4,1.1-2.1,1.6
c-0.8,0.5-1.6,1-2.4,1.3c-1.9,0.9-4,1.3-6.1,1.3c-1.1,0-2.1-0.1-3.1-0.4c-0.9-0.3-1.8-0.7-2.5-1.3c-0.7-0.6-1.3-1.4-1.7-2.2
c-0.4-1-0.6-2.1-0.6-3.2c0-0.4,0-0.8,0.1-1.2s0.1-0.9,0.1-1.3s0.1-0.9,0.2-1.3s0.2-0.9,0.2-1.2l3.7-16.9h-4.7l0.6-3.1
c1,0,1.9-0.2,2.9-0.4c1.1-0.3,2.2-0.8,3.2-1.5c1.2-0.8,2.3-1.6,3.2-2.7c1.2-1.2,2.2-2.5,3.1-4h3.6l-1.6,7.5h7.4l-0.8,4.2h-7.4
l-3.7,16.7c-0.2,0.8-0.4,1.6-0.5,2.4c-0.1,0.7-0.1,1.3-0.1,2c-0.1,0.8,0.2,1.7,0.8,2.3C188,50.3,188.8,50.6,189.6,50.5z"/>
<path class="st0" d="M217,50.9c1,0,1.9-0.1,2.8-0.4c0.9-0.3,1.7-0.7,2.5-1.1c0.7-0.4,1.4-1,2.1-1.6c0.6-0.6,1.1-1.2,1.6-1.8
c0.3,0.3,0.5,0.7,0.6,1.2c0.1,0.5,0.2,1,0.2,1.5c0,0.8-0.3,1.6-0.7,2.3c-0.6,0.9-1.3,1.7-2.2,2.3c-1.2,0.8-2.4,1.3-3.8,1.7
c-1.8,0.5-3.6,0.7-5.4,0.7c-1.8,0-3.6-0.3-5.3-0.8c-1.6-0.5-3.1-1.3-4.3-2.3c-1.3-1.1-2.3-2.4-2.9-3.9c-0.8-1.8-1.1-3.7-1.1-5.6
c0-1.6,0.2-3.2,0.6-4.7c0.4-1.7,1-3.3,1.8-4.8c0.8-1.6,1.8-3.1,2.9-4.5c3.8-4.6,9.4-7.3,15.4-7.2c2.4-0.2,4.8,0.5,6.8,1.9
c1.6,1.3,2.5,3.2,2.4,5.3c0,1.7-0.5,3.3-1.4,4.7c-1,1.6-2.3,2.9-3.8,4c-1.8,1.2-3.7,2.1-5.8,2.7c-2.4,0.7-4.8,1-7.3,1h-1.1
c-0.4,0-0.8,0-1.2-0.1c-0.1,0.4-0.1,0.8-0.1,1.2c0,0.4,0,0.8,0,1.1c-0.1,2,0.5,3.9,1.7,5.5C213.4,50.4,215.2,51.1,217,50.9z
M219.2,25.3c-1.1,0-2.1,0.4-2.8,1.1c-1,0.8-1.8,1.8-2.4,2.9c-0.7,1.3-1.4,2.6-1.9,4c-0.5,1.4-0.9,2.9-1.1,4.4h0.5
c1.4,0,2.8-0.2,4.2-0.6c1.2-0.4,2.4-0.9,3.4-1.7c0.9-0.7,1.7-1.6,2.3-2.7c0.6-1.1,0.8-2.3,0.8-3.5c0.1-1-0.2-2.1-0.8-2.9
C220.9,25.6,220,25.2,219.2,25.3L219.2,25.3z"/>
<path class="st0" d="M263.8,41.8l-0.2,1.3c-0.1,0.5-0.2,1.1-0.3,1.7s-0.2,1.2-0.2,1.8c-0.1,0.5-0.1,1-0.1,1.4
c-0.1,0.8,0.2,1.5,0.6,2.1c0.4,0.4,0.9,0.7,1.5,0.7c0.6,0,1.2-0.2,1.7-0.4c0.6-0.3,1.1-0.5,1.7-0.9l1.3,2.4
c-0.6,0.5-1.2,0.9-1.8,1.3c-0.7,0.5-1.5,0.9-2.2,1.2c-0.8,0.4-1.7,0.7-2.6,0.9c-1,0.2-2,0.3-3,0.3c-0.8,0-1.7-0.1-2.5-0.3
c-0.7-0.2-1.3-0.5-1.9-0.9c-0.5-0.4-0.9-0.9-1.2-1.5c-0.3-0.7-0.4-1.4-0.4-2.1c0-0.4,0-0.7,0-1s0-0.6,0.1-0.9s0.1-0.6,0.1-0.9
s0.1-0.7,0.2-1.1h-0.4c-0.7,1.4-1.5,2.7-2.4,4c-0.8,1-1.7,2-2.7,2.7c-0.9,0.7-1.9,1.2-3,1.6c-1.1,0.3-2.3,0.5-3.5,0.5
c-1.4,0-2.8-0.3-4-0.9c-1.1-0.6-2-1.4-2.8-2.4c-0.8-1.1-1.3-2.3-1.6-3.6c-0.3-1.4-0.5-2.8-0.5-4.3c0-1.7,0.2-3.4,0.5-5
c0.8-3.6,2.2-7,4.3-10c1-1.5,2.3-2.8,3.7-4c1.4-1.2,3-2.1,4.6-2.8c1.8-0.7,3.7-1,5.6-1c1.1,0,2.2,0.1,3.3,0.4c1,0.2,1.9,0.6,2.8,1.1
c0.1-0.2,0.1-0.6,0.2-0.9s0.1-0.7,0.2-1s0.1-0.7,0.2-1l0.2-0.7l0.5-2.4c0.1-0.2,0.1-0.5,0.2-0.8s0.1-0.5,0.1-0.8s0.1-0.5,0.1-0.6
s0-0.3,0-0.4c0-0.5,0-0.9-0.2-1.3c-0.1-0.3-0.3-0.6-0.6-0.8c-0.3-0.2-0.6-0.3-1-0.4c-0.5-0.1-1-0.1-1.5-0.1h-1.4l0.6-3.2h14.7
L263.8,41.8z M243,44.4c0,1,0.1,2,0.2,2.9c0.1,0.7,0.4,1.3,0.7,1.9c0.2,0.4,0.6,0.8,1,1c0.4,0.2,0.9,0.3,1.3,0.3
c1-0.1,2-0.5,2.8-1.2c1-0.9,1.9-1.9,2.7-3c0.9-1.3,1.6-2.8,2.2-4.3c0.7-1.6,1.2-3.2,1.5-4.9l2.1-10.1c-0.5-0.6-1.1-1-1.8-1.3
c-0.7-0.3-1.5-0.4-2.2-0.4c-1.1,0-2.2,0.3-3.2,0.9c-1,0.7-1.9,1.5-2.6,2.5c-0.8,1.1-1.5,2.3-2.1,3.5c-0.6,1.3-1.1,2.7-1.5,4.1
c-0.4,1.4-0.7,2.8-0.9,4.2C243.1,41.9,243,43.2,243,44.4z"/>
<rect x="291.1" class="st1" width="212.2" height="62.4"/>
<path class="st0" d="M328.3,21.9c0,1.4-0.3,2.7-1,3.9c-0.4,0.8-0.8,1.5-1.4,2.2c-0.6,0.8-1.3,1.6-2.1,2.5s-1.8,1.9-2.9,3
s-2.4,2.3-3.8,3.7l-4.3,4.1h10.1c0.8,0,1.6-0.3,2.3-0.8c0.7-0.6,1.1-1.4,1.3-2.2l0.4-1.3h2.6l-0.2,9.1h-20.4v-4.5l6.4-6.5
c1.2-1.2,2.3-2.4,3.3-3.7c0.8-1,1.4-2,2-3.2c0.5-1,0.8-2,1-3c0.2-1,0.3-2.1,0.3-3.1c0.1-1.3-0.2-2.5-0.9-3.6
c-0.6-0.8-1.5-1.2-2.5-1.1c-1.3-0.1-2.6,0.7-3.1,1.9c-0.7,1.8-1,3.7-0.9,5.6c-0.8,0-1.5-0.1-2.2-0.2c-0.6-0.1-1.2-0.4-1.8-0.7
c-0.5-0.3-0.9-0.8-1.1-1.3c-0.3-0.6-0.4-1.3-0.4-2c0-0.8,0.2-1.6,0.6-2.2c0.4-0.7,1.1-1.4,1.8-1.9c0.9-0.6,1.9-1,3-1.3
c1.4-0.3,2.8-0.5,4.2-0.5c1.4,0,2.9,0.1,4.3,0.5c1.1,0.3,2.2,0.8,3.1,1.4c0.8,0.6,1.5,1.4,1.9,2.3C328.1,19.8,328.3,20.8,328.3,21.9
z"/>
<path class="st0" d="M363.4,46.5c-2.4,0-4.8-0.3-7-1.2c-1.9-0.7-3.6-1.8-5-3.2c-1.4-1.4-2.4-3.1-3-5c-0.7-2.1-1-4.3-1-6.5
c0-2.2,0.3-4.4,1-6.4c1.3-3.8,4.3-6.9,8.1-8.3c2.2-0.8,4.6-1.2,7-1.2c1.6,0,3.2,0.1,4.7,0.4c1.2,0.2,2.4,0.5,3.5,1
c0.8,0.4,1.5,0.9,2,1.6c0.4,0.6,0.7,1.3,0.7,2c0,0.5-0.1,1-0.4,1.4c-0.3,0.5-0.6,0.9-1.1,1.2c-0.5,0.4-1.1,0.6-1.8,0.8
c-0.8,0.2-1.6,0.3-2.4,0.3c0-0.8-0.1-1.6-0.3-2.4c-0.2-0.7-0.5-1.3-1-1.9c-0.5-0.5-1-1-1.7-1.2c-0.8-0.3-1.6-0.5-2.4-0.4
c-1.4,0-2.8,0.3-4,0.9c-1.1,0.6-2.1,1.5-2.7,2.5c-0.8,1.3-1.3,2.7-1.5,4.1c-0.3,1.8-0.5,3.7-0.5,5.6c0,1.9,0.1,3.7,0.5,5.6
c0.3,1.4,0.8,2.8,1.6,4.1c0.7,1.1,1.7,1.9,2.9,2.5c1.4,0.6,2.8,0.9,4.3,0.9c0.5,0,1.1,0,1.6-0.1c0.5,0,1.1-0.1,1.6-0.2v-6.4
c0.1-0.9-0.2-1.8-0.8-2.4c-0.7-0.5-1.5-0.7-2.3-0.7h-0.6v-2.3h13.6v2.3h-0.6c-0.4,0-0.8,0-1.1,0.2c-0.3,0.1-0.6,0.3-0.8,0.5
c-0.2,0.3-0.4,0.6-0.5,1c-0.1,0.5-0.2,1-0.1,1.6v7.1C370.7,45.7,367,46.5,363.4,46.5L363.4,46.5z"/>
<path class="st0" d="M382.6,46.1v-2.3h1.8c0.3,0,0.6,0,0.9-0.1c0.3-0.1,0.5-0.2,0.7-0.4c0.2-0.2,0.4-0.5,0.5-0.8
c0.1-0.5,0.2-1,0.2-1.5V20.3c0-0.5,0-1-0.2-1.5c-0.1-0.3-0.2-0.6-0.5-0.8c-0.2-0.2-0.4-0.3-0.7-0.4c-0.3-0.1-0.6-0.1-0.9-0.1h-1.8
v-2.3h15v2.3h-1.8c-0.3,0-0.6,0-0.9,0.1c-0.3,0.1-0.5,0.2-0.7,0.4c-0.2,0.2-0.4,0.5-0.5,0.8c-0.1,0.5-0.2,1-0.2,1.5V41
c0,0.5,0,1,0.2,1.5c0.1,0.3,0.2,0.6,0.5,0.8c0.2,0.2,0.4,0.3,0.7,0.4c0.3,0.1,0.6,0.1,0.9,0.1h1.8v2.3L382.6,46.1z"/>
<path class="st0" d="M403,43.8h1.8c0.3,0,0.6,0,0.8-0.1c0.3,0,0.5-0.2,0.7-0.3c0.2-0.2,0.4-0.5,0.5-0.8c0.1-0.5,0.2-0.9,0.1-1.4
V20.1c0-0.5,0-0.9-0.2-1.4c-0.1-0.3-0.3-0.6-0.5-0.8c-0.2-0.2-0.4-0.3-0.7-0.4c-0.3-0.1-0.6-0.1-0.8-0.1H403v-2.3h14
c4.1,0,7.1,0.7,9,2.1c1.9,1.4,3,3.6,2.9,6c0,1-0.2,2-0.5,3c-0.3,0.8-0.8,1.6-1.3,2.3c-0.5,0.7-1.2,1.2-1.9,1.7
c-0.7,0.4-1.4,0.8-2.2,1.1l5.2,8.9c0.3,0.6,0.7,1.1,1.1,1.6c0.3,0.4,0.6,0.8,1,1.1c0.3,0.3,0.7,0.5,1.1,0.6c0.4,0.1,0.8,0.2,1.2,0.2
h0.2v2.3h-1.4c-1.3,0-2.4,0-3.4-0.1c-0.9-0.1-1.7-0.3-2.5-0.6c-0.7-0.3-1.3-0.7-1.9-1.2c-0.6-0.6-1.1-1.3-1.5-2l-5.1-9.5h-2.9v8.5
c0,0.5,0,0.9,0.2,1.4c0.1,0.3,0.3,0.6,0.5,0.8c0.2,0.2,0.4,0.3,0.7,0.3c0.3,0.1,0.6,0.1,0.8,0.1h1.9V46h-15V43.8z M413.9,30.2h2.4
c0.9,0,1.7-0.1,2.5-0.4c0.6-0.2,1.2-0.7,1.6-1.2c0.4-0.6,0.7-1.3,0.9-2c0.2-0.9,0.3-1.8,0.3-2.8c0-0.9-0.1-1.9-0.3-2.8
c-0.2-0.7-0.5-1.3-0.9-1.9c-0.4-0.5-1-0.9-1.6-1.1c-0.8-0.2-1.6-0.3-2.5-0.3h-2.4V30.2z"/>
<path class="st0" d="M436.7,46.1v-2.3h1.8c0.3,0,0.6,0,0.9-0.1c0.3-0.1,0.5-0.2,0.7-0.4c0.2-0.2,0.4-0.5,0.5-0.8
c0.1-0.5,0.2-1,0.2-1.5V20.3c0-0.5,0-1-0.2-1.5c-0.1-0.3-0.2-0.6-0.5-0.8c-0.2-0.2-0.4-0.3-0.7-0.4c-0.3-0.1-0.6-0.1-0.9-0.1h-1.8
v-2.3h15v2.3h-1.8c-0.3,0-0.6,0-0.9,0.1c-0.3,0.1-0.5,0.2-0.7,0.4c-0.2,0.2-0.4,0.5-0.5,0.8c-0.1,0.5-0.2,0.9-0.2,1.4v23.4h8.1
c0.9,0,1.8-0.3,2.4-1c0.6-0.8,1.1-1.8,1.2-2.8l0.7-3.3h2.4l-0.3,9.7L436.7,46.1z"/>
<path class="st0" d="M478.3,46.5c-1.6,0-3.3-0.2-4.9-0.6c-1.1-0.3-2.2-0.8-3.1-1.4c-1.3-0.9-2.2-2.5-2.2-4.1c0-0.7,0.1-1.3,0.4-1.9
c0.3-0.5,0.6-0.9,1.1-1.2c0.5-0.3,1-0.6,1.6-0.7c0.6-0.1,1.2-0.2,1.8-0.2c0,1.1,0.1,2.2,0.4,3.3c0.3,0.9,0.7,1.7,1.2,2.3
c0.5,0.6,1.1,1.1,1.9,1.4c0.8,0.3,1.6,0.5,2.4,0.5c0.8,0,1.5-0.1,2.3-0.4c0.6-0.2,1.2-0.6,1.7-1c0.5-0.4,0.8-0.9,1.1-1.5
c0.2-0.6,0.4-1.2,0.4-1.8c0-0.7-0.1-1.4-0.4-2c-0.3-0.6-0.8-1.2-1.3-1.6c-0.7-0.5-1.5-1-2.3-1.4c-0.9-0.4-2-0.9-3.2-1.4
c-1.3-0.5-2.6-1.2-3.8-1.9c-0.9-0.6-1.8-1.3-2.5-2.1c-0.6-0.7-1.1-1.6-1.4-2.5c-0.3-0.9-0.4-1.9-0.4-2.9c0-1.2,0.3-2.5,0.8-3.6
c0.5-1.1,1.3-2,2.3-2.7c1-0.8,2.1-1.4,3.4-1.8c1.4-0.4,2.8-0.6,4.2-0.6c1.4,0,2.8,0.1,4.1,0.4c1,0.2,2,0.6,2.8,1.1
c0.7,0.4,1.3,0.9,1.7,1.6c0.4,0.6,0.6,1.3,0.5,2c0,0.5-0.1,1-0.3,1.4c-0.2,0.5-0.6,0.8-1,1.1c-0.5,0.4-1.1,0.6-1.7,0.8
c-0.8,0.2-1.5,0.3-2.3,0.3c0-0.7-0.1-1.3-0.2-2c-0.1-0.7-0.4-1.4-0.8-2c-0.4-0.6-0.9-1.1-1.4-1.4c-0.6-0.4-1.4-0.6-2.1-0.6
c-0.6,0-1.1,0.1-1.7,0.2c-0.5,0.2-1,0.4-1.4,0.8c-0.4,0.3-0.7,0.8-0.9,1.3c-0.2,0.5-0.4,1.1-0.3,1.7c0,0.6,0.1,1.2,0.3,1.7
c0.2,0.6,0.6,1.1,1.1,1.6c0.7,0.6,1.4,1.1,2.2,1.5c1.2,0.6,2.4,1.2,3.6,1.7c1.3,0.5,2.6,1.1,3.8,1.9c0.9,0.5,1.8,1.2,2.6,2
c0.7,0.7,1.2,1.6,1.5,2.5c0.3,0.9,0.5,1.9,0.5,2.9c0,1.3-0.3,2.6-0.8,3.8c-0.6,1.2-1.4,2.2-2.4,3c-1.1,0.9-2.4,1.6-3.7,2
C481.6,46.4,479.9,46.6,478.3,46.5z"/>
</svg>

After

Width:  |  Height:  |  Size: 14 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

View File

@ -465,6 +465,13 @@ const networks = [
description: 'XEmpire.com brings you today\'s top pornstars in beautifully shot, HD sex scenes across 4 unique porn sites of gonzo porn, interracial, lesbian & erotica!',
parent: 'gamma',
},
{
slug: 'zerotolerance',
name: 'Zero Tolerance',
alias: ['ztod'],
url: 'http://www.ztod.com',
parent: 'gamma',
},
];
exports.seed = knex => Promise.resolve()

View File

@ -8555,6 +8555,27 @@ const sites = [
tags: ['lesbian'],
parent: 'xempire',
},
// ZERO TOLERANCE
{
slug: 'addicted2girls',
name: 'Addicted 2 Girls',
url: 'https://www.addicted2girls.com',
tags: ['lesbian'],
parent: 'zerotolerance',
parameters: {
scene: 'https://www.addicted2girls.com/en/video/addicted2girls',
},
},
{
slug: 'genderx',
name: 'GenderX',
url: 'https://www.genderx.com',
tags: ['transsexual'],
parent: 'zerotolerance',
parameters: {
scene: 'https://www.genderx.com/en/video',
},
},
];
/* eslint-disable max-len */
@ -8645,7 +8666,6 @@ exports.seed = knex => Promise.resolve()
'tog' => 'TonightsGirlfriend',
'wowg' => 'WowGirls',
'wy' => 'WebYoung',
'ztod' => 'ZeroTolerance',
'itc' => 'InTheCrack',
"abbw" => "AbbyWinters",
"abme" => "AbuseMe",

View File

@ -302,9 +302,8 @@ async function curateProfile(profile) {
curatedProfile.piercings = profile.piercings?.trim() || null;
curatedProfile.gender = (/female/i.test(profile.gender) && 'female')
|| (/shemale/i.test(profile.gender) && 'transsexual')
|| (/shemale|trans/i.test(profile.gender) && 'transsexual')
|| (/male/i.test(profile.gender) && 'male')
|| (/trans/i.test(profile.gender) && 'transsexual')
|| null;
const dateOfBirth = profile.dateOfBirth || profile.birthdate;
@ -725,15 +724,14 @@ async function getOrCreateActors(baseActors, batchId) {
},
}), {});
const newActorProfiles = baseActors
const newActorProfiles = await Promise.all(baseActors
.filter(actor => actor.hasProfile)
.map(actor => ({
...actor,
id: newActorIdsByEntityIdAndSlug[actor.entity?.id]?.[actor.slug] || newActorIdsByEntityIdAndSlug.null?.[actor.slug],
}))
.filter(actor => !!actor.id);
console.log(newActorIdsByEntityIdAndSlug, newActorProfiles);
.filter(actor => !!actor.id)
.map(actor => curateProfile(actor)));
await storeProfiles(newActorProfiles);

View File

@ -9,6 +9,7 @@ const moment = require('moment');
const logger = require('../logger')(__filename);
const { ex, get } = require('../utils/q');
const http = require('../utils/http');
const slugify = require('../utils/slugify');
function getAlbumUrl(albumPath, site) {
@ -398,7 +399,7 @@ async function fetchApiCredentials(referer, site) {
return getApiUrl(site.parameters.appId, site.parameters.apiKey);
}
const res = await bhttp.get(referer);
const res = await http.get(referer);
const body = res.body.toString();
const apiLine = body.split('\n').find(bodyLine => bodyLine.match('apiKey'));
@ -433,6 +434,8 @@ async function fetchApiLatest(site, page = 1, preData, include, upcoming = false
encodeJSON: true,
});
console.log(page, res.statusCode, res.body.results);
if (res.statusCode === 200 && res.body.results?.[0]?.hits) {
return scrapeApiReleases(res.body.results[0].hits, site);
}
@ -530,6 +533,7 @@ async function fetchScene(url, site, baseRelease) {
if (res.statusCode === 200) {
const mobileBody = mobileRes?.statusCode === 200 ? mobileRes.body.toString() : null;
const scene = await scrapeScene(res.body.toString(), url, site, baseRelease, mobileBody);
return { ...scene, deepUrl };
}
}

View File

@ -66,6 +66,7 @@ const vixen = require('./vixen');
const vogov = require('./vogov');
const wicked = require('./wicked');
const xempire = require('./xempire');
const zerotolerance = require('./zerotolerance');
// profiles
const boobpedia = require('./boobpedia');
@ -151,6 +152,7 @@ module.exports = {
whalemember,
wicked,
xempire,
zerotolerance,
},
actors: {
'21sextury': sextury,

View File

@ -0,0 +1,10 @@
'use strict';
const { fetchApiLatest, fetchApiUpcoming, fetchScene, fetchApiProfile } = require('./gamma');
module.exports = {
fetchLatest: fetchApiLatest,
fetchProfile: fetchApiProfile,
fetchScene,
fetchUpcoming: fetchApiUpcoming,
};

View File

@ -49,7 +49,7 @@ function needNextPage(releases, uniqueReleases, totalReleases, hasDates, upcomin
}
if (argv.last) {
return totalReleases + releases.length < argv.last;
return releases.length > 0 && totalReleases + releases.length < argv.last;
}
if (!hasDates) {