]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[tudou] Improve regexs
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 12 Sep 2015 18:51:20 +0000 (02:51 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 12 Sep 2015 18:51:20 +0000 (02:51 +0800)
youtube_dl/extractor/tudou.py

index 3b993192ccd9f493dc830ef4ae1bae28410f07a8..53ba8511f419b696fe199c27d1a8ff5dafbb65ef 100644 (file)
@@ -44,21 +44,21 @@ class TudouIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         youku_vcode = self._search_regex(
-            r'vcode:\s*[\'"](.+?)[\'"]', webpage, 'youku vcode', default=None)
+            r'vcode\s*:\s*[\'"]([^\'"]*)[\'"]', webpage, 'youku vcode', default=None)
         if youku_vcode:
             return self.url_result('youku:' + youku_vcode, ie='Youku')
 
         title = self._search_regex(
-            r",kw:\s*['\"](.+?)[\"']", webpage, 'title')
+            r',kw\s*:\s*[\'"]([^\'"]+)[\'"]', webpage, 'title')
         thumbnail_url = self._search_regex(
-            r",pic:\s*[\"'](.+?)[\"']", webpage, 'thumbnail URL', fatal=False)
+            r',pic\s*:\s*[\'"]([^\'"]+)[\'"]', webpage, 'thumbnail URL', fatal=False)
 
         player_url = self._search_regex(
-            r"playerUrl\s*:\s*['\"](.+?\.swf)[\"']",
+            r'playerUrl\s*:\s*[\'"]([^\'"]+\.swf)[\'"]',
             webpage, 'player URL', default=self._PLAYER_URL)
 
         segments = self._parse_json(self._search_regex(
-            r'segs: \'(.*)\'', webpage, 'segments'), video_id)
+            r'segs: \'([^\']+)\'', webpage, 'segments'), video_id)
         # It looks like the keys are the arguments that have to be passed as
         # the hd field in the request url, we pick the higher
         # Also, filter non-number qualities (see issue #3643).