Added series.

This commit is contained in:
DebaucheryLibrarian
2022-03-26 17:40:20 +01:00
parent 661b8b716b
commit fd8170f223
13 changed files with 377 additions and 128 deletions

View File

@@ -62,7 +62,7 @@ async function setConsent(consent, includeQueer) {
}
if (includeQueer) {
this.$store.dispatch('setTagFilter', this.$store.state.ui.tagFilter.filter(tag => !['gay', 'bisexual', 'transsexual'].includes(tag)));
this.$store.dispatch('setTagFilter', this.$store.state.ui.tagFilter.filter((tag) => !['gay', 'bisexual', 'transsexual'].includes(tag)));
return;
}

View File

@@ -28,7 +28,7 @@ export default {
};
},
beforeMount() {
this.svg = require(`../../img/icons/${this.icon}.svg`).default;
this.svg = require(`../../img/icons/${this.icon}.svg`).default; // eslint-disable-line global-require, import/no-dynamic-require
},
};
</script>

View File

@@ -79,22 +79,23 @@
/>
<div
v-if="release.movies && release.movies.length > 0"
v-if="release.movies?.length > 0 || release.series?.length > 0"
class="row"
>
<span class="row-label">Part of</span>
<div class="movies">
<router-link
v-for="movie in release.movies"
v-for="movie in [...release.movies, ...release.series]"
:key="`movie-${movie.id}`"
:to="{ name: 'movie', params: { releaseId: movie.id, releaseSlug: movie.slug } }"
:to="{ name: movie.type || 'movie', params: { releaseId: movie.id, releaseSlug: movie.slug } }"
class="movie"
>
<span class="movie-title">{{ movie.title }}</span>
<img
v-if="movie.covers.length > 0"
:src="getPath(movie.covers[0], 'thumbnail')"
v-if="movie.covers.length > 0 || movie.poster"
:src="getPath(movie.covers[0] || movie.poster, 'thumbnail')"
class="movie-cover"
>
</router-link>
@@ -243,6 +244,10 @@ async function fetchRelease(scroll = true) {
this.release = await this.$store.dispatch('fetchMovieById', this.$route.params.releaseId);
}
if (this.$route.name === 'serie') {
this.release = await this.$store.dispatch('fetchSerieById', this.$route.params.releaseId);
}
if (scroll && this.$refs.content) {
this.$refs.content.scrollTop = 0;
}

View File

@@ -65,16 +65,18 @@ function curateActor(actor, release) {
return curatedActor;
}
function curateRelease(release) {
function curateRelease(release, type = 'scene') {
const curatedRelease = {
...release,
type: release.type || type,
actors: [],
poster: release.poster && release.poster.media,
tags: release.tags ? release.tags.map((tag) => tag.tag || tag) : [],
};
if (release.scenes) curatedRelease.scenes = release.scenes.filter(Boolean).map(({ scene }) => curateRelease(scene));
if (release.movies) curatedRelease.movies = release.movies.filter(Boolean).map(({ movie }) => curateRelease(movie));
if (release.scenes) curatedRelease.scenes = release.scenes.filter(Boolean).map(({ scene }) => curateRelease(scene, 'scene'));
if (release.movies) curatedRelease.movies = release.movies.filter(Boolean).map(({ movie }) => curateRelease(movie, 'movie'));
if (release.series) curatedRelease.series = release.series.filter(Boolean).map(({ serie }) => curateRelease(serie, 'serie'));
if (release.chapters) curatedRelease.chapters = release.chapters.filter(Boolean).map((chapter) => curateRelease(chapter));
if (release.photos) curatedRelease.photos = release.photos.filter(Boolean).map((photo) => photo.media || photo);
if (release.covers) curatedRelease.covers = release.covers.filter(Boolean).map(({ media }) => media);

View File

@@ -442,6 +442,25 @@ const releasesFragment = `
}
`;
const mediaFragment = `
media {
id
index
path
thumbnail
lazy
isS3
comment
sfw: sfwMedia {
id
thumbnail
lazy
path
comment
}
}
`;
const releaseFragment = `
release(id: $releaseId) {
id
@@ -536,6 +555,19 @@ const releaseFragment = `
}
}
}
series: seriesScenesBySceneId {
serie {
id
title
slug
covers: seriesCoversBySerieId(orderBy: MEDIA_BY_MEDIA_ID__INDEX_ASC) {
${mediaFragment}
}
poster: seriesPosterBySerieId {
${mediaFragment}
}
}
}
isFavorited
isStashed(includeFavorites: false)
stashes: stashesScenesBySceneId(

View File

@@ -141,16 +141,16 @@ function initReleasesActions(store, router) {
};
}
async function fetchMovieById({ _commit }, movieId) {
async function fetchCollectionById({ _commit }, movieId, type = 'movie') {
// const release = await get(`/releases/${releaseId}`);
const { movie } = await graphql(`
const result = await graphql(`
query Movie(
$movieId: Int!
$hasAuth: Boolean!
$userId: Int
) {
movie(id: $movieId) {
${type}(id: $movieId) {
id
title
description
@@ -182,7 +182,7 @@ function initReleasesActions(store, router) {
isS3
}
}
poster: moviesPoster {
poster: ${type === 'series' ? 'seriesPosterBySerieId' : 'moviesPoster'} {
media {
id
path
@@ -195,7 +195,7 @@ function initReleasesActions(store, router) {
isS3
}
}
covers: moviesCovers(orderBy: MEDIA_BY_MEDIA_ID__INDEX_ASC) {
covers: ${type === 'series' ? 'seriesCoversBySerieId' : 'moviesCovers'}(orderBy: MEDIA_BY_MEDIA_ID__INDEX_ASC) {
media {
id
path
@@ -208,14 +208,14 @@ function initReleasesActions(store, router) {
isS3
}
}
trailer: moviesTrailer {
trailer: ${type === 'series' ? 'seriesTrailerBySerieId' : 'moviesTrailer'} {
media {
id
path
isS3
}
}
scenes: moviesScenes {
scenes: ${type === 'series' ? 'seriesScenesBySerieId' : 'moviesScenes'} {
scene {
${releaseFields}
}
@@ -259,7 +259,7 @@ function initReleasesActions(store, router) {
hasLogo
}
}
stashes: stashesMovies(
stashes: ${type === 'series' ? 'stashesSeriesBySerieId' : 'stashesMovies'}(
filter: {
stash: {
userId: {
@@ -283,12 +283,20 @@ function initReleasesActions(store, router) {
userId: store.state.auth.user?.id,
});
if (!movie) {
if (!result[type]) {
router.replace('/not-found');
return null;
}
return curateRelease(movie);
return curateRelease(result[type]);
}
async function fetchMovieById(context, movieId) {
return fetchCollectionById(context, movieId, 'movie');
}
async function fetchSerieById(context, serieId) {
return fetchCollectionById(context, serieId, 'series');
}
return {
@@ -296,6 +304,7 @@ function initReleasesActions(store, router) {
fetchReleaseById,
fetchMovies,
fetchMovieById,
fetchSerieById,
searchMovies,
};
}

View File

@@ -71,6 +71,11 @@ const routes = [
component: Release,
name: 'movie',
},
{
path: '/serie/:releaseId/:releaseSlug?',
component: Release,
name: 'serie',
},
{
path: '/actor/:actorId/:actorSlug',
name: 'actor',