]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[fktv] Correct and improve some regexs
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 25 Sep 2015 09:51:48 +0000 (17:51 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 25 Sep 2015 09:51:48 +0000 (17:51 +0800)
youtube_dl/extractor/fktv.py

index 74c6cf8663dd4e815885324240933e9f35e47927..b081eb535ba490928c24ed4fb6a2d82d2b49cb6e 100644 (file)
@@ -28,13 +28,13 @@ class FKTVIE(InfoExtractor):
         episode = self._match_id(url)
 
         webpage = self._download_webpage('http://fernsehkritik.tv/folge-%s/play' % episode, episode)
-        title = clean_html(self._html_search_regex('<h3>([^<]+?)</h3>', webpage, 'title'))
-        matches = re.search(r'(?s)<video[^>]*poster="([^"]+)"[^>]*>(.*?)</video>', webpage)
+        title = clean_html(self._html_search_regex('<h3>([^<]+)</h3>', webpage, 'title'))
+        matches = re.search(r'(?s)<video[^>]+poster="([^"]+)"[^>]*>(.*)</video>', webpage)
         if matches is None:
             raise ExtractorError('Unable to extract the video')
 
         poster, sources = matches.groups()
-        urls = re.findall(r'(?s)<source[^>]*src="([^"]+)"[^>]*>', sources)
+        urls = re.findall(r'<source[^>]+src="([^"]+)"', sources)
         formats = [{'url': url, 'format_id': determine_ext(url)} for url in urls]
         return {
             'id': episode,