projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[jeuxvideo] fix video file md5sum
[youtube-dl]
/
youtube_dl
/
extractor
/
googleplus.py
diff --git
a/youtube_dl/extractor/googleplus.py
b/youtube_dl/extractor/googleplus.py
index a8f171afd5dcbcd5662b4ff53de3c48c6e0a2dd6..8895ad2897f8abd30471ba3f7ef07963c44e7b57 100644
(file)
--- a/
youtube_dl/extractor/googleplus.py
+++ b/
youtube_dl/extractor/googleplus.py
@@
-10,8
+10,7
@@
from ..utils import (
class GooglePlusIE(InfoExtractor):
class GooglePlusIE(InfoExtractor):
- """Information extractor for plus.google.com."""
-
+ IE_DESC = u'Google Plus'
_VALID_URL = r'(?:https://)?plus\.google\.com/(?:[^/]+/)*?posts/(\w+)'
IE_NAME = u'plus.google'
_TEST = {
_VALID_URL = r'(?:https://)?plus\.google\.com/(?:[^/]+/)*?posts/(\w+)'
IE_NAME = u'plus.google'
_TEST = {
@@
-41,7
+40,8
@@
class GooglePlusIE(InfoExtractor):
self.report_extraction(video_id)
# Extract update date
self.report_extraction(video_id)
# Extract update date
- upload_date = self._html_search_regex('title="Timestamp">(.*?)</a>',
+ upload_date = self._html_search_regex(
+ ['title="Timestamp">(.*?)</a>', r'<a.+?class="g-M.+?>(.+?)</a>'],
webpage, u'upload date', fatal=False)
if upload_date:
# Convert timestring to a format suitable for filename
webpage, u'upload date', fatal=False)
if upload_date:
# Convert timestring to a format suitable for filename
@@
-58,8
+58,8
@@
class GooglePlusIE(InfoExtractor):
webpage, 'title', default=u'NA')
# Step 2, Simulate clicking the image box to launch video
webpage, 'title', default=u'NA')
# 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),
+ DOMAIN = 'https://plus.google.com
/
'
+ video_page = self._search_regex(r'<a href="((?:%s)?photos/.*?)"' % re.escape(DOMAIN),
webpage, u'video page URL')
if not video_page.startswith(DOMAIN):
video_page = DOMAIN + video_page
webpage, u'video page URL')
if not video_page.startswith(DOMAIN):
video_page = DOMAIN + video_page