yuzu/play-dl-test
1
0
Fork 0
mirror of https://github.com/YuzuZensai/play-dl-test.git synced 2026-01-31 14:58:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Spotify Playlist and Album search issues

Browse Source
This commit is contained in:
killer069
2021-12-15 13:11:16 +05:30
parent 2958e65728
commit 6fbb0e96de
3 changed files with 30 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
play-dl/Spotify/index.ts
View File

@@ -1,5 +1,5 @@
import { request } from '../Request';
import { SpotifyAlbum, SpotifyPlaylist, SpotifySearchAlbum, SpotifySearchPlaylist, SpotifyTrack } from './classes';
import { SpotifyAlbum, SpotifyPlaylist, SpotifyTrack } from './classes';
import { existsSync, readFileSync, writeFileSync } from 'node:fs';
let spotifyData: SpotifyDataOptions;
@@ -65,7 +65,7 @@ export async function spotify(url: string): Promise<Spotify> {
return err;
});
if (response instanceof Error) throw response;
return new SpotifyAlbum(JSON.parse(response), spotifyData);
return new SpotifyAlbum(JSON.parse(response), spotifyData, false);
} else if (url.indexOf('playlist/') !== -1) {
const playlistID = url.split('playlist/')[1].split('&')[0].split('?')[0];
const response = await request(
@@ -79,7 +79,7 @@ export async function spotify(url: string): Promise<Spotify> {
return err;
});
if (response instanceof Error) throw response;
return new SpotifyPlaylist(JSON.parse(response), spotifyData);
return new SpotifyPlaylist(JSON.parse(response), spotifyData, false);
} else throw new Error('URL is out of scope for play-dl.');
}
/**
@@ -161,10 +161,6 @@ export function is_expired(): boolean {
* type for Spotify Classes
*/
export type Spotify = SpotifyAlbum | SpotifyPlaylist | SpotifyTrack;
/**
* type for Spotify Searched Classes
*/
export type SpotifySearch = SpotifyTrack | SpotifySearchPlaylist | SpotifySearchAlbum
/**
* Function for searching songs on Spotify
* @param query searching query
@@ -176,8 +172,8 @@ export async function sp_search(
query: string,
type: 'album' | 'playlist' | 'track',
limit: number = 10
): Promise<SpotifySearch[]> {
const results: SpotifySearch[] = [];
): Promise<Spotify[]> {
const results: Spotify[] = [];
if (!spotifyData) throw new Error('Spotify Data is missing\nDid you forgot to do authorization ?');
if (query.length === 0) throw new Error('Pass some query to search.');
if (limit > 50 || limit < 0) throw new Error(`You crossed limit range of Spotify [ 0 - 50 ]`);
@@ -199,11 +195,11 @@ export async function sp_search(
});
} else if (type === 'album') {
json_data.albums.items.forEach((album: any) => {
results.push(new SpotifySearchAlbum(album));
results.push(new SpotifyAlbum(album, spotifyData, true));
});
} else if (type === 'playlist') {
json_data.playlists.items.forEach((playlist: any) => {
results.push(new SpotifySearchPlaylist(playlist));
results.push(new SpotifyPlaylist(playlist, spotifyData, true));
});
}
return results;