diff options
| author | Rogério Brito <rbrito@ime.usp.br> | 2011-01-29 04:13:54 -0200 |
|---|---|---|
| committer | Rogério Brito <rbrito@ime.usp.br> | 2011-01-29 04:13:54 -0200 |
| commit | c5a088d341e3aeaf65fbca02523c02ff3bccee6e (patch) | |
| tree | 15937825c5761984417acd761480d10082a05c4d /youtube-dl | |
| parent | 92743d423a7dfaf0f803deab14475e6343091f20 (diff) | |
| download | youtube-dl-c5a088d341e3aeaf65fbca02523c02ff3bccee6e.zip youtube-dl-c5a088d341e3aeaf65fbca02523c02ff3bccee6e.tar.gz youtube-dl-c5a088d341e3aeaf65fbca02523c02ff3bccee6e.tar.bz2 | |
Use non-greedy regexps, for safety.
Since I was very lazy when I coded this, I took the fastest route. Luckily,
Vasyl' Vavrychuk pointed this out and I went (after many months) and just
did some minor changes.
Diffstat (limited to 'youtube-dl')
| -rwxr-xr-x | youtube-dl | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1765,21 +1765,21 @@ class VimeoIE(InfoExtractor): # Extract uploader and title from webpage self.report_extraction(video_id) - mobj = re.search(r'<caption>(.*)</caption>', webpage) + mobj = re.search(r'<caption>(.*?)</caption>', webpage) if mobj is None: self._downloader.trouble(u'ERROR: unable to extract video title') return video_title = mobj.group(1).decode('utf-8') simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title) - mobj = re.search(r'<uploader_url>http://vimeo.com/(.*)</uploader_url>', webpage) + mobj = re.search(r'<uploader_url>http://vimeo.com/(.*?)</uploader_url>', webpage) if mobj is None: self._downloader.trouble(u'ERROR: unable to extract video uploader') return video_uploader = mobj.group(1).decode('utf-8') # Extract video thumbnail - mobj = re.search(r'<thumbnail>(.*)</thumbnail>', webpage) + mobj = re.search(r'<thumbnail>(.*?)</thumbnail>', webpage) if mobj is None: self._downloader.trouble(u'ERROR: unable to extract video thumbnail') return @@ -1795,14 +1795,14 @@ class VimeoIE(InfoExtractor): video_description = 'Foo.' # Extract request signature - mobj = re.search(r'<request_signature>(.*)</request_signature>', webpage) + mobj = re.search(r'<request_signature>(.*?)</request_signature>', webpage) if mobj is None: self._downloader.trouble(u'ERROR: unable to extract request signature') return sig = mobj.group(1).decode('utf-8') # Extract request signature expiration - mobj = re.search(r'<request_signature_expires>(.*)</request_signature_expires>', webpage) + mobj = re.search(r'<request_signature_expires>(.*?)</request_signature_expires>', webpage) if mobj is None: self._downloader.trouble(u'ERROR: unable to extract request signature expiration') return |