[crunchyroll] Improve subtitle regex (Closes #7262)
authorSergey M․ <dstftw@gmail.com>
Thu, 22 Oct 2015 14:34:11 +0000 (20:34 +0600)
committerSergey M․ <dstftw@gmail.com>
Thu, 22 Oct 2015 14:34:11 +0000 (20:34 +0600)
youtube_dl/extractor/crunchyroll.py

index cecd0c7843b9b42881637ad0617e5e351eb8f97e..f8ce10111df8078638d9c56b837f354b2345ad73 100644 (file)
@@ -245,7 +245,7 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
 
     def _get_subtitles(self, video_id, webpage):
         subtitles = {}
-        for sub_id, sub_name in re.findall(r'\?ssid=([0-9]+)" title="([^"]+)', webpage):
+        for sub_id, sub_name in re.findall(r'\bssid=([0-9]+)"[^>]+?\btitle="([^"]+)', webpage):
             sub_page = self._download_webpage(
                 'http://www.crunchyroll.com/xml/?req=RpcApiSubtitle_GetXml&subtitle_script_id=' + sub_id,
                 video_id, note='Downloading subtitles for ' + sub_name)