From 296a0a8178fb3c670c924b230a042cc1e6241719 Mon Sep 17 00:00:00 2001 From: Thongrapee Panyapatiphan Date: Thu, 30 Sep 2021 23:55:21 +0700 Subject: Add config for song limit per playlist --- src/services/config.ts | 11 +++++++++++ src/services/get-songs.ts | 16 +++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) (limited to 'src/services') diff --git a/src/services/config.ts b/src/services/config.ts index 759a27a3..087ea0b 100644 --- a/src/services/config.ts +++ b/src/services/config.ts @@ -4,6 +4,7 @@ import path from 'path'; dotenv.config(); export const DATA_DIR = path.resolve(process.env.DATA_DIR ? process.env.DATA_DIR : './data'); +const DEFAULT_PLAYLIST_LIMIT = 50; const CONFIG_MAP = { DISCORD_TOKEN: process.env.DISCORD_TOKEN, @@ -12,6 +13,7 @@ const CONFIG_MAP = { SPOTIFY_CLIENT_SECRET: process.env.SPOTIFY_CLIENT_SECRET, DATA_DIR, CACHE_DIR: path.join(DATA_DIR, 'cache'), + PLAYLIST_LIMIT: process.env.PLAYLIST_LIMIT, } as const; @injectable() @@ -22,6 +24,7 @@ export default class Config { readonly SPOTIFY_CLIENT_SECRET!: string; readonly DATA_DIR!: string; readonly CACHE_DIR!: string; + readonly PLAYLIST_LIMIT!: string; constructor() { for (const [key, value] of Object.entries(CONFIG_MAP)) { @@ -33,4 +36,12 @@ export default class Config { this[key as keyof typeof CONFIG_MAP] = value; } } + + getPlaylistLimit() { + if (!this.PLAYLIST_LIMIT) { + return DEFAULT_PLAYLIST_LIMIT; + } + + return Number(this.PLAYLIST_LIMIT) || DEFAULT_PLAYLIST_LIMIT; + } } diff --git a/src/services/get-songs.ts b/src/services/get-songs.ts index ba4401c..dcf6823 100644 --- a/src/services/get-songs.ts +++ b/src/services/get-songs.ts @@ -27,6 +27,7 @@ export default class { private readonly youtubeKey: string; private readonly spotify: Spotify; private readonly cache: CacheProvider; + private readonly playlistLimit: number; private readonly ytsrQueue: PQueue; @@ -38,6 +39,7 @@ export default class { this.youtubeKey = config.YOUTUBE_API_KEY; this.spotify = thirdParty.spotify; this.cache = cache; + this.playlistLimit = config.getPlaylistLimit(); this.ytsrQueue = new PQueue({concurrency: 4}); } @@ -126,7 +128,7 @@ export default class { const {items, nextPageToken} = await this.cache.wrap( this.youtube.playlists.items, listId, - {maxResults: '50', pageToken: nextToken}, + {maxResults: `${this.playlistLimit}`, pageToken: nextToken}, { expiresIn: ONE_MINUTE_IN_SECONDS, }, @@ -199,7 +201,7 @@ export default class { case 'album': { const uri = parsed as spotifyURI.Album; - const [{body: album}, {body: {items}}] = await Promise.all([this.spotify.getAlbum(uri.id), this.spotify.getAlbumTracks(uri.id, {limit: 50})]); + const [{body: album}, {body: {items}}] = await Promise.all([this.spotify.getAlbum(uri.id), this.spotify.getAlbumTracks(uri.id, {limit: this.playlistLimit})]); tracks.push(...items); @@ -210,7 +212,7 @@ export default class { case 'playlist': { const uri = parsed as spotifyURI.Playlist; - let [{body: playlistResponse}, {body: tracksResponse}] = await Promise.all([this.spotify.getPlaylist(uri.id), this.spotify.getPlaylistTracks(uri.id, {limit: 50})]); + let [{body: playlistResponse}, {body: tracksResponse}] = await Promise.all([this.spotify.getPlaylist(uri.id), this.spotify.getPlaylistTracks(uri.id, {limit: this.playlistLimit})]); playlist = {title: playlistResponse.name, source: playlistResponse.href}; @@ -219,7 +221,7 @@ export default class { while (tracksResponse.next) { // eslint-disable-next-line no-await-in-loop ({body: tracksResponse} = await this.spotify.getPlaylistTracks(uri.id, { - limit: parseInt(new URL(tracksResponse.next).searchParams.get('limit') ?? '50', 10), + limit: parseInt(new URL(tracksResponse.next).searchParams.get('limit') ?? `${this.playlistLimit}`, 10), offset: parseInt(new URL(tracksResponse.next).searchParams.get('offset') ?? '0', 10), })); @@ -252,13 +254,13 @@ export default class { } } - // Get 50 random songs if many + // Get random songs if many then limit to playlistLimit (defaults to 50) const originalNSongs = tracks.length; - if (tracks.length > 50) { + if (tracks.length > this.playlistLimit) { const shuffled = shuffle(tracks); - tracks = shuffled.slice(0, 50); + tracks = shuffled.slice(0, this.playlistLimit); } let songs = await Promise.all(tracks.map(async track => this.spotifyToYouTube(track, playlist))); -- cgit v1.2.3 From 96dcc4a5364d934b413b247e7b69ff31606c6183 Mon Sep 17 00:00:00 2001 From: Thongrapee Panyapatiphan Date: Fri, 1 Oct 2021 20:48:32 +0700 Subject: Revert "Add config for song limit per playlist" This reverts commit 296a0a8178fb3c670c924b230a042cc1e6241719. --- src/services/config.ts | 11 ----------- src/services/get-songs.ts | 16 +++++++--------- 2 files changed, 7 insertions(+), 20 deletions(-) (limited to 'src/services') diff --git a/src/services/config.ts b/src/services/config.ts index 087ea0b..759a27a3 100644 --- a/src/services/config.ts +++ b/src/services/config.ts @@ -4,7 +4,6 @@ import path from 'path'; dotenv.config(); export const DATA_DIR = path.resolve(process.env.DATA_DIR ? process.env.DATA_DIR : './data'); -const DEFAULT_PLAYLIST_LIMIT = 50; const CONFIG_MAP = { DISCORD_TOKEN: process.env.DISCORD_TOKEN, @@ -13,7 +12,6 @@ const CONFIG_MAP = { SPOTIFY_CLIENT_SECRET: process.env.SPOTIFY_CLIENT_SECRET, DATA_DIR, CACHE_DIR: path.join(DATA_DIR, 'cache'), - PLAYLIST_LIMIT: process.env.PLAYLIST_LIMIT, } as const; @injectable() @@ -24,7 +22,6 @@ export default class Config { readonly SPOTIFY_CLIENT_SECRET!: string; readonly DATA_DIR!: string; readonly CACHE_DIR!: string; - readonly PLAYLIST_LIMIT!: string; constructor() { for (const [key, value] of Object.entries(CONFIG_MAP)) { @@ -36,12 +33,4 @@ export default class Config { this[key as keyof typeof CONFIG_MAP] = value; } } - - getPlaylistLimit() { - if (!this.PLAYLIST_LIMIT) { - return DEFAULT_PLAYLIST_LIMIT; - } - - return Number(this.PLAYLIST_LIMIT) || DEFAULT_PLAYLIST_LIMIT; - } } diff --git a/src/services/get-songs.ts b/src/services/get-songs.ts index dcf6823..ba4401c 100644 --- a/src/services/get-songs.ts +++ b/src/services/get-songs.ts @@ -27,7 +27,6 @@ export default class { private readonly youtubeKey: string; private readonly spotify: Spotify; private readonly cache: CacheProvider; - private readonly playlistLimit: number; private readonly ytsrQueue: PQueue; @@ -39,7 +38,6 @@ export default class { this.youtubeKey = config.YOUTUBE_API_KEY; this.spotify = thirdParty.spotify; this.cache = cache; - this.playlistLimit = config.getPlaylistLimit(); this.ytsrQueue = new PQueue({concurrency: 4}); } @@ -128,7 +126,7 @@ export default class { const {items, nextPageToken} = await this.cache.wrap( this.youtube.playlists.items, listId, - {maxResults: `${this.playlistLimit}`, pageToken: nextToken}, + {maxResults: '50', pageToken: nextToken}, { expiresIn: ONE_MINUTE_IN_SECONDS, }, @@ -201,7 +199,7 @@ export default class { case 'album': { const uri = parsed as spotifyURI.Album; - const [{body: album}, {body: {items}}] = await Promise.all([this.spotify.getAlbum(uri.id), this.spotify.getAlbumTracks(uri.id, {limit: this.playlistLimit})]); + const [{body: album}, {body: {items}}] = await Promise.all([this.spotify.getAlbum(uri.id), this.spotify.getAlbumTracks(uri.id, {limit: 50})]); tracks.push(...items); @@ -212,7 +210,7 @@ export default class { case 'playlist': { const uri = parsed as spotifyURI.Playlist; - let [{body: playlistResponse}, {body: tracksResponse}] = await Promise.all([this.spotify.getPlaylist(uri.id), this.spotify.getPlaylistTracks(uri.id, {limit: this.playlistLimit})]); + let [{body: playlistResponse}, {body: tracksResponse}] = await Promise.all([this.spotify.getPlaylist(uri.id), this.spotify.getPlaylistTracks(uri.id, {limit: 50})]); playlist = {title: playlistResponse.name, source: playlistResponse.href}; @@ -221,7 +219,7 @@ export default class { while (tracksResponse.next) { // eslint-disable-next-line no-await-in-loop ({body: tracksResponse} = await this.spotify.getPlaylistTracks(uri.id, { - limit: parseInt(new URL(tracksResponse.next).searchParams.get('limit') ?? `${this.playlistLimit}`, 10), + limit: parseInt(new URL(tracksResponse.next).searchParams.get('limit') ?? '50', 10), offset: parseInt(new URL(tracksResponse.next).searchParams.get('offset') ?? '0', 10), })); @@ -254,13 +252,13 @@ export default class { } } - // Get random songs if many then limit to playlistLimit (defaults to 50) + // Get 50 random songs if many const originalNSongs = tracks.length; - if (tracks.length > this.playlistLimit) { + if (tracks.length > 50) { const shuffled = shuffle(tracks); - tracks = shuffled.slice(0, this.playlistLimit); + tracks = shuffled.slice(0, 50); } let songs = await Promise.all(tracks.map(async track => this.spotifyToYouTube(track, playlist))); -- cgit v1.2.3 From c9cc9a17b13f45786222db948e746b5f8c3742e2 Mon Sep 17 00:00:00 2001 From: Thongrapee Panyapatiphan Date: Fri, 1 Oct 2021 21:11:43 +0700 Subject: Read playlist song limit from Settings --- src/services/get-songs.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/services') diff --git a/src/services/get-songs.ts b/src/services/get-songs.ts index ba4401c..b6f004a 100644 --- a/src/services/get-songs.ts +++ b/src/services/get-songs.ts @@ -97,7 +97,7 @@ export default class { } } - async youtubePlaylist(listId: string): Promise { + async youtubePlaylist(listId: string, limit: number): Promise { // YouTube playlist const playlist = await this.cache.wrap( this.youtube.playlists.get, @@ -126,7 +126,7 @@ export default class { const {items, nextPageToken} = await this.cache.wrap( this.youtube.playlists.items, listId, - {maxResults: '50', pageToken: nextToken}, + {maxResults: `${limit}`, pageToken: nextToken}, { expiresIn: ONE_MINUTE_IN_SECONDS, }, @@ -188,7 +188,7 @@ export default class { return songsToReturn; } - async spotifySource(url: string): Promise<[QueuedSongWithoutChannel[], number, number]> { + async spotifySource(url: string, limit: number): Promise<[QueuedSongWithoutChannel[], number, number]> { const parsed = spotifyURI.parse(url); let tracks: SpotifyApi.TrackObjectSimplified[] = []; @@ -199,7 +199,7 @@ export default class { case 'album': { const uri = parsed as spotifyURI.Album; - const [{body: album}, {body: {items}}] = await Promise.all([this.spotify.getAlbum(uri.id), this.spotify.getAlbumTracks(uri.id, {limit: 50})]); + const [{body: album}, {body: {items}}] = await Promise.all([this.spotify.getAlbum(uri.id), this.spotify.getAlbumTracks(uri.id, {limit})]); tracks.push(...items); @@ -210,7 +210,7 @@ export default class { case 'playlist': { const uri = parsed as spotifyURI.Playlist; - let [{body: playlistResponse}, {body: tracksResponse}] = await Promise.all([this.spotify.getPlaylist(uri.id), this.spotify.getPlaylistTracks(uri.id, {limit: 50})]); + let [{body: playlistResponse}, {body: tracksResponse}] = await Promise.all([this.spotify.getPlaylist(uri.id), this.spotify.getPlaylistTracks(uri.id, {limit})]); playlist = {title: playlistResponse.name, source: playlistResponse.href}; @@ -219,7 +219,7 @@ export default class { while (tracksResponse.next) { // eslint-disable-next-line no-await-in-loop ({body: tracksResponse} = await this.spotify.getPlaylistTracks(uri.id, { - limit: parseInt(new URL(tracksResponse.next).searchParams.get('limit') ?? '50', 10), + limit: parseInt(new URL(tracksResponse.next).searchParams.get('limit') ?? `${limit}`, 10), offset: parseInt(new URL(tracksResponse.next).searchParams.get('offset') ?? '0', 10), })); @@ -252,13 +252,13 @@ export default class { } } - // Get 50 random songs if many + // Get random songs if the playlist is larger than limit const originalNSongs = tracks.length; - if (tracks.length > 50) { + if (tracks.length > limit) { const shuffled = shuffle(tracks); - tracks = shuffled.slice(0, 50); + tracks = shuffled.slice(0, limit); } let songs = await Promise.all(tracks.map(async track => this.spotifyToYouTube(track, playlist))); -- cgit v1.2.3 From 11eba5746dd8ba3497073c6e7855a43233ca896d Mon Sep 17 00:00:00 2001 From: Thongrapee Panyapatiphan Date: Fri, 1 Oct 2021 22:15:34 +0700 Subject: Simplify code --- src/services/get-songs.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/services') diff --git a/src/services/get-songs.ts b/src/services/get-songs.ts index b6f004a..49628e8 100644 --- a/src/services/get-songs.ts +++ b/src/services/get-songs.ts @@ -126,7 +126,7 @@ export default class { const {items, nextPageToken} = await this.cache.wrap( this.youtube.playlists.items, listId, - {maxResults: `${limit}`, pageToken: nextToken}, + {maxResults: limit, pageToken: nextToken}, { expiresIn: ONE_MINUTE_IN_SECONDS, }, @@ -219,7 +219,7 @@ export default class { while (tracksResponse.next) { // eslint-disable-next-line no-await-in-loop ({body: tracksResponse} = await this.spotify.getPlaylistTracks(uri.id, { - limit: parseInt(new URL(tracksResponse.next).searchParams.get('limit') ?? `${limit}`, 10), + limit, offset: parseInt(new URL(tracksResponse.next).searchParams.get('offset') ?? '0', 10), })); -- cgit v1.2.3 From 5ce3f92023d56b16c8b15e584084fe90e7ab9b55 Mon Sep 17 00:00:00 2001 From: Thongrapee Panyapatiphan Date: Sat, 18 Dec 2021 14:53:00 +0700 Subject: Revert incorrect changes --- src/services/get-songs.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/services') diff --git a/src/services/get-songs.ts b/src/services/get-songs.ts index 38a2b61..ebf779a 100644 --- a/src/services/get-songs.ts +++ b/src/services/get-songs.ts @@ -97,7 +97,7 @@ export default class { } } - async youtubePlaylist(listId: string, limit: number): Promise { + async youtubePlaylist(listId: string): Promise { // YouTube playlist const playlist = await this.cache.wrap( this.youtube.playlists.get, @@ -126,7 +126,7 @@ export default class { const {items, nextPageToken} = await this.cache.wrap( this.youtube.playlists.items, listId, - {maxResults: limit, pageToken: nextToken}, + {maxResults: '50', pageToken: nextToken}, { expiresIn: ONE_MINUTE_IN_SECONDS, }, @@ -188,7 +188,7 @@ export default class { return songsToReturn; } - async spotifySource(url: string, limit: number): Promise<[QueuedSongWithoutChannel[], number, number]> { + async spotifySource(url: string, playlistLimit: number): Promise<[QueuedSongWithoutChannel[], number, number]> { const parsed = spotifyURI.parse(url); let tracks: SpotifyApi.TrackObjectSimplified[] = []; @@ -199,7 +199,7 @@ export default class { case 'album': { const uri = parsed as spotifyURI.Album; - const [{body: album}, {body: {items}}] = await Promise.all([this.spotify.getAlbum(uri.id), this.spotify.getAlbumTracks(uri.id, {limit})]); + const [{body: album}, {body: {items}}] = await Promise.all([this.spotify.getAlbum(uri.id), this.spotify.getAlbumTracks(uri.id, {limit: 50})]); tracks.push(...items); @@ -210,7 +210,7 @@ export default class { case 'playlist': { const uri = parsed as spotifyURI.Playlist; - let [{body: playlistResponse}, {body: tracksResponse}] = await Promise.all([this.spotify.getPlaylist(uri.id), this.spotify.getPlaylistTracks(uri.id, {limit})]); + let [{body: playlistResponse}, {body: tracksResponse}] = await Promise.all([this.spotify.getPlaylist(uri.id), this.spotify.getPlaylistTracks(uri.id, {limit: 50})]); playlist = {title: playlistResponse.name, source: playlistResponse.href}; @@ -219,7 +219,7 @@ export default class { while (tracksResponse.next) { // eslint-disable-next-line no-await-in-loop ({body: tracksResponse} = await this.spotify.getPlaylistTracks(uri.id, { - limit, + limit: parseInt(new URL(tracksResponse.next).searchParams.get('limit') ?? '50', 10), offset: parseInt(new URL(tracksResponse.next).searchParams.get('offset') ?? '0', 10), })); @@ -255,10 +255,10 @@ export default class { // Get random songs if the playlist is larger than limit const originalNSongs = tracks.length; - if (tracks.length > limit) { + if (tracks.length > playlistLimit) { const shuffled = shuffle(tracks); - tracks = shuffled.slice(0, limit); + tracks = shuffled.slice(0, playlistLimit); } let songs = await Promise.all(tracks.map(async track => this.spotifyToYouTube(track, playlist))); -- cgit v1.2.3