Added dedicated movie photo table, renamed scene photo function.

assets/components/releases/banner.vue

@@ -164,8 +164,8 @@ function poster() {
 function photos() {
 	const clips = this.release.clips || [];
 	const clipPostersById = clips.reduce((acc, clip) => ({ ...acc, [clip.poster.id]: clip.poster }), {});
-	const uniqueClipPosters = Array.from(new Set(clips.map(clip => clip.poster.id) || [])).map(posterId => clipPostersById[posterId]);
+	const uniqueClipPosters = Array.from(new Set(clips.map((clip) => clip.poster.id) || [])).map((posterId) => clipPostersById[posterId]);
-	const photosWithClipPosters = (this.release.photos || []).concat(uniqueClipPosters);
+	const photosWithClipPosters = (this.release.photos || []).concat(this.release.scenesPhotos || []).concat(uniqueClipPosters);
 
 	if (this.release.trailer || (this.release.teaser && this.release.teaser.mime !== 'image/gif')) {
 		// poster will be on trailer video

assets/components/releases/release.vue

@@ -28,7 +28,7 @@
 
 		<Album
 			v-if="showAlbum"
-			:items="[release.poster, ...release.photos]"
+			:items="[release.poster, ...release.photos, ...release.scenesPhotos]"
 			:title="release.title"
 			:path="config.media.mediaPath"
 			@close="$router.replace({ hash: undefined })"

assets/js/curate.js

@@ -79,6 +79,7 @@ function curateRelease(release, type = 'scene') {
 	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.scenesPhotos) curatedRelease.scenesPhotos = release.scenesPhotos.filter(Boolean).map((photo) => photo.media || photo);
 	if (release.covers) curatedRelease.covers = release.covers.filter(Boolean).map(({ media }) => media);
 	if (release.trailer) curatedRelease.trailer = release.trailer.media;
 	if (release.teaser) curatedRelease.teaser = release.teaser.media;

assets/js/fragments.js

@@ -442,22 +442,26 @@ const releasesFragment = `
     }
 `;
 
-const mediaFragment = `
+const mediaFields = `
-	media {
+	id
+	index
+	path
+	thumbnail
+	lazy
+	isS3
+	comment
+	sfw: sfwMedia {
 		id
-		index
-		path
 		thumbnail
 		lazy
-		isS3
+		path
 		comment
-		sfw: sfwMedia {
+	}
-			id
+`;
-			thumbnail
+
-			lazy
+const mediaFragment = `
-			path
+	media {
-			comment
+		${mediaFields}
-		}
 	}
 `;
 
@@ -656,6 +660,8 @@ export {
 	actorFields,
 	actorStashesFields,
 	campaignsFragment,
+	mediaFields,
+	mediaFragment,
 	movieFields,
 	releaseActorsFragment,
 	releaseFields,

assets/js/releases/actions.js

@@ -4,6 +4,8 @@ import {
 	releaseFragment,
 	releaseFields,
 	movieFields,
+	mediaFragment,
+	mediaFields,
 } from '../fragments';
 import { curateRelease } from '../curate';
 import getDateRange from '../get-date-range';
@@ -225,25 +227,11 @@ function initReleasesActions(store, router) {
 						slug
 						name
 					}
-					photos {
+					photos: moviesPhotos {
-						id
+						${mediaFragment}
-						index
+					}
-						path
+					scenesPhotos {
-						thumbnail
+						${mediaFields}
-						lazy
-						width
-						height
-						thumbnailWidth
-						thumbnailHeight
-						isS3
-						comment
-						sfw: sfwMedia {
-							id
-							thumbnail
-							lazy
-							path
-							comment
-						}
 					}
 					entity {
 						id

migrations/20220304233846_series.js

@@ -183,8 +183,6 @@ exports.up = async (knex) => Promise.resolve()
 			ORDER BY media.index ASC
 		$$ LANGUAGE SQL STABLE;
 
-		COMMENT ON FUNCTION search_movies IS E'@sortable';
-
 		GRANT ALL ON ALL TABLES IN SCHEMA public TO :visitor;
 		GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO :visitor;
 

migrations/20220327230125_movie_photos.js

@@ -0,0 +1,31 @@
+const config = require('config');
+
+exports.up = async (knex) => Promise.resolve()
+	.then(() => knex.raw(`
+		ALTER FUNCTION movies_photos(movie movies) RENAME TO movies_scenes_photos;
+	`))
+	.then(() => knex.schema.createTable('movies_photos', (table) => {
+		table.integer('movie_id', 16)
+			.notNullable()
+			.references('id')
+			.inTable('movies')
+			.onDelete('cascade');
+
+		table.text('media_id', 21)
+			.notNullable()
+			.references('id')
+			.inTable('media');
+
+		table.unique(['movie_id', 'media_id']);
+	}))
+	.then(() => knex.raw(`
+		GRANT ALL ON ALL TABLES IN SCHEMA public TO :visitor;
+		GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO :visitor;
+	`, {
+		visitor: knex.raw(config.database.query.user),
+	}));
+
+exports.down = async (knex) => knex.raw(`
+	DROP TABLE IF EXISTS movies_photos CASCADE;
+	ALTER FUNCTION movies_scenes_photos(movie movies) RENAME TO movies_photos;
+`);

src/argv.js

@@ -238,6 +238,7 @@ const { argv } = yargs
 		default: false,
 	})
 	.option('level', {
+		alias: 'log-level',
 		describe: 'Log level',
 		type: 'string',
 		default: process.env.NODE_ENV === 'development' ? 'silly' : 'info',