Compare commits

..

4 Commits

Author SHA1 Message Date
DebaucheryLibrarian b719a166d2 1.159.5 2021-01-24 20:43:40 +01:00
DebaucheryLibrarian 297f79f6e2 Restored sorting trailers by quality. 2021-01-24 20:43:34 +01:00
DebaucheryLibrarian af59ad3d33 Fixed dark Private logos. 2021-01-24 17:44:34 +01:00
DebaucheryLibrarian 3573b84c97 Removed protocol from Vixen trailer proxy config. 2021-01-24 17:33:42 +01:00
48 changed files with 44 additions and 10 deletions

View File

@ -328,6 +328,8 @@
v-if="actor.avatar || (actor.photos && actor.photos.length > 0)" v-if="actor.avatar || (actor.photos && actor.photos.length > 0)"
v-slot="scroll" v-slot="scroll"
:expandable="false" :expandable="false"
:album="true"
:items="actor.photos"
@album="showAlbum = true" @album="showAlbum = true"
> >
<Photos <Photos

View File

@ -50,6 +50,12 @@
class="expand-dark" class="expand-dark"
@expand="(state) => $emit('expand', state)" @expand="(state) => $emit('expand', state)"
/> />
<button
v-if="album && items && items.length > 0 && scrollable"
class="album-toggle"
@click="showAlbum = true"
><Icon icon="grid3" />View album</button>
</div> </div>
</template> </template>
@ -111,6 +117,10 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
album: {
type: Boolean,
default: false,
},
items: { items: {
type: Array, type: Array,
default: null, default: null,

View File

@ -209,12 +209,12 @@ module.exports = {
'www.tushy.com', 'www.tushy.com',
'www.tushyraw.com', 'www.tushyraw.com',
'www.deeper.com', 'www.deeper.com',
'https://sthw-trailer-vixen.ssl-cdn.com', 'sthw-trailer-vixen.ssl-cdn.com',
'https://sthw-trailer-tushy.ssl-cdn.com', 'sthw-trailer-tushy.ssl-cdn.com',
'https://sthw-trailer-tushyraw.ssl-cdn.com', 'sthw-trailer-tushyraw.ssl-cdn.com',
'https://sthw-trailer-blacked.ssl-cdn.com', 'sthw-trailer-blacked.ssl-cdn.com',
'https://sthw-trailer-blackedraw.ssl-cdn.com', 'sthw-trailer-blackedraw.ssl-cdn.com',
'https://sthw-trailer-deeper.ssl-cdn.com', 'sthw-trailer-deeper.ssl-cdn.com',
], ],
}, },
limits: { limits: {
@ -236,7 +236,7 @@ module.exports = {
thumbnailQuality: 100, thumbnailQuality: 100,
lazySize: 90, lazySize: 90,
lazyQuality: 90, lazyQuality: 90,
videoQuality: [480, 360, 320, 540, 720, 1080, 2160, 270, 240, 180], trailerQuality: [480, 720, 360, 1080, 320, 540, 2160, 270, 240, 180],
limit: 25, // max number of photos per release limit: 25, // max number of photos per release
streamConcurrency: 2, // max number of video streams (m3u8 etc.) to fetch and process at once streamConcurrency: 2, // max number of video streams (m3u8 etc.) to fetch and process at once
}, },

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.159.4", "version": "1.159.5",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.159.4", "version": "1.159.5",
"description": "All the latest porn releases in one place", "description": "All the latest porn releases in one place",
"main": "src/app.js", "main": "src/app.js",
"scripts": { "scripts": {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -152,12 +152,34 @@ function baseSourceToBaseMedia(baseSource, role, metadata) {
return null; return null;
} }
function sortBaseTrailersByQuality(sources, role) {
if (role === 'trailers') {
const sortedSources = sources.sort((sourceA, sourceB) => {
if (config.media.trailerQuality.indexOf(sourceA.quality) > config.media.trailerQuality.indexOf(sourceB.quality)) {
return 1;
}
if (config.media.trailerQuality.indexOf(sourceA.quality) < config.media.trailerQuality.indexOf(sourceB.quality)) {
return -1;
}
return 0;
});
return sortedSources;
}
return sources;
}
function fallbackMediaToBaseMedia(rawMedia, role, metadata) { function fallbackMediaToBaseMedia(rawMedia, role, metadata) {
const baseSources = rawMedia const baseSources = rawMedia
.map(source => toBaseSource(source)) .map(source => toBaseSource(source))
.filter(Boolean); .filter(Boolean);
return baseSourceToBaseMedia(baseSources, role, metadata); const sortedBaseSources = sortBaseTrailersByQuality(baseSources, role);
return baseSourceToBaseMedia(sortedBaseSources, role, metadata);
} }
function toBaseMedias(rawMedias, role, metadata) { function toBaseMedias(rawMedias, role, metadata) {