mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-09-07 05:35:14 +02:00
[walla] Convert to new subtitles system
This commit is contained in:
parent
48246541da
commit
bd7fe0cf66
@ -3,14 +3,14 @@ from __future__ import unicode_literals
|
|||||||
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from .subtitles import SubtitlesInfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
xpath_text,
|
xpath_text,
|
||||||
int_or_none,
|
int_or_none,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class WallaIE(SubtitlesInfoExtractor):
|
class WallaIE(InfoExtractor):
|
||||||
_VALID_URL = r'http://vod\.walla\.co\.il/[^/]+/(?P<id>\d+)/(?P<display_id>.+)'
|
_VALID_URL = r'http://vod\.walla\.co\.il/[^/]+/(?P<id>\d+)/(?P<display_id>.+)'
|
||||||
_TEST = {
|
_TEST = {
|
||||||
'url': 'http://vod.walla.co.il/movie/2642630/one-direction-all-for-one',
|
'url': 'http://vod.walla.co.il/movie/2642630/one-direction-all-for-one',
|
||||||
@ -52,13 +52,10 @@ class WallaIE(SubtitlesInfoExtractor):
|
|||||||
subtitles = {}
|
subtitles = {}
|
||||||
for subtitle in item.findall('./subtitles/subtitle'):
|
for subtitle in item.findall('./subtitles/subtitle'):
|
||||||
lang = xpath_text(subtitle, './title')
|
lang = xpath_text(subtitle, './title')
|
||||||
subtitles[self._SUBTITLE_LANGS.get(lang, lang)] = xpath_text(subtitle, './src')
|
subtitles[self._SUBTITLE_LANGS.get(lang, lang)] = [{
|
||||||
|
'ext': 'srt',
|
||||||
if self._downloader.params.get('listsubtitles', False):
|
'url': xpath_text(subtitle, './src'),
|
||||||
self._list_available_subtitles(video_id, subtitles)
|
}]
|
||||||
return
|
|
||||||
|
|
||||||
subtitles = self.extract_subtitles(video_id, subtitles)
|
|
||||||
|
|
||||||
formats = []
|
formats = []
|
||||||
for quality in item.findall('./qualities/quality'):
|
for quality in item.findall('./qualities/quality'):
|
||||||
|
Loading…
Reference in New Issue
Block a user