gitlab-com-dstftw/youtube-dl
1
0
Fork 0
mirror of https://gitlab.com/dstftw/youtube-dl.git synced 2020-11-16 09:42:26 +00:00
Code Issues Releases Wiki Activity

[NRKTV] Added NRKTVSeriesIE

Browse source 
[NRKTV] Added season and episode number to metadata.

[NRKTV] Added category to metadata.

[NRKTV] Added tests to NRKTVSeries.

[NRKTV] Fixed whitespace issues (flake8).
This commit is contained in:
Odd Stråbø 2017-01-14 02:36:04 +01:00 committed by Sergey M․
parent d7e215b42d
commit 8fd65faece
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
2 changed files with 50 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
youtube_dl/extractor/extractors.py
View file

@ -668,6 +668,7 @@ from .nrk import (
NRKTVIE, NRKTVIE,
NRKTVDirekteIE, NRKTVDirekteIE,
NRKTVEpisodesIE, NRKTVEpisodesIE,
NRKTVSeriesIE,
) )
from .ntvde import NTVDeIE from .ntvde import NTVDeIE
from .ntvru import NTVRuIE from .ntvru import NTVRuIE

49
youtube_dl/extractor/nrk.py
View file

@ -128,6 +128,18 @@ class NRKBaseIE(InfoExtractor):
series = conviva.get('seriesName') or data.get('seriesTitle') series = conviva.get('seriesName') or data.get('seriesTitle')
episode = conviva.get('episodeName') or data.get('episodeNumberOrDate') episode = conviva.get('episodeName') or data.get('episodeNumberOrDate')
season_number = None
episode_number = None
if data.get('mediaElementType') == 'Episode':
_season_episode = data.get('scoresStatistics', {}).get('springStreamStream') or \
data.get('relativeOriginUrl', '')
EPISODENUM_RE = [
r'/s(?P<season>\d+)e(?P<episode>\d+)\.',
r'/sesong-(?P<season>\d+)/episode-(?P<episode>\d+)',
]
season_number = int_or_none(self._search_regex(EPISODENUM_RE, _season_episode, "S##E##", fatal=False, group='season'))
episode_number = int_or_none(self._search_regex(EPISODENUM_RE, _season_episode, "S##E##", fatal=False, group='episode'))
thumbnails = None thumbnails = None
images = data.get('images') images = data.get('images')
if images and isinstance(images, dict): if images and isinstance(images, dict):
@ -140,11 +152,15 @@ class NRKBaseIE(InfoExtractor):
} for image in web_images if image.get('imageUrl')] } for image in web_images if image.get('imageUrl')]
description = data.get('description') description = data.get('description')
category = data.get('mediaAnalytics', {}).get('category')
common_info = { common_info = {
'description': description, 'description': description,
'series': series, 'series': series,
'episode': episode, 'episode': episode,
'season_number': season_number,
'episode_number': episode_number,
'categories': [category] if category else None,
'age_limit': parse_age_limit(data.get('legalAge')), 'age_limit': parse_age_limit(data.get('legalAge')),
'thumbnails': thumbnails, 'thumbnails': thumbnails,
} }
@ -360,6 +376,39 @@ class NRKTVEpisodesIE(NRKPlaylistBaseIE):
r'<h1>([^<]+)</h1>', webpage, 'title', fatal=False) r'<h1>([^<]+)</h1>', webpage, 'title', fatal=False)
class NRKTVSeriesIE(InfoExtractor):
_VALID_URL = r'https?://tv\.nrk\.no/serie/(?P<id>[^/]+)/?'
_ITEM_RE = r'data-season=["\'](?P<id>\d+)["\']'
_TESTS = [{
'url': 'https://tv.nrk.no/serie/broedrene-dal-og-spektralsteinene',
'playlist_count': 1,
}, {
'url': 'https://tv.nrk.no/serie/saving-the-human-race',
'playlist_count': 1,
}, {
'url': 'https://tv.nrk.no/serie/postmann-pat',
'playlist_count': 3,
}, {
'url': 'https://tv.nrk.no/serie/groenn-glede',
'playlist_count': 9,
}]
def _real_extract(self, url):
series_id = self._match_id(url)
webpage = self._download_webpage(url, series_id)
entries = [
self.url_result('https://tv.nrk.no/program/Episodes/{series}/{season}'.format(
series=series_id,
season=season_id
))
for season_id in re.findall(self._ITEM_RE, webpage)
]
return self.playlist_result(entries)
class NRKSkoleIE(InfoExtractor): class NRKSkoleIE(InfoExtractor):
IE_DESC = 'NRK Skole' IE_DESC = 'NRK Skole'
_VALID_URL = r'https?://(?:www\.)?nrk\.no/skole/?\?.*\bmediaId=(?P<id>\d+)' _VALID_URL = r'https?://(?:www\.)?nrk\.no/skole/?\?.*\bmediaId=(?P<id>\d+)'