MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-12-25 06:25:51 +01:00
Code Issues Releases Wiki Activity

[svtplay:series] Add support for season URLs

Browse Source
This commit is contained in:
Sergey M․ 2018-04-05 00:05:09 +07:00
parent b71bb3ba8b
commit df146eb282
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
youtube_dl/extractor/svt.py
View File

@ -4,6 +4,10 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import (
compat_parse_qs,
compat_urllib_parse_urlparse,
)
from ..utils import ( from ..utils import (
determine_ext, determine_ext,
dict_get, dict_get,
@ -203,6 +207,14 @@ class SVTSeriesIE(InfoExtractor):
'description': 'md5:505d491a58f4fcf6eb418ecab947e69e', 'description': 'md5:505d491a58f4fcf6eb418ecab947e69e',
}, },
'playlist_mincount': 318, 'playlist_mincount': 318,
}, {
'url': 'https://www.svtplay.se/rederiet?tab=sasong2',
'info_dict': {
'id': 'rederiet-sasong2',
'title': 'Rederiet - Säsong 2',
'description': 'md5:505d491a58f4fcf6eb418ecab947e69e',
},
'playlist_count': 12,
}] }]
@classmethod @classmethod
@ -210,19 +222,33 @@ class SVTSeriesIE(InfoExtractor):
return False if SVTIE.suitable(url) or SVTPlayIE.suitable(url) else super(SVTSeriesIE, cls).suitable(url) return False if SVTIE.suitable(url) or SVTPlayIE.suitable(url) else super(SVTSeriesIE, cls).suitable(url)
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) series_id = self._match_id(url)
qs = compat_parse_qs(compat_urllib_parse_urlparse(url).query)
season_slug = qs.get('tab', [None])[0]
if season_slug:
series_id += '-%s' % season_slug
webpage = self._download_webpage( webpage = self._download_webpage(
url, video_id, 'Downloading serie page') url, series_id, 'Downloading series page')
root = self._parse_json( root = self._parse_json(
self._search_regex( self._search_regex(
r'root\[\s*(["\'])_*svtplay\1\s*\]\s*=\s*(?P<json>{.+?})\s*;\s*\n', r'root\[\s*(["\'])_*svtplay\1\s*\]\s*=\s*(?P<json>{.+?})\s*;\s*\n',
webpage, 'content', group='json'), webpage, 'content', group='json'),
video_id) series_id)
season_name = None
entries = [] entries = []
for season in root['relatedVideoContent']['relatedVideosAccordion']: for season in root['relatedVideoContent']['relatedVideosAccordion']:
if not isinstance(season, dict):
continue
if season_slug:
if season.get('slug') != season_slug:
continue
season_name = season.get('name')
videos = season.get('videos') videos = season.get('videos')
if not isinstance(videos, list): if not isinstance(videos, list):
continue continue
@ -241,6 +267,13 @@ class SVTSeriesIE(InfoExtractor):
if not isinstance(metadata, dict): if not isinstance(metadata, dict):
metadata = {} metadata = {}
title = metadata.get('title')
season_name = season_name or season_slug
if title and season_name:
title = '%s - %s' % (title, season_name)
elif season_slug:
title = season_slug
return self.playlist_result( return self.playlist_result(
entries, video_id, metadata.get('title'), entries, series_id, title, metadata.get('description'))
metadata.get('description'))