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

Merge branch 'developer' of https://github.com/play-dl/play-dl into developer

Browse Source
This commit is contained in:
killer069
2021-12-27 12:09:41 +05:30
parent 6ff34c2baa e1b0d14477
commit e9ccfb219d
8 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
play-dl/YouTube/utils/cipher.ts
View File

@@ -9,7 +9,7 @@ interface formatOptions {
s?: string;
}
// RegExp for various js functions
const var_js = '[a-zA-Z_\\$][a-zA-Z_0-9]*';
const var_js = '[a-zA-Z_\\$]\\w*';
const singlequote_js = `'[^'\\\\]*(:?\\\\[\\s\\S][^'\\\\]*)*'`;
const duoblequote_js = `"[^"\\\\]*(:?\\\\[\\s\\S][^"\\\\]*)*"`;
const quote_js = `(?:${singlequote_js}|${duoblequote_js})`;

12
play-dl/YouTube/utils/extractor.ts
View File

@@ -122,12 +122,12 @@ export async function video_basic_info(url: string, options: InfoOptions = {}):
const player_data = body
.split('var ytInitialPlayerResponse = ')?.[1]
?.split(';</script>')[0]
.split(/;\s*"(var|const|let)"/)[0];
.split(/;\s*(var|const|let)\s/)[0];
if (!player_data) throw new Error('Initial Player Response Data is undefined.');
const initial_data = body
.split('var ytInitialData = ')?.[1]
?.split(';</script>')[0]
.split(/;\s*"(var|const|let)"/)[0];
.split(/;\s*(var|const|let)\s/)[0];
if (!initial_data) throw new Error('Initial Response Data is undefined.');
const player_response = JSON.parse(player_data);
const initial_response = JSON.parse(initial_data);
@@ -226,7 +226,7 @@ export async function video_stream_info(url: string, options: InfoOptions = {}):
const player_data = body
.split('var ytInitialPlayerResponse = ')?.[1]
?.split(';</script>')[0]
.split(/;\s*(var|const|let)/)[0];
.split(/;\s*(var|const|let)\s/)[0];
if (!player_data) throw new Error('Initial Player Response Data is undefined.');
const player_response = JSON.parse(player_data);
if (player_response.playabilityStatus.status !== 'OK')
@@ -346,7 +346,7 @@ export async function playlist_info(url: string, options: PlaylistOptions = {}):
body
.split('var ytInitialData = ')[1]
.split(';</script>')[0]
.split(/;\s*"(var|const|let)"/)[0]
.split(/;\s*(var|const|let)\s/)[0]
);
if (response.alerts) {
if (response.alerts[0].alertWithButtonRenderer?.type === 'INFO') {
@@ -463,12 +463,12 @@ function getNormalPlaylist(response: any, body: any): YouTubePlayList {
if (!data.title.runs || !data.title.runs.length) throw new Error('Failed to Parse Playlist info.');
const author = playlist_details[1]?.playlistSidebarSecondaryInfoRenderer.videoOwner;
const views = data.stats.length === 3 ? data.stats[1].simpleText.replace(/[^0-9]/g, '') : 0;
const views = data.stats.length === 3 ? data.stats[1].simpleText.replace(/\D/g, '') : 0;
const lastUpdate =
data.stats
.find((x: any) => 'runs' in x && x['runs'].find((y: any) => y.text.toLowerCase().includes('last update')))
?.runs.pop()?.text ?? null;
const videosCount = data.stats[0].runs[0].text.replace(/[^0-9]/g, '') || 0;
const videosCount = data.stats[0].runs[0].text.replace(/\D/g, '') || 0;
const res = new YouTubePlayList({
continuation: {

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

@@ -29,7 +29,7 @@ export function ParseSearchResult(html: string, options?: ParseSearchInterface):
const data = html
.split('var ytInitialData = ')?.[1]
?.split(';</script>')[0]
.split(/;\s*"(var|const|let)"/)[0];
.split(/;\s*(var|const|let)\s/)[0];
const json_data = JSON.parse(data);
const results = [];
const details =
@@ -146,7 +146,7 @@ export function parseVideo(data?: any): YouTubeVideo {
artist: Boolean(badge?.includes('artist'))
},
uploadedAt: data.videoRenderer.publishedTimeText?.simpleText ?? null,
views: data.videoRenderer.viewCountText?.simpleText?.replace(/[^0-9]/g, '') ?? 0,
views: data.videoRenderer.viewCountText?.simpleText?.replace(/\D/g, '') ?? 0,
live: durationText ? false : true
});
@@ -179,7 +179,7 @@ export function parsePlaylist(data?: any): YouTubePlayList {
name: channel?.text,
url: `https://www.youtube.com${channel?.navigationEndpoint.commandMetadata.webCommandMetadata.url}`
},
videos: parseInt(data.playlistRenderer.videoCount.replace(/[^0-9]/g, ''))
videos: parseInt(data.playlistRenderer.videoCount.replace(/\D/g, ''))
},
true
);