projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d1cc05e
)
fix recursive error
author
remitamine
<remitamine@gmail.com>
Fri, 17 Jul 2015 13:52:01 +0000
(14:52 +0100)
committer
remitamine
<remitamine@gmail.com>
Thu, 23 Jul 2015 10:59:13 +0000
(11:59 +0100)
youtube_dl/extractor/googledrive.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/googledrive.py
b/youtube_dl/extractor/googledrive.py
index 6d9bcfefdd1bfda424004f706d2a1d8eea711357..a3d9b44506015002c3dad145b614f763995cac86 100644
(file)
--- 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',
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
}
'url': 'https://drive.google.com/file/d/%s' % video_id
}
@@
-66,34
+66,34
@@
class GoogleDriveIE(InfoExtractor):
)
try:
title = self._html_search_regex(
)
try:
title = self._html_search_regex(
- r'"title"\s
+,\s+"[^"]+
',
+ r'"title"\s
*,\s*"([^"]+)
',
webpage,
'title'
)
fmt_stream_map = self._html_search_regex(
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(
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(
webpage,
'fmt_list'
)
# timestamp = self._html_search_regex(
-# r'"timestamp"\s
+,\s+"[^"]+
',
+# r'"timestamp"\s
*,\s*"([^"]+)
',
# webpage,
# 'timestamp'
# )
length_seconds = self._html_search_regex(
# 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(
webpage,
'length_seconds'
)
except RegexNotFoundError:
try:
reason = self._html_search_regex(
- r'"reason","
[^"]+
',
+ r'"reason","
([^"]+)
',
webpage,
'reason'
)
webpage,
'reason'
)