one more radioart for later

back/package.json

@@ -21,6 +21,7 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
+    "@jimp/plugin-circle": "^0.22.10",
     "@nestjs-modules/mailer": "^1.9.1",
     "@nestjs/common": "^10.1.0",
     "@nestjs/config": "^3.0.0",
@@ -36,9 +37,9 @@
     "@types/passport": "^1.0.12",
     "bcryptjs": "^2.4.3",
     "class-transformer": "^0.5.1",
-    "class-validator": "^0.13.2",
-    "json-logger-service": "^9.0.1",
     "class-validator": "^0.14.0",
+    "jimp": "^0.22.10",
+    "json-logger-service": "^9.0.1",
     "node-fetch": "^2.6.12",
     "nodemailer": "^6.9.5",
     "passport-google-oauth20": "^2.0.0",

back/src/song/song.controller.ts

@@ -37,6 +37,7 @@ import { Song as _Song } from 'src/_gen/prisma-class/song';
 import { SongHistory } from 'src/_gen/prisma-class/song_history';
 import { IncludeMap, mapInclude } from 'src/utils/include';
 import { Public } from 'src/auth/public';
+import Jimp from 'jimp';
 
 class SongHistoryResult {
 	@ApiProperty()
@@ -45,6 +46,9 @@ class SongHistoryResult {
 	history: SongHistory[];
 }
 
+const BACKGROUND_COVER = 'radioart3.jpeg';
+const ICON = 'icon_dark.png';
+
 @Controller('song')
 @ApiTags('song')
 @UseGuards(JwtAuthGuard)
@@ -85,6 +89,21 @@ export class SongController {
 		}
 	}
 
+	async gen_illustration(song: Song) {
+		const img = await Jimp.read(BACKGROUND_COVER);
+		// @ts-ignore
+		const artist_img = await Jimp.read(`/assets/artists/${song.artist.name}/illustration.png`);
+		const logo = await Jimp.read(ICON);
+		img.cover(600, 600);
+		artist_img.cover(400, 400);
+		logo.cover(70, 70);
+		artist_img.circle();
+		img.composite(artist_img, 100, 100);
+		img.composite(logo, 10, 10);
+		return img;
+
+	}
+
 	@Get(':id/illustration')
 	@ApiOperation({
 		description: 'Streams the illustration of the requested song',
@@ -93,13 +112,16 @@ export class SongController {
 	@ApiOkResponse({ description: 'Returns the illustration succesfully' })
 	@Public()
 	async getIllustration(@Param('id', ParseIntPipe) id: number) {
-		const song = await this.songService.song({ id });
+		
+		const song = await this.songService.song({ id }, { artist: true } );
 		if (!song) throw new NotFoundException('Song not found');
-
+		//await this.gen_illustration(song);
+		
 		if (song.illustrationPath === null) throw new NotFoundException();
-		if (!existsSync(song.illustrationPath))
+		if (!existsSync(song.illustrationPath)) {
-			throw new NotFoundException('Illustration not found');
+			let img = await this.gen_illustration(song);
-
+			img.write(song.illustrationPath);
+		}
 		try {
 			const file = createReadStream(song.illustrationPath);
 			return new StreamableFile(file);