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

Reverted changes in 0.6.4

Browse Source
This commit is contained in:
killer069 2021-08-30 14:42:51 +05:30
parent 1cfaf52945
commit 5bef17528a
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@ import { url_get } from './request'
import { format_decipher, js_tokens } from './cipher' import { format_decipher, js_tokens } from './cipher'
import { Video } from '../classes/Video' import { Video } from '../classes/Video'
import { PlayList } from '../classes/Playlist' import { PlayList } from '../classes/Playlist'
import { parseThumbnail } from './parser';
const DEFAULT_API_KEY = "AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8"; const DEFAULT_API_KEY = "AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8";
const video_pattern = /^((?:https?:)?\/\/)?(?:(?:www|m)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w\-]+\?v=|embed\/|v\/)?)([\w\-]+)(\S+)?$/; const video_pattern = /^((?:https?:)?\/\/)?(?:(?:www|m)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w\-]+\?v=|embed\/|v\/)?)([\w\-]+)(\S+)?$/;
@ -30,7 +29,7 @@ export async function video_basic_info(url : string){
durationInSec : vid.lengthSeconds, durationInSec : vid.lengthSeconds,
durationRaw : parseSeconds(vid.lengthSeconds), durationRaw : parseSeconds(vid.lengthSeconds),
uploadedDate : microformat.publishDate, uploadedDate : microformat.publishDate,
thumbnail : parseThumbnail(vid.thumbnail.thumbnails), thumbnail : vid.thumbnail.thumbnails[vid.thumbnail.thumbnails.length - 1],
channel : { channel : {
name : vid.author, name : vid.author,
id : vid.channelId, id : vid.channelId,

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

@ -130,7 +130,7 @@ export function parseVideo(data?: any): Video | void {
description: data.videoRenderer.descriptionSnippet && data.videoRenderer.descriptionSnippet.runs[0] ? data.videoRenderer.descriptionSnippet.runs[0].text : "", description: data.videoRenderer.descriptionSnippet && data.videoRenderer.descriptionSnippet.runs[0] ? data.videoRenderer.descriptionSnippet.runs[0].text : "",
duration: data.videoRenderer.lengthText ? parseDuration(data.videoRenderer.lengthText.simpleText) : 0, duration: data.videoRenderer.lengthText ? parseDuration(data.videoRenderer.lengthText.simpleText) : 0,
duration_raw: data.videoRenderer.lengthText ? data.videoRenderer.lengthText.simpleText : null, duration_raw: data.videoRenderer.lengthText ? data.videoRenderer.lengthText.simpleText : null,
thumbnail: parseThumbnail(data.videoRenderer.thumbnail.thumbnails), thumbnail: data.videoRenderer.thumbnail.thumbnails[data.videoRenderer.thumbnail.thumbnails.length - 1],
channel: { channel: {
id: data.videoRenderer.ownerText.runs[0].navigationEndpoint.browseEndpoint.browseId || null, id: data.videoRenderer.ownerText.runs[0].navigationEndpoint.browseEndpoint.browseId || null,
name: data.videoRenderer.ownerText.runs[0].text || null, name: data.videoRenderer.ownerText.runs[0].text || null,
@ -149,28 +149,6 @@ export function parseVideo(data?: any): Video | void {
return res; return res;
} }
export function parseThumbnail(thumbnails :thumbnail[]) : thumbnail{
let parsed : thumbnail = {
width : '',
height : '',
url : ''
}
thumbnails.forEach((thumb) => {
if(thumb.url.indexOf('maxresdefault') !== -1){
parsed = {
width : thumb.width,
height : thumb.height,
url : thumb.url
}
}
})
if(parsed.url.length !== 0){
return parsed
}
else {
return thumbnails[thumbnails.length - 1]
}
}
export function parsePlaylist(data?: any): PlayList | void { export function parsePlaylist(data?: any): PlayList | void {
if (!data.playlistRenderer) return; if (!data.playlistRenderer) return;