Browse Source

remove unnecessary regex group names

totalwebcasting
remitamine 10 years ago
parent
commit
d1cc05e17e
1 changed files with 13 additions and 19 deletions
  1. +13
    -19
      youtube_dl/extractor/googledrive.py

+ 13
- 19
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',
group='title'
'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',
group='fmt_stream_map'
'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',
group='fmt_list'
'fmt_list'
) )
# timestamp = self._html_search_regex( # timestamp = self._html_search_regex(
# r'"timestamp","(?P<timestamp>.*?)"',
# r'"timestamp"\s+,\s+"[^"]+',
# webpage, # webpage,
# 'timestamp',
# group='timestamp'
# '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',
group='length_seconds'
'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',
group='reason'
'reason'
) )
self.report_warning(reason) self.report_warning(reason)
return return


Loading…
Cancel
Save