Histmy/play-dl-fix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Search command cleaned up

Browse Source
This commit is contained in:
killer069 2021-09-09 12:44:49 +05:30
parent 0b4979f009
commit 68daeed093
2 changed files with 15 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
play-dl/YouTube/search.ts
View File

@ -13,6 +13,7 @@ enum SearchType {
export async function search(search :string, options? : ParseSearchInterface): Promise<(Video | Channel | PlayList)[]> { export async function search(search :string, options? : ParseSearchInterface): Promise<(Video | Channel | PlayList)[]> {
let url = 'https://www.youtube.com/results?search_query=' + search.replaceAll(' ', '+') let url = 'https://www.youtube.com/results?search_query=' + search.replaceAll(' ', '+')
if(!options || options.type) options = { type : "video" }
if(!url.match('&sp=')){ if(!url.match('&sp=')){
url += '&sp=' url += '&sp='
switch(options?.type){ switch(options?.type){

66
play-dl/YouTube/utils/parser.ts
View File

@ -3,7 +3,7 @@ import { PlayList } from "../classes/Playlist";
import { Channel } from "../classes/Channel"; import { Channel } from "../classes/Channel";
export interface ParseSearchInterface { export interface ParseSearchInterface {
type?: "video" | "playlist" | "channel" | "all"; type?: "video" | "playlist" | "channel" ;
limit?: number; limit?: number;
} }
@ -13,73 +13,35 @@ export interface thumbnail{
url : string url : string
} }
export function ParseSearchResult(html :string, options? : ParseSearchInterface): (Video | PlayList | Channel)[] { export function ParseSearchResult(html : string, options? : ParseSearchInterface): (Video | PlayList | Channel)[] {
if(!html) throw new Error('Can\'t parse Search result without data') if(!html) throw new Error('Can\'t parse Search result without data')
if (!options) options = { type: "video", limit: 0 }; if (!options) options = { type: "video", limit: 0 };
if (!options.type) options.type = "video"; if (!options.type) options.type = "video";
let data = html.split("var ytInitialData = ")[1].split("}};")[0] + '}}';
let json_data = JSON.parse(data)
let results = [] let results = []
let details = [] let details = json_data.contents.twoColumnSearchResultsRenderer.primaryContents.sectionListRenderer.contents[0].itemSectionRenderer.contents
let fetched = false; for(let i = 0; i < details.length; i++){
try {
let data = html.split("ytInitialData = JSON.parse('")[1].split("');</script>")[0];
html = data.replace(/\\x([0-9A-F]{2})/gi, (...items) => {
return String.fromCharCode(parseInt(items[1], 16));
});
} catch {
/* do nothing */
}
try {
details = JSON.parse(html.split('{"itemSectionRenderer":{"contents":')[html.split('{"itemSectionRenderer":{"contents":').length - 1].split(',"continuations":[{')[0]);
fetched = true;
} catch {
/* Do nothing*/
}
if (!fetched) {
try {
details = JSON.parse(html.split('{"itemSectionRenderer":')[html.split('{"itemSectionRenderer":').length - 1].split('},{"continuationItemRenderer":{')[0]).contents;
fetched = true;
} catch {
/* do nothing */
}
}
if (!fetched) throw new Error('Failed to Fetch the data')
for (let i = 0; i < details.length; i++) {
if (typeof options.limit === "number" && options.limit > 0 && results.length >= options.limit) break; if (typeof options.limit === "number" && options.limit > 0 && results.length >= options.limit) break;
let data = details[i];
let res;
if (options.type === "all") {
if (!!data.videoRenderer) options.type = "video";
else if (!!data.channelRenderer) options.type = "channel";
else if (!!data.playlistRenderer) options.type = "playlist";
else continue;
}
if (options.type === "video") { if (options.type === "video") {
const parsed = parseVideo(data); const parsed = parseVideo(details[i]);
if (!parsed) continue; if (!parsed) continue;
res = parsed; results.push(parsed)
} else if (options.type === "channel") { } else if (options.type === "channel") {
const parsed = parseChannel(data); const parsed = parseChannel(details[i]);
if (!parsed) continue; if (!parsed) continue;
res = parsed; results.push(parsed)
} else if (options.type === "playlist") { } else if (options.type === "playlist") {
const parsed = parsePlaylist(data); const parsed = parsePlaylist(details[i]);
if (!parsed) continue; if (!parsed) continue;
res = parsed; results.push(parsed)
} }
results.push(res);
} }
return results
return results as (Video | Channel | PlayList)[];
} }
function parseDuration(duration: string): number { function parseDuration(duration: string): number {
duration ??= "0:00"; duration ??= "0:00";
const args = duration.split(":"); const args = duration.split(":");