DebaucheryLibrarian
/
traxxx
2
1
Fork 1
Code Issues 39 Pull Requests 1 Releases Wiki Activity

Compare commits

base: DebaucheryLibrarian:6e4320877860aaf9e898061b5ddcc5aa7923b3fe
Branches Tags
DebaucheryLibrarian:master
DebaucheryLibrarian:old
DebaucheryLibrarian:experimental
..
compare: DebaucheryLibrarian:d0d3d150ee2f339c1bb217f349251b06ab8fe391
Branches Tags
DebaucheryLibrarian:master
DebaucheryLibrarian:old
DebaucheryLibrarian:experimental

No commits in common. "6e4320877860aaf9e898061b5ddcc5aa7923b3fe" and "d0d3d150ee2f339c1bb217f349251b06ab8fe391" have entirely different histories.
6e43208778 ... d0d3d150ee

19 changed files with 43 additions and 159 deletions
Show Stats Expand all files Collapse all files

63
assets/components/header/filter-bar.vue
View File

@ -3,80 +3,47 @@
<span> <span>
<label class="range"> <label class="range">
<input <input
:id="`${_uid}-range-latest`" :id="`${_uid}-new`"
:checked="range === 'latest'" :checked="range === 'new'"
type="radio" type="radio"
class="range-input" class="range-input"
@click="setRange('latest')" @click="setRange('new')"
> >
<label <label
:for="`${_uid}-range-latest`" :for="`${_uid}-new`"
class="range-button" class="range-button"
>Latest</label> >New</label>
</label> </label>
<label class="range"> <label class="range">
<input <input
:id="`${_uid}-range-upcoming`" :id="`${_uid}-upcoming`"
:checked="range === 'upcoming'" :checked="range === 'upcoming'"
type="radio" type="radio"
class="range-input" class="range-input"
@click="setRange('upcoming')" @click="setRange('upcoming')"
> >
<label <label
:for="`${_uid}-range-upcoming`" :for="`${_uid}-upcoming`"
class="range-button" class="range-button"
>Upcoming</label> >Upcoming</label>
</label> </label>
<label class="range"> <label class="range">
<input <input
:id="`${_uid}-range-all`" :id="`${_uid}-all`"
:checked="range === 'all'" :checked="range === 'all'"
type="radio" type="radio"
class="range-input" class="range-input"
@click="setRange('all')" @click="setRange('all')"
> >
<label <label
:for="`${_uid}-range-all`" :for="`${_uid}-all`"
class="range-button" class="range-button"
>All</label> >All</label>
</label> </label>
</span> </span>
<span>
<label class="batch">
<input
:id="`${_uid}-batch-all`"
:checked="batch === 'all'"
type="radio"
class="range-input"
@click="setBatch('all')"
>
<label
:for="`${_uid}-batch-all`"
class="range-button"
>All</label>
</label>
<label
v-tooltip="'Only show newly added'"
class="batch"
>
<input
:id="`${_uid}-batch-new`"
:checked="batch === 'new'"
type="radio"
class="range-input"
@click="setBatch('new')"
>
<label
:for="`${_uid}-batch-new`"
class="range-button"
>New</label>
</label>
</span>
<span> <span>
<span class="filters-container"> <span class="filters-container">
<Icon icon="filter" /> <Icon icon="filter" />
@ -115,10 +82,6 @@ function range(state) {
return state.ui.range; return state.ui.range;
} }
function batch(state) {
return state.ui.batch;
}
async function setFilter(newFilter) { async function setFilter(newFilter) {
this.$store.dispatch('setFilter', newFilter); this.$store.dispatch('setFilter', newFilter);
@ -131,12 +94,6 @@ async function setRange(newRange) {
await this.fetchReleases(); await this.fetchReleases();
} }
async function setBatch(newBatch) {
this.$store.dispatch('setBatch', newBatch);
await this.fetchReleases();
}
export default { export default {
components: { components: {
Filters, Filters,
@ -151,13 +108,11 @@ export default {
...mapState({ ...mapState({
filter, filter,
range, range,
batch,
}), }),
}, },
methods: { methods: {
setFilter, setFilter,
setRange, setRange,
setBatch,
}, },
}; };
</script> </script>

32
assets/components/tile/release.vue
View File

@ -44,7 +44,7 @@
v-tooltip.bottom="release.url && `View scene on ${release.site.name}`" v-tooltip.bottom="release.url && `View scene on ${release.site.name}`"
:title="release.url && `View scene on ${release.site.name}`" :title="release.url && `View scene on ${release.site.name}`"
:href="release.url" :href="release.url"
:class="{ upcoming: isAfter(release.date, new Date()), new: release.isNew }" :class="{ upcoming: isAfter(release.date, new Date()) }"
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
class="date" class="date"
@ -53,7 +53,7 @@
<a <a
v-else v-else
:href="release.url" :href="release.url"
:class="{ upcoming: isAfter(release.date, new Date()), new: release.isNew }" :class="{ upcoming: isAfter(release.date, new Date()) }"
title="Scene date N/A, showing date added" title="Scene date N/A, showing date added"
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
@ -224,21 +224,19 @@ export default {
text-decoration: none; text-decoration: none;
} }
.date { .date.upcoming:before {
&.upcoming:before { content: '';
content: ''; color: $text-contrast;
background: $primary; background: $primary;
width: .5rem; width: .25rem;
display: inline-block; display: inline-block;
position: absolute; position: absolute;
top: 0; top: 0;
bottom: 0; bottom: 0;
left: -.5rem; left: -.75rem;
} padding: .25rem;
font-size: .8rem;
&.new { font-weight: bold;
font-weight: bold;
}
} }
.site { .site {

6
assets/js/actors/actions.js
View File

@ -52,7 +52,6 @@ function initActorActions(store, _router) {
$limit:Int = 1000, $limit:Int = 1000,
$after:Date = "1900-01-01", $after:Date = "1900-01-01",
$before:Date = "2100-01-01", $before:Date = "2100-01-01",
$isNew:[Boolean!] = [true,false]
$orderBy:[ReleasesActorsOrderBy!] $orderBy:[ReleasesActorsOrderBy!]
$exclude: [String!] $exclude: [String!]
) { ) {
@ -133,9 +132,6 @@ function initActorActions(store, _router) {
} }
} }
} }
isNew: {
in: $isNew
}
} }
}, },
first: $limit, first: $limit,
@ -171,7 +167,6 @@ function initActorActions(store, _router) {
limit, limit,
after: store.getters.after, after: store.getters.after,
before: store.getters.before, before: store.getters.before,
isNew: store.getters.isNew,
orderBy: store.state.ui.range === 'upcoming' ? 'RELEASE_BY_RELEASE_ID__DATE_ASC' : 'RELEASE_BY_RELEASE_ID__DATE_DESC', orderBy: store.state.ui.range === 'upcoming' ? 'RELEASE_BY_RELEASE_ID__DATE_ASC' : 'RELEASE_BY_RELEASE_ID__DATE_DESC',
exclude: store.state.ui.filter, exclude: store.state.ui.filter,
}); });
@ -188,6 +183,7 @@ function initActorActions(store, _router) {
if (actorSlug) { if (actorSlug) {
return fetchActorBySlug(actorSlug); return fetchActorBySlug(actorSlug);
} }
console.log(genders);
const { actors } = await graphql(` const { actors } = await graphql(`
query Actors( query Actors(

5
assets/js/fragments.js
View File

@ -125,6 +125,7 @@ const releaseFields = `
date date
slug slug
type type
batch
createdAt createdAt
url url
${releaseActorsFragment} ${releaseActorsFragment}
@ -138,7 +139,6 @@ const releaseFields = `
slug slug
url url
} }
isNew
`; `;
const releasesFragment = ` const releasesFragment = `
@ -157,9 +157,6 @@ const releasesFragment = `
} }
} }
} }
isNew: {
in: $isNew
}
}, },
first: $limit, first: $limit,
orderBy: $orderBy, orderBy: $orderBy,

7
assets/js/networks/actions.js
View File

@ -12,7 +12,6 @@ function initNetworksActions(store, _router) {
$before:Date = "2100-01-01", $before:Date = "2100-01-01",
$afterTime:Datetime = "1900-01-01", $afterTime:Datetime = "1900-01-01",
$beforeTime:Datetime = "2100-01-01", $beforeTime:Datetime = "2100-01-01",
$isNew:[Boolean!] = [true,false]
$orderBy: [ReleasesOrderBy!] $orderBy: [ReleasesOrderBy!]
$exclude: [String!] $exclude: [String!]
) { ) {
@ -89,7 +88,7 @@ function initNetworksActions(store, _router) {
greaterThan: $afterTime, greaterThan: $afterTime,
} }
} }
] ],
releasesTags: { releasesTags: {
none: { none: {
tag: { tag: {
@ -99,9 +98,6 @@ function initNetworksActions(store, _router) {
} }
} }
} }
isNew: {
in: $isNew
}
} }
) { ) {
${releaseFields} ${releaseFields}
@ -114,7 +110,6 @@ function initNetworksActions(store, _router) {
before: store.getters.before, before: store.getters.before,
afterTime: store.getters.after, afterTime: store.getters.after,
beforeTime: store.getters.before, beforeTime: store.getters.before,
isNew: store.getters.isNew,
orderBy: store.state.ui.range === 'upcoming' ? 'DATE_ASC' : 'DATE_DESC', orderBy: store.state.ui.range === 'upcoming' ? 'DATE_ASC' : 'DATE_DESC',
exclude: store.state.ui.filter, exclude: store.state.ui.filter,
}); });

4
assets/js/releases/actions.js
View File

@ -9,7 +9,6 @@ function initReleasesActions(store, _router) {
$limit:Int = 1000, $limit:Int = 1000,
$after:Date = "1900-01-01", $after:Date = "1900-01-01",
$before:Date = "2100-01-01", $before:Date = "2100-01-01",
$isNew:[Boolean!] = [true,false]
$orderBy:[ReleasesOrderBy!], $orderBy:[ReleasesOrderBy!],
$exclude: [String!] $exclude: [String!]
) { ) {
@ -19,7 +18,6 @@ function initReleasesActions(store, _router) {
limit, limit,
after: store.getters.after, after: store.getters.after,
before: store.getters.before, before: store.getters.before,
isNew: store.getters.isNew,
orderBy: store.state.ui.range === 'upcoming' ? 'DATE_ASC' : 'DATE_DESC', orderBy: store.state.ui.range === 'upcoming' ? 'DATE_ASC' : 'DATE_DESC',
exclude: store.state.ui.filter, exclude: store.state.ui.filter,
}); });
@ -43,7 +41,7 @@ function initReleasesActions(store, _router) {
slug slug
date date
url url
isNew batch
site { site {
id id
slug slug

2
assets/js/sites/actions.js
View File

@ -10,7 +10,6 @@ function initSitesActions(store, _router) {
$limit:Int = 100, $limit:Int = 100,
$after:Date = "1900-01-01", $after:Date = "1900-01-01",
$before:Date = "2100-01-01", $before:Date = "2100-01-01",
$isNew:[Boolean!] = [true,false]
$orderBy:[ReleasesOrderBy!] $orderBy:[ReleasesOrderBy!]
$exclude: [String!] $exclude: [String!]
) { ) {
@ -39,7 +38,6 @@ function initSitesActions(store, _router) {
limit, limit,
after: store.getters.after, after: store.getters.after,
before: store.getters.before, before: store.getters.before,
isNew: store.getters.isNew,
orderBy: store.state.ui.range === 'upcoming' ? 'DATE_ASC' : 'DATE_DESC', orderBy: store.state.ui.range === 'upcoming' ? 'DATE_ASC' : 'DATE_DESC',
exclude: store.state.ui.filter, exclude: store.state.ui.filter,
}); });

5
assets/js/tags/actions.js
View File

@ -12,7 +12,6 @@ function initTagsActions(store, _router) {
$limit:Int = 1000, $limit:Int = 1000,
$after:Date = "1900-01-01", $after:Date = "1900-01-01",
$before:Date = "2100-01-01", $before:Date = "2100-01-01",
$isNew:[Boolean!] = [true,false]
$orderBy: [ReleasesTagsOrderBy!], $orderBy: [ReleasesTagsOrderBy!],
$exclude: [String!] $exclude: [String!]
) { ) {
@ -57,9 +56,6 @@ function initTagsActions(store, _router) {
} }
} }
} }
isNew: {
in: $isNew
}
} }
}, },
first: $limit, first: $limit,
@ -76,7 +72,6 @@ function initTagsActions(store, _router) {
limit, limit,
after: store.getters.after, after: store.getters.after,
before: store.getters.before, before: store.getters.before,
isNew: store.getters.isNew,
orderBy: store.state.ui.range === 'upcoming' ? 'RELEASE_BY_RELEASE_ID__DATE_ASC' : 'RELEASE_BY_RELEASE_ID__DATE_DESC', orderBy: store.state.ui.range === 'upcoming' ? 'RELEASE_BY_RELEASE_ID__DATE_ASC' : 'RELEASE_BY_RELEASE_ID__DATE_DESC',
exclude: store.state.ui.filter, exclude: store.state.ui.filter,
}); });

6
assets/js/ui/actions.js
View File

@ -11,15 +11,9 @@ function initUiActions(_store, _router) {
localStorage.setItem('range', range); localStorage.setItem('range', range);
} }
function setBatch({ commit }, batch) {
commit('setBatch', batch);
localStorage.setItem('batch', batch);
}
return { return {
setFilter, setFilter,
setRange, setRange,
setBatch,
}; };
} }

7
assets/js/ui/getters.js
View File

@ -1,7 +1,7 @@
import dayjs from 'dayjs'; import dayjs from 'dayjs';
const dateRanges = { const dateRanges = {
latest: () => ({ new: () => ({
after: '1900-01-01', after: '1900-01-01',
before: dayjs(new Date()).add(1, 'day').format('YYYY-MM-DD'), before: dayjs(new Date()).add(1, 'day').format('YYYY-MM-DD'),
}), }),
@ -27,13 +27,8 @@ function after(state) {
return dateRanges[state.range]().after; return dateRanges[state.range]().after;
} }
function isNew(state) {
return state.batch === 'new' ? [true] : [true, false];
}
export default { export default {
rangeDates, rangeDates,
before, before,
after, after,
isNew,
}; };

5
assets/js/ui/mutations.js
View File

@ -6,12 +6,7 @@ function setRange(state, range) {
state.range = range; state.range = range;
} }
function setBatch(state, batch) {
state.batch = batch;
}
export default { export default {
setFilter, setFilter,
setRange, setRange,
setBatch,
}; };

4
assets/js/ui/state.js
View File

@ -1,9 +1,7 @@
const storedFilter = localStorage.getItem('filter'); const storedFilter = localStorage.getItem('filter');
const storedRange = localStorage.getItem('range'); const storedRange = localStorage.getItem('range');
const storedBatch = localStorage.getItem('batch');
export default { export default {
filter: storedFilter ? storedFilter.split(',') : ['gay', 'transsexual'], filter: storedFilter ? storedFilter.split(',') : ['gay', 'transsexual'],
range: storedRange || 'latest', range: storedRange || 'new',
batch: storedBatch || 'all',
}; };

21
migrations/20190325001339_releases.js
View File

@ -327,13 +327,6 @@ exports.up = knex => Promise.resolve()
table.datetime('created_at') table.datetime('created_at')
.defaultTo(knex.fn.now()); .defaultTo(knex.fn.now());
})) }))
.then(() => knex.schema.createTable('batches', (table) => {
table.increments('id', 12);
table.text('comment');
table.datetime('created_at')
.defaultTo(knex.fn.now());
}))
.then(() => knex.schema.createTable('releases', (table) => { .then(() => knex.schema.createTable('releases', (table) => {
table.increments('id', 16); table.increments('id', 16);
@ -369,14 +362,7 @@ exports.up = knex => Promise.resolve()
table.boolean('deep'); table.boolean('deep');
table.string('deep_url', 1000); table.string('deep_url', 1000);
table.integer('created_batch_id', 12) table.string('batch');
.references('id')
.inTable('batches');
table.integer('updated_batch_id', 12)
.references('id')
.inTable('batches');
table.datetime('created_at') table.datetime('created_at')
.defaultTo(knex.fn.now()); .defaultTo(knex.fn.now());
})) }))
@ -522,10 +508,6 @@ exports.up = knex => Promise.resolve()
url ILIKE ('%' || search || '%') url ILIKE ('%' || search || '%')
$$ LANGUAGE SQL STABLE; $$ LANGUAGE SQL STABLE;
CREATE FUNCTION releases_is_new(release releases) RETURNS boolean AS $$
SELECT NOT EXISTS(SELECT true FROM batches WHERE batches.id = release.created_batch_id + 1 LIMIT 1);
$$ LANGUAGE sql STABLE;
COMMENT ON COLUMN actors.height IS E'@omit read,update,create,delete,all,many'; COMMENT ON COLUMN actors.height IS E'@omit read,update,create,delete,all,many';
COMMENT ON COLUMN actors.weight IS E'@omit read,update,create,delete,all,many'; COMMENT ON COLUMN actors.weight IS E'@omit read,update,create,delete,all,many';
`)); `));
@ -545,7 +527,6 @@ exports.down = knex => knex.raw(`
DROP TABLE IF EXISTS releases_teasers CASCADE; DROP TABLE IF EXISTS releases_teasers CASCADE;
DROP TABLE IF EXISTS releases_tags CASCADE; DROP TABLE IF EXISTS releases_tags CASCADE;
DROP TABLE IF EXISTS releases_search CASCADE; DROP TABLE IF EXISTS releases_search CASCADE;
DROP TABLE IF EXISTS batches CASCADE;
DROP TABLE IF EXISTS actors_avatars CASCADE; DROP TABLE IF EXISTS actors_avatars CASCADE;
DROP TABLE IF EXISTS actors_photos CASCADE; DROP TABLE IF EXISTS actors_photos CASCADE;
DROP TABLE IF EXISTS actors_social CASCADE; DROP TABLE IF EXISTS actors_social CASCADE;

2
package-lock.json generated
View File

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

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.104.0", "version": "1.103.0",
"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": {

2
src/media.js
View File

@ -271,7 +271,7 @@ function groupItems(items) {
} }
async function storeMedia(sources, domain, role, { entropyFilter = 2.5 } = {}) { async function storeMedia(sources, domain, role, { entropyFilter = 2.5 } = {}) {
const presentSources = sources.filter(source => typeof source === 'string' || Array.isArray(source) || (source && source.src)); const presentSources = sources.filter(Boolean);
if (presentSources.length === 0) { if (presentSources.length === 0) {
return {}; return {};

13
src/releases.js
View File

@ -202,7 +202,7 @@ async function attachStudio(release) {
}; };
} }
async function curateReleaseEntry(release, batchId, existingRelease) { async function curateReleaseEntry(release) {
const slug = slugify(release.title, { const slug = slugify(release.title, {
encode: true, encode: true,
limit: config.titleSlugLength, limit: config.titleSlugLength,
@ -227,8 +227,6 @@ async function curateReleaseEntry(release, batchId, existingRelease) {
// rating: release.rating && release.rating.stars && Math.floor(release.rating.stars), // rating: release.rating && release.rating.stars && Math.floor(release.rating.stars),
deep: typeof release.deep === 'boolean' ? release.deep : false, deep: typeof release.deep === 'boolean' ? release.deep : false,
deep_url: release.deepUrl, deep_url: release.deepUrl,
updated_batch_id: batchId,
...(!existingRelease && { created_batch_id: batchId }),
}; };
return curatedRelease; return curatedRelease;
@ -382,7 +380,6 @@ async function updateReleasesSearch(releaseIds) {
sites.slug || ' ' || sites.slug || ' ' ||
networks.name || ' ' || networks.name || ' ' ||
networks.slug || ' ' || networks.slug || ' ' ||
releases.shoot_id || ' ' ||
EXTRACT(YEAR FROM releases.date) || ' ' || EXTRACT(YEAR FROM releases.date) || ' ' ||
CAST(EXTRACT(MONTH FROM releases.date) AS VARCHAR) || ' ' || CAST(EXTRACT(MONTH FROM releases.date) AS VARCHAR) || ' ' ||
CAST(EXTRACT(DAY FROM releases.date) AS VARCHAR) || ' ' || CAST(EXTRACT(DAY FROM releases.date) AS VARCHAR) || ' ' ||
@ -411,7 +408,7 @@ async function updateReleasesSearch(releaseIds) {
} }
} }
async function storeRelease(release, batchId) { async function storeRelease(release) {
const existingRelease = await knex('releases') const existingRelease = await knex('releases')
.where({ .where({
entry_id: release.entryId, entry_id: release.entryId,
@ -419,7 +416,7 @@ async function storeRelease(release, batchId) {
}) })
.first(); .first();
const curatedRelease = await curateReleaseEntry(release, batchId, existingRelease); const curatedRelease = await curateReleaseEntry(release);
if (existingRelease && !argv.redownload) { if (existingRelease && !argv.redownload) {
return existingRelease; return existingRelease;
@ -456,13 +453,11 @@ async function storeRelease(release, batchId) {
} }
async function storeReleases(releases) { async function storeReleases(releases) {
const [batchId] = await knex('batches').insert({ comment: null }).returning('id');
const storedReleases = await Promise.map(releases, async (release) => { const storedReleases = await Promise.map(releases, async (release) => {
try { try {
const releaseWithChannelSite = await attachChannelSite(release); const releaseWithChannelSite = await attachChannelSite(release);
const releaseWithStudio = await attachStudio(releaseWithChannelSite); const releaseWithStudio = await attachStudio(releaseWithChannelSite);
const { id, slug } = await storeRelease(releaseWithStudio, batchId); const { id, slug } = await storeRelease(releaseWithStudio);
return { return {
id, id,

10
src/scrapers/private.js
View File

@ -84,12 +84,12 @@ async function scrapeScene(html, url, site) {
release.likes = Number($('.content-desc #social-actions #likes').text()); release.likes = Number($('.content-desc #social-actions #likes').text());
const posterScript = $('script:contains(poster)').html(); const posterScript = $('script:contains(poster)').html();
const posterLink = posterScript?.slice(posterScript.indexOf('https://'), posterScript.indexOf('.jpg') + 4); const posterLink = posterScript.slice(posterScript.indexOf('https://'), posterScript.indexOf('.jpg') + 4);
release.poster = $('meta[property="og:image"]').attr('content') || posterLink || $('#trailer_player_finished img').attr('src'); release.poster = $('meta[property="og:image"]').attr('content') || posterLink;
const trailer = $('meta[property="og:video"]').attr('content') || $('#videojs-trailer source').attr('src'); release.trailer = {
src: $('meta[property="og:video"]').attr('content') || $('#videojs-trailer source').attr('src'),
if (trailer) release.trailer = { src: trailer }; };
release.photos = await getPhotos(release.entryId, site); release.photos = await getPhotos(release.entryId, site);
release.movie = $('a[data-track="FULL MOVIE"]').attr('href'); release.movie = $('a[data-track="FULL MOVIE"]').attr('href');

6
src/web/plugins/releases.js
View File

@ -4,14 +4,8 @@ const { makeExtendSchemaPlugin, gql } = require('graphile-utils');
const schemaExtender = makeExtendSchemaPlugin(_build => ({ const schemaExtender = makeExtendSchemaPlugin(_build => ({
typeDefs: gql` typeDefs: gql`
extend type Release {}
`, `,
resolvers: { resolvers: {
Release: {
async foo(_parent, _args, _context, _info) {
// template
},
},
}, },
})); }));