fenix
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[extractor/googledrive] Fix source format extraction (#7395) 

Closes #7344
Authored by: RfadnjdExt
This commit is contained in:
RfadnjdExt 2023-07-05 09:17:13 +07:00 committed by GitHub
parent 4dc4d8473c
commit 3b7f5300c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
yt_dlp/extractor/googledrive.py
View File

@ -5,7 +5,9 @@ from ..compat import compat_parse_qs
from ..utils import ( from ..utils import (
ExtractorError, ExtractorError,
determine_ext, determine_ext,
extract_attributes,
get_element_by_class, get_element_by_class,
get_element_html_by_id,
int_or_none, int_or_none,
lowercase_escape, lowercase_escape,
try_get, try_get,
@ -34,6 +36,7 @@ class GoogleDriveIE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'title': 'Big Buck Bunny.mp4', 'title': 'Big Buck Bunny.mp4',
'duration': 45, 'duration': 45,
'thumbnail': 'https://drive.google.com/thumbnail?id=0ByeS4oOUV-49Zzh4R1J6R09zazQ',
} }
}, { }, {
# video can't be watched anonymously due to view count limit reached, # video can't be watched anonymously due to view count limit reached,
@ -207,10 +210,10 @@ class GoogleDriveIE(InfoExtractor):
'export': 'download', 'export': 'download',
}) })
def request_source_file(source_url, kind): def request_source_file(source_url, kind, data=None):
return self._request_webpage( return self._request_webpage(
source_url, video_id, note='Requesting %s file' % kind, source_url, video_id, note='Requesting %s file' % kind,
errnote='Unable to request %s file' % kind, fatal=False) errnote='Unable to request %s file' % kind, fatal=False, data=data)
urlh = request_source_file(source_url, 'source') urlh = request_source_file(source_url, 'source')
if urlh: if urlh:
def add_source_format(urlh): def add_source_format(urlh):
@ -237,14 +240,10 @@ class GoogleDriveIE(InfoExtractor):
urlh, url, video_id, note='Downloading confirmation page', urlh, url, video_id, note='Downloading confirmation page',
errnote='Unable to confirm download', fatal=False) errnote='Unable to confirm download', fatal=False)
if confirmation_webpage: if confirmation_webpage:
confirm = self._search_regex( confirmed_source_url = extract_attributes(
r'confirm=([^&"\']+)', confirmation_webpage, get_element_html_by_id('download-form', confirmation_webpage) or '').get('action')
'confirmation code', default=None) if confirmed_source_url:
if confirm: urlh = request_source_file(confirmed_source_url, 'confirmed source', data=b'')
confirmed_source_url = update_url_query(source_url, {
'confirm': confirm,
})
urlh = request_source_file(confirmed_source_url, 'confirmed source')
if urlh and urlh.headers.get('Content-Disposition'): if urlh and urlh.headers.get('Content-Disposition'):
add_source_format(urlh) add_source_format(urlh)
else: else: