X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fgoogleplus.py;h=ab12d7e9381317b4dfddb679eced39db2f752ed4;hb=91dbaef40692a68a53aa74858f538a5699bae9ea;hp=a8f171afd5dcbcd5662b4ff53de3c48c6e0a2dd6;hpb=427023a1e6f2bb45a61b2bbfd56f845ee0c0ffee;p=youtube-dl.git diff --git a/youtube_dl/extractor/googleplus.py b/youtube_dl/extractor/googleplus.py index a8f171afd..ab12d7e93 100644 --- a/youtube_dl/extractor/googleplus.py +++ b/youtube_dl/extractor/googleplus.py @@ -10,8 +10,7 @@ from ..utils import ( 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 = { @@ -41,7 +40,9 @@ class GooglePlusIE(InfoExtractor): self.report_extraction(video_id) # Extract update date - upload_date = self._html_search_regex('title="Timestamp">(.*?)', + upload_date = self._html_search_regex( + r'''(?x) + ([0-9]{4}-[0-9]{2}-[0-9]{2})''', webpage, u'upload date', fatal=False) if upload_date: # Convert timestring to a format suitable for filename @@ -58,8 +59,8 @@ class GooglePlusIE(InfoExtractor): 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'