Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-12-01 20:57:54 +01:00
Code Issues Releases Wiki Activity

Some coding-conventions fixes

Browse Source
This commit is contained in:
Markus Golser 2018-10-05 08:30:14 +02:00
parent 6149569227
commit 80da4fb798
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
youtube_dl/extractor/raisudtirol.py
View File

@ -1,16 +1,16 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
js_to_json, js_to_json,
merge_dicts merge_dicts
) )
class RaisudtirolIE(InfoExtractor): class RaisudtirolIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?raisudtirol\.rai\.it/(?:de|it|la)/index.php\?media\=(?P<id>...[0-9]+)' _VALID_URL = r'https?://(?:www\.)?raisudtirol\.rai\.it/(?:de|it|la)/index.php\?media\=(?P<id>...[0-9]+)'
_TESTS = [ { _TESTS = [
{
'url': 'http://www.raisudtirol.rai.it/la/index.php?media=Ttv1538690400', 'url': 'http://www.raisudtirol.rai.it/la/index.php?media=Ttv1538690400',
'md5': 'cb29c5cf2a39f75a055685612260ad95', 'md5': 'cb29c5cf2a39f75a055685612260ad95',
'info_dict': { 'info_dict': {
@ -19,16 +19,16 @@ class RaisudtirolIE(InfoExtractor):
'title': 'TRAIL 10', 'title': 'TRAIL 10',
'thumbnail': r're:^https?://.*\.jpg$', 'thumbnail': r're:^https?://.*\.jpg$',
}, },
}, { }, {
'url': 'http://www.raisudtirol.rai.it/it/index.php?media=Ptv1538300700', 'url': 'http://www.raisudtirol.rai.it/it/index.php?media=Ptv1538300700',
'md5': 'aff4a51dc402a19a3effeeeb271ef538', 'md5': 'aff4a51dc402a19a3effeeeb271ef538',
'info_dict': { 'info_dict': {
'id': 'Ptv1538300700', 'id': 'Ptv1538300700',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Tapis Roulant', 'title': 'Tapis Roulant',
'thumbnail': r're:^https?://.*\.jpg$', 'thumbnail': r're:^https?://.*\.jpg$',
}, },
}, { }, {
'url': 'http://www.raisudtirol.rai.it/de/index.php?media=Ptv1538511600', 'url': 'http://www.raisudtirol.rai.it/de/index.php?media=Ptv1538511600',
'md5': '9523207e57a0db6b322eccb70825142a', 'md5': '9523207e57a0db6b322eccb70825142a',
'info_dict': { 'info_dict': {
@ -37,7 +37,7 @@ class RaisudtirolIE(InfoExtractor):
'title': 'Pro und Contra: Kein Einkaufen am Sonntag mehr?', 'title': 'Pro und Contra: Kein Einkaufen am Sonntag mehr?',
'thumbnail': r're:^https?://.*\.jpg$', 'thumbnail': r're:^https?://.*\.jpg$',
} }
}] }]
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
@ -47,13 +47,13 @@ class RaisudtirolIE(InfoExtractor):
'id': video_id, 'id': video_id,
'title': title, 'title': title,
} }
jwplayer_data = self._find_jwplayer_data( webpage, video_id, transform_source=js_to_json) jwplayer_data = self._find_jwplayer_data(webpage, video_id, transform_source=js_to_json)
if jwplayer_data: if jwplayer_data:
try: try:
info = self._parse_jwplayer_data( info = self._parse_jwplayer_data(
jwplayer_data, video_id, require_title=False, base_url=url) jwplayer_data, video_id, require_title=False, base_url=url)
if info['thumbnail']: if info['thumbnail']:
info['thumbnail'] = ('http://www.raisudtirol.rai.it'+info['thumbnail']) info['thumbnail'] = ('http://www.raisudtirol.rai.it' + info['thumbnail'])
return merge_dicts(info, info_dict) return merge_dicts(info, info_dict)
except ExtractorError: except ExtractorError:
# See https://github.com/rg3/youtube-dl/pull/16735 # See https://github.com/rg3/youtube-dl/pull/16735