MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-23 11:36:56 +01:00
Code Issues Releases Wiki Activity

[tvp:website] Improve support

Browse Source
This commit is contained in:
Sergey M․ 2019-02-17 14:27:00 +07:00
parent d93083789b
commit 388cfbd3d8
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/extractor/extractors.py
View File

@ -1218,7 +1218,7 @@ from .tvnow import (
from .tvp import ( from .tvp import (
TVPEmbedIE, TVPEmbedIE,
TVPIE, TVPIE,
TVPSeriesIE, TVPWebsiteIE,
) )
from .tvplay import ( from .tvplay import (
TVPlayIE, TVPlayIE,

26
youtube_dl/extractor/tvp.py
View File

@ -198,19 +198,36 @@ class TVPEmbedIE(InfoExtractor):
} }
class TVPSeriesIE(InfoExtractor): class TVPWebsiteIE(InfoExtractor):
IE_NAME = 'tvp:series' IE_NAME = 'tvp:series'
_VALID_URL = r'https?://vod\.tvp\.pl/website/(?P<display_id>[^,]+),(?P<id>\d+)/video' _VALID_URL = r'https?://vod\.tvp\.pl/website/(?P<display_id>[^,]+),(?P<id>\d+)'
_TESTS = [{ _TESTS = [{
# series
'url': 'https://vod.tvp.pl/website/lzy-cennet,38678312/video', 'url': 'https://vod.tvp.pl/website/lzy-cennet,38678312/video',
'info_dict': { 'info_dict': {
'id': '38678312', 'id': '38678312',
}, },
'playlist_count': 115, 'playlist_count': 115,
}, {
# film
'url': 'https://vod.tvp.pl/website/gloria,35139666',
'info_dict': {
'id': '36637049',
'ext': 'mp4',
'title': 'Gloria, Gloria',
},
'params': {
'skip_download': True,
},
'add_ie': ['TVPEmbed'],
}, {
'url': 'https://vod.tvp.pl/website/lzy-cennet,38678312',
'only_matching': True,
}] }]
def _entries(self, url, display_id): def _entries(self, display_id, playlist_id):
url = 'https://vod.tvp.pl/website/%s,%s/video' % (display_id, playlist_id)
for page_num in itertools.count(1): for page_num in itertools.count(1):
page = self._download_webpage( page = self._download_webpage(
url, display_id, 'Downloading page %d' % page_num, url, display_id, 'Downloading page %d' % page_num,
@ -231,4 +248,5 @@ class TVPSeriesIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
display_id, playlist_id = mobj.group('display_id', 'id') display_id, playlist_id = mobj.group('display_id', 'id')
return self.playlist_result(self._entries(url, display_id), playlist_id) return self.playlist_result(
self._entries(display_id, playlist_id), playlist_id)