mirrors
/
youtube-dl
0
0
Fork 0
Code Releases 1 Activity

[funk:channel] Improve byChannelAlias extraction (closes #17142)

main
Sergey M․ 2018-08-04 00:26:58 +07:00
parent cb1c3a3c07
commit af322eb830
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
youtube_dl/extractor/funk.py
View File

@ -1,6 +1,7 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
import itertools
import re import re
from .common import InfoExtractor from .common import InfoExtractor
@ -125,17 +126,31 @@ class FunkChannelIE(FunkBaseIE):
# Id-based channels are currently broken on their side: webplayer # Id-based channels are currently broken on their side: webplayer
# tries to process them via byChannelAlias endpoint and fails # tries to process them via byChannelAlias endpoint and fails
# predictably. # predictably.
by_channel_alias = self._download_json( for page_num in itertools.count():
'https://www.funk.net/api/v3.1/webapp/videos/byChannelAlias/%s' by_channel_alias = self._download_json(
% channel_id, 'https://www.funk.net/api/v3.1/webapp/videos/byChannelAlias/%s'
'Downloading byChannelAlias JSON', headers=headers, query={ % channel_id,
'size': 100, 'Downloading byChannelAlias JSON page %d' % (page_num + 1),
}, fatal=False) headers=headers, query={
if by_channel_alias: 'filterFsk': 'false',
'sort': 'creationDate,desc',
'size': 100,
'page': page_num,
}, fatal=False)
if not by_channel_alias:
break
video_list = try_get( video_list = try_get(
by_channel_alias, lambda x: x['_embedded']['videoList'], list) by_channel_alias, lambda x: x['_embedded']['videoList'], list)
if video_list: if not video_list:
break
try:
video = next(r for r in video_list if r.get('alias') == alias) video = next(r for r in video_list if r.get('alias') == alias)
break
except StopIteration:
pass
if not try_get(
by_channel_alias, lambda x: x['_links']['next']):
break
if not video: if not video:
by_id_list = self._download_json( by_id_list = self._download_json(