projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[BlipTVIE] Fix and simplify extraction of embedded videos
[youtube-dl]
/
youtube_dl
/
extractor
/
viki.py
diff --git
a/youtube_dl/extractor/viki.py
b/youtube_dl/extractor/viki.py
index cd986a74968e2e08de1ca0d15a14eb30cdcd02dd..2206a06d59f57093f59135f6faa8d68381695a95 100644
(file)
--- a/
youtube_dl/extractor/viki.py
+++ b/
youtube_dl/extractor/viki.py
@@
-2,6
+2,7
@@
import re
from ..utils import (
ExtractorError,
from ..utils import (
ExtractorError,
+ unescapeHTML,
unified_strdate,
)
from .subtitles import SubtitlesInfoExtractor
unified_strdate,
)
from .subtitles import SubtitlesInfoExtractor
@@
-39,7
+40,7
@@
class VikiIE(SubtitlesInfoExtractor):
if uploader_m is None:
uploader = None
else:
if uploader_m is None:
uploader = None
else:
- uploader = uploader.group(1).strip()
+ uploader = uploader
_m
.group(1).strip()
rating_str = self._html_search_regex(
r'<strong>Rating: </strong>\s*([^<]*)<', webpage,
rating_str = self._html_search_regex(
r'<strong>Rating: </strong>\s*([^<]*)<', webpage,
@@
-91,7
+92,8
@@
class VikiIE(SubtitlesInfoExtractor):
def _get_available_subtitles(self, video_id, info_webpage):
res = {}
def _get_available_subtitles(self, video_id, info_webpage):
res = {}
- for sturl in re.findall(r'<track src="([^"]+)"/>'):
+ for sturl_html in re.findall(r'<track src="([^"]+)"/>', info_webpage):
+ sturl = unescapeHTML(sturl_html)
m = re.search(r'/(?P<lang>[a-z]+)\.vtt', sturl)
if not m:
continue
m = re.search(r'/(?P<lang>[a-z]+)\.vtt', sturl)
if not m:
continue