mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-10 00:58:17 +02:00
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.
This commit is contained in:
parent
92743d423a
commit
c5a088d341
10
youtube-dl
10
youtube-dl
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user