update url and video id instead of returning a url result

This commit is contained in:
grqx 2024-10-01 23:51:00 +13:00
parent 23ea25196d
commit 3582a238a0

View file

@ -179,9 +179,16 @@ class GoogleDriveIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
try:
_, webpage_urlh = self._download_webpage_handle(url, video_id) _, webpage_urlh = self._download_webpage_handle(url, video_id)
except ExtractorError as e:
if isinstance(e.cause, HTTPError):
if e.cause.status in (401, 403):
self.raise_login_required('Access Denied')
raise
if webpage_urlh.url != url: if webpage_urlh.url != url:
return self.url_result(webpage_urlh.url) url = webpage_urlh.url
video_id = self._match_id(url)
video_info = urllib.parse.parse_qs(self._download_webpage( video_info = urllib.parse.parse_qs(self._download_webpage(
'https://drive.google.com/get_video_info', 'https://drive.google.com/get_video_info',
@ -378,7 +385,7 @@ class GoogleDriveFolderIE(InfoExtractor):
except ExtractorError as e: except ExtractorError as e:
if isinstance(e.cause, HTTPError): if isinstance(e.cause, HTTPError):
if e.cause.status == 404: if e.cause.status == 404:
self.raise_no_formats(e.cause.msg) self.raise_no_formats(e.cause.msg, expected=True)
elif e.cause.status == 403: elif e.cause.status == 403:
# logged in with an account without access # logged in with an account without access
self.raise_login_required('Access Denied') self.raise_login_required('Access Denied')