projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
db241e8
)
[googleplus] Adapt to new detail URL format
author
Philipp Hagemeister
<phihag@phihag.de>
Tue, 25 Jun 2013 15:52:29 +0000
(17:52 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Tue, 25 Jun 2013 15:52:32 +0000
(17:52 +0200)
youtube_dl/extractor/googleplus.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/googleplus.py
b/youtube_dl/extractor/googleplus.py
index e922bd1405d57ba0c074af48f0192b90cf0eb5ef..ff2cdeebb4e9dde5f1ff8e3a7c7bb0c00b48f048 100644
(file)
--- a/
youtube_dl/extractor/googleplus.py
+++ b/
youtube_dl/extractor/googleplus.py
@@
-46,14
+46,18
@@
class GooglePlusIE(InfoExtractor):
video_title = self._html_search_regex(r'<meta name\=\"Description\" content\=\"(.*?)[\n<"]',
webpage, 'title', default=u'NA')
video_title = self._html_search_regex(r'<meta name\=\"Description\" content\=\"(.*?)[\n<"]',
webpage, 'title', default=u'NA')
- # Step 2, Stimulate clicking the image box to launch video
- video_page = self._search_regex('"(https\://plus\.google\.com/photos/.*?)",,"image/jpeg","video"\]',
+ # Step 2, Simulate clicking the image box to launch video
+ DOMAIN = 'https://plus.google.com'
+ video_page = self._search_regex(r'<a href="((?:%s)?/photos/.*?)"' % re.escape(DOMAIN),
webpage, u'video page URL')
webpage, u'video page URL')
+ if not video_page.startswith(DOMAIN):
+ video_page = DOMAIN + video_page
+
webpage = self._download_webpage(video_page, video_id, u'Downloading video page')
# Extract video links on video page
"""Extract video links of all sizes"""
webpage = self._download_webpage(video_page, video_id, u'Downloading video page')
# Extract video links on video page
"""Extract video links of all sizes"""
- pattern = '\d+,\d+,(\d+),"(http\://redirector\.googlevideo\.com.*?)"'
+ pattern =
r
'\d+,\d+,(\d+),"(http\://redirector\.googlevideo\.com.*?)"'
mobj = re.findall(pattern, webpage)
if len(mobj) == 0:
raise ExtractorError(u'Unable to extract video links')
mobj = re.findall(pattern, webpage)
if len(mobj) == 0:
raise ExtractorError(u'Unable to extract video links')