playdl-music-extractor
Advanced tools
Comparing version 1.0.2 to 1.0.3
{ | ||
"name": "playdl-music-extractor", | ||
"version": "1.0.2", | ||
"version": "1.0.3", | ||
"description": "PlayDL Music Extractor is a Extractor/Scrapper and Helps Players to fetch data from play-dl or Custom Extractors , as Per reduces extra work and credentials", | ||
@@ -5,0 +5,0 @@ "main": "./src/index.js", |
const { validate } = require('play-dl'); | ||
const UriCheck = require('is-url'); | ||
const PlayDLExtractor = require('./Track-Extractor'); | ||
@@ -12,4 +13,13 @@ | ||
) { | ||
const YoutubeUrlRegex = /^.*(youtu.be\/|list=|watch=|v=)([^#\&\?]*).*/; | ||
const ValidateUrlResult = await validate(Query); | ||
if ( | ||
UriCheck(Query) | ||
&& (!ValidateUrlResult | ||
|| (ValidateUrlResult && ValidateUrlResult.includes('search'))) | ||
) { | ||
return { | ||
playlist: false, | ||
tracks: [], | ||
}; | ||
} | ||
const YoutubeTracks = { | ||
@@ -21,17 +31,7 @@ playlist: | ||
?? false, | ||
tracks: | ||
Query.match(YoutubeUrlRegex) | ||
&& ValidateUrlResult | ||
&& (ValidateUrlResult.includes('playlist') | ||
|| ValidateUrlResult.includes('album')) | ||
? await PlayDLExtractor.DataExtractorYoutube( | ||
Query, | ||
'youtube', | ||
YoutubeStreamOptions, | ||
) | ||
: await PlayDLExtractor.DataExtractorYoutube( | ||
Query, | ||
'youtube', | ||
YoutubeStreamOptions, | ||
), | ||
tracks: await PlayDLExtractor.DataExtractorYoutube( | ||
Query, | ||
'youtube', | ||
YoutubeStreamOptions, | ||
), | ||
}; | ||
@@ -38,0 +38,0 @@ return YoutubeTracks; |
21718