Compare commits
4 Commits
e105d665ae
...
b719a166d2
Author | SHA1 | Date |
---|---|---|
|
b719a166d2 | |
|
297f79f6e2 | |
|
af59ad3d33 | |
|
3573b84c97 |
|
@ -328,6 +328,8 @@
|
|||
v-if="actor.avatar || (actor.photos && actor.photos.length > 0)"
|
||||
v-slot="scroll"
|
||||
:expandable="false"
|
||||
:album="true"
|
||||
:items="actor.photos"
|
||||
@album="showAlbum = true"
|
||||
>
|
||||
<Photos
|
||||
|
|
|
@ -50,6 +50,12 @@
|
|||
class="expand-dark"
|
||||
@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>
|
||||
</template>
|
||||
|
||||
|
@ -111,6 +117,10 @@ export default {
|
|||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
album: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
items: {
|
||||
type: Array,
|
||||
default: null,
|
||||
|
|
|
@ -209,12 +209,12 @@ module.exports = {
|
|||
'www.tushy.com',
|
||||
'www.tushyraw.com',
|
||||
'www.deeper.com',
|
||||
'https://sthw-trailer-vixen.ssl-cdn.com',
|
||||
'https://sthw-trailer-tushy.ssl-cdn.com',
|
||||
'https://sthw-trailer-tushyraw.ssl-cdn.com',
|
||||
'https://sthw-trailer-blacked.ssl-cdn.com',
|
||||
'https://sthw-trailer-blackedraw.ssl-cdn.com',
|
||||
'https://sthw-trailer-deeper.ssl-cdn.com',
|
||||
'sthw-trailer-vixen.ssl-cdn.com',
|
||||
'sthw-trailer-tushy.ssl-cdn.com',
|
||||
'sthw-trailer-tushyraw.ssl-cdn.com',
|
||||
'sthw-trailer-blacked.ssl-cdn.com',
|
||||
'sthw-trailer-blackedraw.ssl-cdn.com',
|
||||
'sthw-trailer-deeper.ssl-cdn.com',
|
||||
],
|
||||
},
|
||||
limits: {
|
||||
|
@ -236,7 +236,7 @@ module.exports = {
|
|||
thumbnailQuality: 100,
|
||||
lazySize: 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
|
||||
streamConcurrency: 2, // max number of video streams (m3u8 etc.) to fetch and process at once
|
||||
},
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "traxxx",
|
||||
"version": "1.159.4",
|
||||
"version": "1.159.5",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "traxxx",
|
||||
"version": "1.159.4",
|
||||
"version": "1.159.5",
|
||||
"description": "All the latest porn releases in one place",
|
||||
"main": "src/app.js",
|
||||
"scripts": {
|
||||
|
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 9.4 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.4 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 45 KiB |
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 46 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.6 KiB |
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
24
src/media.js
|
@ -152,12 +152,34 @@ function baseSourceToBaseMedia(baseSource, role, metadata) {
|
|||
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) {
|
||||
const baseSources = rawMedia
|
||||
.map(source => toBaseSource(source))
|
||||
.filter(Boolean);
|
||||
|
||||
return baseSourceToBaseMedia(baseSources, role, metadata);
|
||||
const sortedBaseSources = sortBaseTrailersByQuality(baseSources, role);
|
||||
|
||||
return baseSourceToBaseMedia(sortedBaseSources, role, metadata);
|
||||
}
|
||||
|
||||
function toBaseMedias(rawMedias, role, metadata) {
|
||||
|
|