aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-07-17 14:52:01 +0100
committerremitamine <remitamine@gmail.com>2015-07-23 11:59:13 +0100
commit36dbca87848fc5698d3e0b89380c7bcec741ceaf (patch)
tree7132ce763ff5f47a2fa2cbc764674ab39a037e2a /youtube_dl
parentd1cc05e17eccccb7ee6473574c6a4f887104baeb (diff)
fix recursive error
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/googledrive.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/youtube_dl/extractor/googledrive.py b/youtube_dl/extractor/googledrive.py
index 6d9bcfefd..a3d9b4450 100644
--- a/youtube_dl/extractor/googledrive.py
+++ b/youtube_dl/extractor/googledrive.py
@@ -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'
)