Upstream/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-15 21:57:53 +01:00
Code Issues Projects Releases Wiki Activity

remove unnecessary regex group names

Browse Source
This commit is contained in:
remitamine 2015-07-17 14:37:21 +01:00
parent 3b3d531965
commit d1cc05e17e
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
youtube_dl/extractor/googledrive.py
View File

@ -62,46 +62,40 @@ 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)
webpage = self._download_webpage( webpage = self._download_webpage(
'http://docs.google.com/file/d/'+video_id, video_id, encoding='unicode_escape' 'http://docs.google.com/file/d/' + video_id, video_id, encoding='unicode_escape'
) )
try: try:
title = self._html_search_regex( title = self._html_search_regex(
r'"title","(?P<title>.*?)"', r'"title"\s+,\s+"[^"]+',
webpage, webpage,
'title', 'title'
group='title'
) )
fmt_stream_map = self._html_search_regex( fmt_stream_map = self._html_search_regex(
r'"fmt_stream_map","(?P<fmt_stream_map>.*?)"', r'"fmt_stream_map"\s+,\s+"[^"]+',
webpage, webpage,
'fmt_stream_map', 'fmt_stream_map'
group='fmt_stream_map'
) )
fmt_list = self._html_search_regex( fmt_list = self._html_search_regex(
r'"fmt_list","(?P<fmt_list>.*?)"', r'"fmt_list"\s+,\s+"[^"]+',
webpage, webpage,
'fmt_list', 'fmt_list'
group='fmt_list'
) )
# timestamp = self._html_search_regex( # timestamp = self._html_search_regex(
# r'"timestamp","(?P<timestamp>.*?)"', # r'"timestamp"\s+,\s+"[^"]+',
# webpage, # webpage,
# 'timestamp', # 'timestamp'
# group='timestamp'
# ) # )
length_seconds = self._html_search_regex( length_seconds = self._html_search_regex(
r'"length_seconds","(?P<length_seconds>.*?)"', r'"length_seconds"\s+,\s+"[^"]+',
webpage, webpage,
'length_seconds', 'length_seconds'
group='length_seconds'
) )
except RegexNotFoundError: except RegexNotFoundError:
try: try:
reason = self._html_search_regex( reason = self._html_search_regex(
r'"reason","(?P<reason>.*?)"', r'"reason","[^"]+',
webpage, webpage,
'reason', 'reason'
group='reason'
) )
self.report_warning(reason) self.report_warning(reason)
return return