Spotify Work + Error Language = EN - US

This commit is contained in:
killer069
2021-09-09 12:11:11 +05:30
parent 139b540a2c
commit 0b4979f009
9 changed files with 211 additions and 28 deletions

View File

@@ -1,3 +1,5 @@
import got, { Response } from "got/dist/source";
import { SpotifyDataOptions } from ".";
interface SpotifyTrackAlbum{
@@ -90,8 +92,10 @@ export class SpotifyPlaylist{
id : string;
thumbnail : SpotifyThumbnail;
owner : SpotifyArtists;
tracks : SpotifyVideo[]
constructor(data : any){
tracksCount : number;
private spotifyData : SpotifyDataOptions;
private fetched_tracks : Map<string, SpotifyVideo[]>
constructor(data : any, spotifyData : SpotifyDataOptions){
this.name = data.name
this.type = "playlist"
this.collaborative = data.collaborative
@@ -104,11 +108,56 @@ export class SpotifyPlaylist{
url : data.owner.external_urls.spotify,
id : data.owner.id
}
this.tracksCount = Number(data.tracks.total)
let videos: SpotifyVideo[] = []
data.tracks.items.forEach((v : any) => {
videos.push(new SpotifyVideo(v.track))
})
this.tracks = videos
this.fetched_tracks = new Map()
this.fetched_tracks.set('1', videos)
this.spotifyData = spotifyData
}
async fetch(){
let fetching : number;
if(this.tracksCount > 1000) fetching = 1000
else fetching = this.tracksCount
if(fetching <= 100) return
let work = []
for(let i = 2; i <= Math.ceil(fetching/100); i++){
work.push(new Promise(async (resolve, reject) => {
let response = await got(`https://api.spotify.com/v1/playlists/${this.id}/tracks?offset=${(i-1)*100}&limit=100&market=${this.spotifyData.market}`, {
headers : {
"Authorization" : `${this.spotifyData.token_type} ${this.spotifyData.access_token}`
}
}).catch((err) => reject(`Response Error : \n${err}`))
let videos: SpotifyVideo[] = []
let res = response as Response<string>
let json_data = JSON.parse(res.body)
json_data.items.forEach((v : any) => {
videos.push(new SpotifyVideo(v.track))
})
this.fetched_tracks.set(`${i}`, videos)
resolve('Success')
}))
}
await Promise.allSettled(work)
return this
}
page(num : number){
if(!num) throw new Error('Page number is not provided')
if(!this.fetched_tracks.has(`${num}`)) throw new Error('Given Page number is invalid')
return this.fetched_tracks.get(`${num}`)
}
get total_pages(){
return this.fetched_tracks.size
}
get total_tracks(){
let page_number: number = this.total_pages
return (page_number - 1) * 100 + (this.fetched_tracks.get(`page${page_number}`) as SpotifyVideo[]).length
}
toJSON(){
@@ -121,7 +170,6 @@ export class SpotifyPlaylist{
id : this.id,
thumbnail : this.thumbnail,
owner : this.owner,
tracks : this.tracks
}
}
}
@@ -130,16 +178,19 @@ export class SpotifyAlbum{
name : string
type : "track" | "playlist" | "album"
url : string
id : string;
thumbnail : SpotifyThumbnail
artists : SpotifyArtists[]
copyrights : SpotifyCopyright[]
release_date : string;
release_date_precision : string;
total_tracks : number
tracks : SpotifyTracks[]
constructor(data : any){
trackCount : number
private spotifyData : SpotifyDataOptions;
private fetched_tracks : Map<string, SpotifyTracks[]>
constructor(data : any, spotifyData : SpotifyDataOptions){
this.name = data.name
this.type = "album"
this.id = data.id
this.url = data.external_urls.spotify
this.thumbnail = data.images[0]
let artists : SpotifyArtists[] = []
@@ -154,12 +205,56 @@ export class SpotifyAlbum{
this.copyrights = data.copyrights
this.release_date = data.release_date
this.release_date_precision = data.release_date_precision
this.total_tracks = data.total_tracks
this.trackCount = data.total_tracks
let videos: SpotifyTracks[] = []
data.tracks.items.forEach((v : any) => {
videos.push(new SpotifyTracks(v))
})
this.tracks = videos
this.fetched_tracks = new Map()
this.fetched_tracks.set('1', videos)
this.spotifyData = spotifyData
}
async fetch(){
let fetching : number;
if(this.trackCount > 500) fetching = 500
else fetching = this.trackCount
if(fetching <= 50) return
let work = []
for(let i = 2; i <= Math.ceil(fetching/50); i++){
work.push(new Promise(async (resolve, reject) => {
let response = await got(`https://api.spotify.com/v1/albums/${this.id}/tracks?offset=${(i-1)*50}&limit=50&market=${this.spotifyData.market}`, {
headers : {
"Authorization" : `${this.spotifyData.token_type} ${this.spotifyData.access_token}`
}
}).catch((err) => reject(`Response Error : \n${err}`))
let videos: SpotifyTracks[] = []
let res = response as Response<string>
let json_data = JSON.parse(res.body)
json_data.items.forEach((v : any) => {
videos.push(new SpotifyTracks(v))
})
this.fetched_tracks.set(`${i}`, videos)
resolve('Success')
}))
}
await Promise.allSettled(work)
return this
}
page(num : number){
if(!num) throw new Error('Page number is not provided')
if(!this.fetched_tracks.has(`${num}`)) throw new Error('Given Page number is invalid')
return this.fetched_tracks.get(`${num}`)
}
get total_pages(){
return this.fetched_tracks.size
}
get total_tracks(){
let page_number: number = this.total_pages
return (page_number - 1) * 100 + (this.fetched_tracks.get(`page${page_number}`) as SpotifyVideo[]).length
}
toJSON(){
@@ -173,7 +268,6 @@ export class SpotifyAlbum{
release_date : this.release_date,
release_date_precision : this.release_date_precision,
total_tracks : this.total_tracks,
tracks : this.tracks
}
}
}

View File

@@ -8,7 +8,7 @@ if(fs.existsSync('.data/spotify.data')){
spotifyData = JSON.parse(fs.readFileSync('.data/spotify.data').toString())
}
interface SpotifyDataOptions{
export interface SpotifyDataOptions{
client_id : string;
client_secret : string;
redirect_url : string;
@@ -43,7 +43,7 @@ export async function spotify(url : string): Promise<SpotifyAlbum | SpotifyPlayl
"Authorization" : `${spotifyData.token_type} ${spotifyData.access_token}`
}
}).catch((err) => {return 0})
if(typeof response !== 'number') return new SpotifyAlbum(JSON.parse(response.body))
if(typeof response !== 'number') return new SpotifyAlbum(JSON.parse(response.body), spotifyData)
else throw new Error('Failed to get spotify Album Data')
}
else if(url.indexOf('playlist/') !== -1){
@@ -53,7 +53,7 @@ export async function spotify(url : string): Promise<SpotifyAlbum | SpotifyPlayl
"Authorization" : `${spotifyData.token_type} ${spotifyData.access_token}`
}
}).catch((err) => {return 0})
if(typeof response !== 'number') return new SpotifyAlbum(JSON.parse(response.body))
if(typeof response !== 'number') return new SpotifyPlaylist(JSON.parse(response.body), spotifyData)
else throw new Error('Failed to get spotify Playlist Data')
}
else throw new Error('URL is out of scope for play-dl.')

View File

@@ -109,7 +109,7 @@ export class PlayList{
}
page(number : number): Video[]{
if(!number) throw new Error('Given Page number is not provided')
if(!number) throw new Error('Page number is not provided')
if(!this.fetched_videos.has(`page${number}`)) throw new Error('Given Page number is invalid')
return this.fetched_videos.get(`page${number}`) as Video[]
}

View File

@@ -27,7 +27,9 @@ export async function search(search :string, options? : ParseSearchInterface): P
break
}
}
let body = await url_get(url)
let body = await url_get(url, {
headers : {'accept-language' : 'en-US,en-IN;q=0.9,en;q=0.8,hi;q=0.7'}
})
let data = ParseSearchResult(body, options)
return data
}

View File

@@ -47,7 +47,7 @@ export async function video_basic_info(url : string, cookie? : string){
else video_id = url
let new_url = `https://www.youtube.com/watch?v=${video_id}`
let body = await url_get(new_url, {
headers : (cookie) ? { 'cookie' : cookie } : {}
headers : (cookie) ? { 'cookie' : cookie, 'accept-language' : 'en-US,en-IN;q=0.9,en;q=0.8,hi;q=0.7' } : {'accept-language' : 'en-US,en-IN;q=0.9,en;q=0.8,hi;q=0.7'}
})
let player_response = JSON.parse(body.split("var ytInitialPlayerResponse = ")[1].split("}};")[0] + '}}')
let initial_response = JSON.parse(body.split("var ytInitialData = ")[1].split("}};")[0] + '}}')
@@ -129,7 +129,9 @@ export async function playlist_info(url : string, parseIncomplete : boolean = fa
else Playlist_id = url
let new_url = `https://www.youtube.com/playlist?list=${Playlist_id}`
let body = await url_get(new_url)
let body = await url_get(new_url, {
headers : {'accept-language' : 'en-US,en-IN;q=0.9,en;q=0.8,hi;q=0.7'}
})
let response = JSON.parse(body.split("var ytInitialData = ")[1].split(";</script>")[0])
if(response.alerts){
if(response.alerts[0].alertWithButtonRenderer?.type === 'INFO') {