X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fviki.py;h=2206a06d59f57093f59135f6faa8d68381695a95;hb=efb1bb90a06d95f838e2854b6dd523749d8e8955;hp=7b3a58de8ed9bcd3162a5d62322f5ee757debef7;hpb=6d88bc37a32d5d624c09d68cd19e64e6095fa5de;p=youtube-dl
diff --git a/youtube_dl/extractor/viki.py b/youtube_dl/extractor/viki.py
index 7b3a58de8..2206a06d5 100644
--- a/youtube_dl/extractor/viki.py
+++ b/youtube_dl/extractor/viki.py
@@ -2,6 +2,7 @@ import re
from ..utils import (
ExtractorError,
+ unescapeHTML,
unified_strdate,
)
from .subtitles import SubtitlesInfoExtractor
@@ -34,11 +35,12 @@ class VikiIE(SubtitlesInfoExtractor):
description = self._og_search_description(webpage)
thumbnail = self._og_search_thumbnail(webpage)
- uploader = self._html_search_regex(
- r'Broadcast Network: \s*([^<]*)<', webpage,
- u'uploader')
- if uploader is not None:
- uploader = uploader.strip()
+ uploader_m = re.search(
+ r'Broadcast Network: \s*([^<]*)<', webpage)
+ if uploader_m is None:
+ uploader = None
+ else:
+ uploader = uploader_m.group(1).strip()
rating_str = self._html_search_regex(
r'Rating: \s*([^<]*)<', webpage,
@@ -90,7 +92,8 @@ class VikiIE(SubtitlesInfoExtractor):
def _get_available_subtitles(self, video_id, info_webpage):
res = {}
- for sturl in re.findall(r''):
+ for sturl_html in re.findall(r'', info_webpage):
+ sturl = unescapeHTML(sturl_html)
m = re.search(r'/(?P[a-z]+)\.vtt', sturl)
if not m:
continue