mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-08-28 18:15:19 +02:00
[oppetarkiv] Merge with svtplay
This commit is contained in:
parent
efda2d7854
commit
df5ae3eb16
@ -350,7 +350,6 @@
|
|||||||
from .oktoberfesttv import OktoberfestTVIE
|
from .oktoberfesttv import OktoberfestTVIE
|
||||||
from .ooyala import OoyalaIE
|
from .ooyala import OoyalaIE
|
||||||
from .openfilm import OpenFilmIE
|
from .openfilm import OpenFilmIE
|
||||||
from .oppetarkiv import OppetArkivIE
|
|
||||||
from .orf import (
|
from .orf import (
|
||||||
ORFTVthekIE,
|
ORFTVthekIE,
|
||||||
ORFOE1IE,
|
ORFOE1IE,
|
||||||
|
@ -1,66 +0,0 @@
|
|||||||
# coding: utf-8
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from .common import InfoExtractor
|
|
||||||
from ..utils import (
|
|
||||||
determine_ext,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class OppetArkivIE(InfoExtractor):
|
|
||||||
_VALID_URL = r'https?://(?:www\.)?oppetarkiv\.se/video/(?P<id>[0-9]+)'
|
|
||||||
_TEST = {
|
|
||||||
'url': 'http://www.oppetarkiv.se/video/1058509/rederiet-sasong-1-avsnitt-1-av-318',
|
|
||||||
'md5': '5c1eb616e59f733d4af77edc5177d2fe',
|
|
||||||
'info_dict': {
|
|
||||||
'id': '1058509',
|
|
||||||
'ext': 'flv',
|
|
||||||
'title': 'Farlig kryssning',
|
|
||||||
'duration': 2566,
|
|
||||||
'thumbnail': 're:^https?://.*[\.-]jpg$',
|
|
||||||
'age_limit': 0,
|
|
||||||
},
|
|
||||||
'skip': 'Only works from Sweden',
|
|
||||||
}
|
|
||||||
|
|
||||||
def _real_extract(self, url):
|
|
||||||
video_id = self._match_id(url)
|
|
||||||
info = self._download_json(
|
|
||||||
'http://www.oppetarkiv.se/video/%s?output=json' % video_id, video_id)
|
|
||||||
|
|
||||||
title = info['context']['title']
|
|
||||||
thumbnail = info['context'].get('thumbnailImage')
|
|
||||||
|
|
||||||
video_info = info['video']
|
|
||||||
formats = []
|
|
||||||
for vr in video_info['videoReferences']:
|
|
||||||
vurl = vr['url']
|
|
||||||
ext = determine_ext(vurl)
|
|
||||||
if ext == 'm3u8':
|
|
||||||
formats.extend(self._extract_m3u8_formats(
|
|
||||||
vurl, video_id,
|
|
||||||
ext='mp4', entry_protocol='m3u8_native',
|
|
||||||
m3u8_id=vr.get('playerType')))
|
|
||||||
elif ext == 'f4m':
|
|
||||||
formats.extend(self._extract_f4m_formats(
|
|
||||||
vurl + '?hdcore=3.3.0', video_id,
|
|
||||||
f4m_id=vr.get('playerType')))
|
|
||||||
else:
|
|
||||||
formats.append({
|
|
||||||
'format_id': vr.get('playerType'),
|
|
||||||
'url': vurl,
|
|
||||||
})
|
|
||||||
self._sort_formats(formats)
|
|
||||||
|
|
||||||
duration = video_info.get('materialLength')
|
|
||||||
|
|
||||||
age_limit = 18 if video_info.get('inappropriateForChildren') else 0
|
|
||||||
|
|
||||||
return {
|
|
||||||
'id': video_id,
|
|
||||||
'title': title,
|
|
||||||
'formats': formats,
|
|
||||||
'thumbnail': thumbnail,
|
|
||||||
'duration': duration,
|
|
||||||
'age_limit': age_limit,
|
|
||||||
}
|
|
@ -1,6 +1,8 @@
|
|||||||
# coding: utf-8
|
# coding: utf-8
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
determine_ext,
|
determine_ext,
|
||||||
@ -8,23 +10,40 @@
|
|||||||
|
|
||||||
|
|
||||||
class SVTPlayIE(InfoExtractor):
|
class SVTPlayIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:www\.)?svtplay\.se/video/(?P<id>[0-9]+)'
|
IE_DESC = 'SVT Play and Öppet arkiv'
|
||||||
_TEST = {
|
_VALID_URL = r'https?://(?:www\.)?(?P<host>svtplay|oppetarkiv)\.se/video/(?P<id>[0-9]+)'
|
||||||
|
_TESTS = [{
|
||||||
'url': 'http://www.svtplay.se/video/2609989/sm-veckan/sm-veckan-rally-final-sasong-1-sm-veckan-rally-final',
|
'url': 'http://www.svtplay.se/video/2609989/sm-veckan/sm-veckan-rally-final-sasong-1-sm-veckan-rally-final',
|
||||||
'md5': 'f4a184968bc9c802a9b41316657aaa80',
|
'md5': 'ade3def0643fa1c40587a422f98edfd9',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '2609989',
|
'id': '2609989',
|
||||||
'ext': 'mp4',
|
'ext': 'flv',
|
||||||
'title': 'SM veckan vinter, Örebro - Rally, final',
|
'title': 'SM veckan vinter, Örebro - Rally, final',
|
||||||
'duration': 4500,
|
'duration': 4500,
|
||||||
'thumbnail': 're:^https?://.*[\.-]jpg$',
|
'thumbnail': 're:^https?://.*[\.-]jpg$',
|
||||||
|
'age_limit': 0,
|
||||||
},
|
},
|
||||||
}
|
}, {
|
||||||
|
'url': 'http://www.oppetarkiv.se/video/1058509/rederiet-sasong-1-avsnitt-1-av-318',
|
||||||
|
'md5': 'c3101a17ce9634f4c1f9800f0746c187',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '1058509',
|
||||||
|
'ext': 'flv',
|
||||||
|
'title': 'Farlig kryssning',
|
||||||
|
'duration': 2566,
|
||||||
|
'thumbnail': 're:^https?://.*[\.-]jpg$',
|
||||||
|
'age_limit': 0,
|
||||||
|
},
|
||||||
|
'skip': 'Only works from Sweden',
|
||||||
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
video_id = self._match_id(url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
|
video_id = mobj.group('id')
|
||||||
|
host = mobj.group('host')
|
||||||
|
|
||||||
info = self._download_json(
|
info = self._download_json(
|
||||||
'http://www.svtplay.se/video/%s?output=json' % video_id, video_id)
|
'http://www.%s.se/video/%s?output=json' % (host, video_id), video_id)
|
||||||
|
|
||||||
title = info['context']['title']
|
title = info['context']['title']
|
||||||
thumbnail = info['context'].get('thumbnailImage')
|
thumbnail = info['context'].get('thumbnailImage')
|
||||||
@ -33,11 +52,16 @@ def _real_extract(self, url):
|
|||||||
formats = []
|
formats = []
|
||||||
for vr in video_info['videoReferences']:
|
for vr in video_info['videoReferences']:
|
||||||
vurl = vr['url']
|
vurl = vr['url']
|
||||||
if determine_ext(vurl) == 'm3u8':
|
ext = determine_ext(vurl)
|
||||||
|
if ext == 'm3u8':
|
||||||
formats.extend(self._extract_m3u8_formats(
|
formats.extend(self._extract_m3u8_formats(
|
||||||
vurl, video_id,
|
vurl, video_id,
|
||||||
ext='mp4', entry_protocol='m3u8_native',
|
ext='mp4', entry_protocol='m3u8_native',
|
||||||
m3u8_id=vr.get('playerType')))
|
m3u8_id=vr.get('playerType')))
|
||||||
|
elif ext == 'f4m':
|
||||||
|
formats.extend(self._extract_f4m_formats(
|
||||||
|
vurl + '?hdcore=3.3.0', video_id,
|
||||||
|
f4m_id=vr.get('playerType')))
|
||||||
else:
|
else:
|
||||||
formats.append({
|
formats.append({
|
||||||
'format_id': vr.get('playerType'),
|
'format_id': vr.get('playerType'),
|
||||||
@ -46,6 +70,7 @@ def _real_extract(self, url):
|
|||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
duration = video_info.get('materialLength')
|
duration = video_info.get('materialLength')
|
||||||
|
age_limit = 18 if video_info.get('inappropriateForChildren') else 0
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
@ -53,4 +78,5 @@ def _real_extract(self, url):
|
|||||||
'formats': formats,
|
'formats': formats,
|
||||||
'thumbnail': thumbnail,
|
'thumbnail': thumbnail,
|
||||||
'duration': duration,
|
'duration': duration,
|
||||||
|
'age_limit': age_limit,
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user