jonny_bro/discord-player-play-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #570 from sayuriu/patch-1

Browse source 
Proposal changes based on #477
This commit is contained in:
Andromeda 2021-07-31 13:03:20 +05:45 committed by GitHub
commit 3786c484eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/Player.ts
View file

@ -141,10 +141,11 @@ export class Player extends EventEmitter {
* @param {DiscordMessage} message The message * @param {DiscordMessage} message The message
* @param {string} query The query * @param {string} query The query
* @param {boolean} [firstResult=false] If it should return the first result * @param {boolean} [firstResult=false] If it should return the first result
* @param {number} [startFromIndex=0] Prioritise playing the track with following index (Only works with playlist)
* @returns {Promise<Track>} * @returns {Promise<Track>}
* @private * @private
*/ */
private _searchTracks(message: Message, query: string, firstResult?: boolean): Promise<Track> { private _searchTracks(message: Message, query: string, firstResult?: boolean, startFromIndex = 0): Promise<Track> {
return new Promise(async (resolve) => { return new Promise(async (resolve) => {
let tracks: Track[] = []; let tracks: Track[] = [];
const queryType = Util.getQueryType(query); const queryType = Util.getQueryType(query);
@ -302,17 +303,21 @@ export class Player extends EventEmitter {
}; };
this.emit(PlayerEvents.PLAYLIST_PARSE_END, pl, message); this.emit(PlayerEvents.PLAYLIST_PARSE_END, pl, message);
if (startFromIndex < 0) startFromIndex = 0;
if (startFromIndex > tracks.length - 1) startFromIndex = tracks.length - 1;
if (this.isPlaying(message)) { if (this.isPlaying(message)) {
const prioritisedTrack = tracks.splice(startFromIndex, 1);
tracks.unshift(prioritisedTrack);
const queue = this._addTracksToQueue(message, tracks); const queue = this._addTracksToQueue(message, tracks);
this.emit(PlayerEvents.PLAYLIST_ADD, message, queue, pl); this.emit(PlayerEvents.PLAYLIST_ADD, message, queue, pl);
} else { } else {
const track = tracks[0]; const track = tracks[startFromIndex];
const queue = (await this._createQueue(message, track).catch((e) => void this.emit(PlayerEvents.ERROR, e, message))) as Queue; const queue = (await this._createQueue(message, track).catch((e) => void this.emit(PlayerEvents.ERROR, e, message))) as Queue;
this.emit(PlayerEvents.PLAYLIST_ADD, message, queue, pl); this.emit(PlayerEvents.PLAYLIST_ADD, message, queue, pl);
this.emit(PlayerEvents.TRACK_START, message, queue.tracks[0], queue); tracks.splice(startFromIndex, 1);
tracks.shift();
this._addTracksToQueue(message, tracks); this._addTracksToQueue(message, tracks);
this.emit(PlayerEvents.TRACK_START, message, track, queue);
} }
return; return;
@ -357,17 +362,21 @@ export class Player extends EventEmitter {
// @ts-ignore // @ts-ignore
// tslint:disable-next-line:no-shadowed-variable // tslint:disable-next-line:no-shadowed-variable
const tracks = playlist.videos as Track[]; const tracks = playlist.videos as Track[];
if (startFromIndex < 0) startFromIndex = 0;
if (startFromIndex > tracks.length - 1) startFromIndex = tracks.length - 1;
if (this.isPlaying(message)) { if (this.isPlaying(message)) {
const prioritisedTrack = tracks.splice(startFromIndex, 1);
tracks.unshift(prioritisedTrack);
const queue = this._addTracksToQueue(message, tracks); const queue = this._addTracksToQueue(message, tracks);
this.emit(PlayerEvents.PLAYLIST_ADD, message, queue, playlist); this.emit(PlayerEvents.PLAYLIST_ADD, message, queue, playlist);
} else { } else {
const track = tracks[0]; const track = tracks[startFromIndex];
const queue = (await this._createQueue(message, track).catch((e) => void this.emit(PlayerEvents.ERROR, e, message))) as Queue; const queue = (await this._createQueue(message, track).catch((e) => void this.emit(PlayerEvents.ERROR, e, message))) as Queue;
this.emit(PlayerEvents.PLAYLIST_ADD, message, queue, playlist); this.emit(PlayerEvents.PLAYLIST_ADD, message, queue, pl);
this.emit(PlayerEvents.TRACK_START, message, queue.tracks[0], queue); tracks.splice(startFromIndex, 1);
tracks[0];
this._addTracksToQueue(message, tracks); this._addTracksToQueue(message, tracks);
this.emit(PlayerEvents.TRACK_START, message, track, queue);
} }
return; return;
@ -410,17 +419,20 @@ export class Player extends EventEmitter {
res.duration = res.tracks.reduce((a, c) => a + c.durationMS, 0); res.duration = res.tracks.reduce((a, c) => a + c.durationMS, 0);
this.emit(PlayerEvents.PLAYLIST_PARSE_END, res, message); this.emit(PlayerEvents.PLAYLIST_PARSE_END, res, message);
if (startFromIndex < 0) res.startFromIndex = 0;
if (startFromIndex > tracks.length - 1) startFromIndex = res.tracks.length - 1;
if (this.isPlaying(message)) { if (this.isPlaying(message)) {
const queue = this._addTracksToQueue(message, res.tracks); const prioritisedTrack = res.tracks.splice(startFromIndex, 1);
res.tracks.unshift(prioritisedTrack);
this.emit(PlayerEvents.PLAYLIST_ADD, message, queue, res); this.emit(PlayerEvents.PLAYLIST_ADD, message, queue, res);
} else { } else {
const track = res.tracks[0]; const track = res.tracks[startFromIndex];
const queue = (await this._createQueue(message, track).catch((e) => void this.emit(PlayerEvents.ERROR, e, message))) as Queue; const queue = (await this._createQueue(message, track).catch((e) => void this.emit(PlayerEvents.ERROR, e, message))) as Queue;
this.emit(PlayerEvents.PLAYLIST_ADD, message, queue, res); this.emit(PlayerEvents.PLAYLIST_ADD, message, queue, res);
this.emit(PlayerEvents.TRACK_START, message, queue.tracks[0], queue); res.tracks.splice(startFromIndex, 1);
res.tracks.shift();
this._addTracksToQueue(message, res.tracks); this._addTracksToQueue(message, res.tracks);
this.emit(PlayerEvents.TRACK_START, message, track, queue);
} }
return; return;
@ -459,7 +471,6 @@ export class Player extends EventEmitter {
this.emit(PlayerEvents.SEARCH_INVALID_RESPONSE, message, query, tracks, content, collector); this.emit(PlayerEvents.SEARCH_INVALID_RESPONSE, message, query, tracks, content, collector);
} }
}); });
collector.on('end', (_, reason) => { collector.on('end', (_, reason) => {
if (reason === 'time') { if (reason === 'time') {
this.emit(PlayerEvents.SEARCH_CANCEL, message, query, tracks); this.emit(PlayerEvents.SEARCH_CANCEL, message, query, tracks);
@ -473,10 +484,11 @@ export class Player extends EventEmitter {
* @param {DiscordMessage} message The discord.js message object * @param {DiscordMessage} message The discord.js message object
* @param {string|Track} query Search query, can be `Player.Track` instance * @param {string|Track} query Search query, can be `Player.Track` instance
* @param {Boolean} [firstResult=false] If it should play the first result * @param {Boolean} [firstResult=false] If it should play the first result
* @param {number} [startFromIndex=0] Prioritise playing the track with following index (Only works with playlist)
* @example await player.play(message, "never gonna give you up", true) * @example await player.play(message, "never gonna give you up", true)
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
async play(message: Message, query: string | Track, firstResult?: boolean): Promise<void> { async play(message: Message, query: string | Track, firstResult?: boolean, startFromIndex = 0): Promise<void> {
if (!message) throw new PlayerError('Play function needs message'); if (!message) throw new PlayerError('Play function needs message');
if (!query) throw new PlayerError('Play function needs search query as a string or Player.Track object'); if (!query) throw new PlayerError('Play function needs search query as a string or Player.Track object');
@ -533,7 +545,7 @@ export class Player extends EventEmitter {
} }
} }
if (!track) track = await this._searchTracks(message, query, firstResult); if (!track) track = await this._searchTracks(message, query, firstResult, startFromIndex);
} }
} }