mollusk/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix recursive error

Browse Source
This commit is contained in:
remitamine
2015-07-17 14:52:01 +01:00
parent d1cc05e17e
commit 36dbca8784
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
youtube_dl/extractor/googledrive.py
View File

@@ -26,7 +26,7 @@ class GoogleDriveEmbedIE(InfoExtractor):
video_id = self._match_id(url)
return {
'_type': 'url',
'ie-key': 'GoogleDrive',
'ie_key': 'GoogleDrive',
'url': 'https://drive.google.com/file/d/%s' % video_id
}
@@ -66,34 +66,34 @@ class GoogleDriveIE(InfoExtractor):
)
try:
title = self._html_search_regex(
r'"title"\s+,\s+"[^"]+',
r'"title"\s*,\s*"([^"]+)',
webpage,
'title'
)
fmt_stream_map = self._html_search_regex(
r'"fmt_stream_map"\s+,\s+"[^"]+',
r'"fmt_stream_map"\s*,\s*"([^"]+)',
webpage,
'fmt_stream_map'
)
fmt_list = self._html_search_regex(
r'"fmt_list"\s+,\s+"[^"]+',
r'"fmt_list"\s*,\s*"([^"]+)',
webpage,
'fmt_list'
)
# timestamp = self._html_search_regex(
# r'"timestamp"\s+,\s+"[^"]+',
# r'"timestamp"\s*,\s*"([^"]+)',
# webpage,
# 'timestamp'
# )
length_seconds = self._html_search_regex(
r'"length_seconds"\s+,\s+"[^"]+',
r'"length_seconds"\s*,\s*"([^"]+)',
webpage,
'length_seconds'
)
except RegexNotFoundError:
try:
reason = self._html_search_regex(
r'"reason","[^"]+',
r'"reason","([^"]+)',
webpage,
'reason'
)