xZero707/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-26 21:47:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix code style; fix channel follower count; fix test

Browse Source
This commit is contained in:
Mozi 2024-11-22 17:11:55 +00:00
parent ad4b1615cc
commit d810fff277
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
yt_dlp/extractor/aparat.py
View File

@ -1,12 +1,5 @@
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import get_element_by_id, int_or_none, merge_dicts, mimetype2ext, str_or_none, url_or_none
get_element_by_id,
int_or_none,
merge_dicts,
mimetype2ext,
url_or_none,
urljoin,
)
from ..utils.traversal import traverse_obj from ..utils.traversal import traverse_obj
@ -26,6 +19,8 @@ class AparatIE(InfoExtractor):
'timestamp': 1387394859, 'timestamp': 1387394859,
'upload_date': '20131218', 'upload_date': '20131218',
'view_count': int, 'view_count': int,
'thumbnail': r're:https://static\.cdn\.asset\.aparat\.cloud/.+',
'like_count': int,
}, },
}, { }, {
# multiple formats # multiple formats
@ -133,24 +128,35 @@ class AparatPlaylistIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
playlist_id = self._match_id(url) playlist_id = self._match_id(url)
info = self._download_json( info = self._download_json(
f'https://www.aparat.com/api/fa/v1/video/playlist/one/playlist_id/{playlist_id}', playlist_id) f'https://www.aparat.com/api/fa/v1/video/playlist/one/playlist_id/{playlist_id}',
playlist_id, note='Getting playlist info', errnote='Failed to get playlist info')
info_dict = traverse_obj(info, ('data', 'attributes', { info_dict = {
'playlist_title': ('title'), **traverse_obj(info, ('data', 'attributes', {
'description': ('description'), 'title': 'title',
}), default={}) 'description': 'description',
info_dict.update(thumbnails=traverse_obj([ 'thumbnails': (('big_poster', 'small_poster'), all, ..., {url_or_none}, {lambda x: {'url': x}}),
traverse_obj(info, ('data', 'attributes', {'url': ('big_poster', {url_or_none})})), }), default={}),
traverse_obj(info, ('data', 'attributes', {'url': ('small_poster', {url_or_none})})), 'id': playlist_id,
], (...), default=[])) 'entries': traverse_obj(info, (
info_dict.update(**traverse_obj(info, ('included', lambda _, v: v['type'] == 'channel', 'attributes', { 'included', lambda _, v: v['type'] == 'Video', 'attributes', 'uid',
'channel': ('username'), {lambda x: self.url_result(f'https://www.aparat.com/v/{x}?playlist={playlist_id}')},
'channel_id': ('id'), ), default=[]),
'channel_url': ('link', filter, {urljoin(base=url)}), # starts with a slash }
'channel_follower_count': ('follower_cnt', {int_or_none}),
}), get_all=False))
return self.playlist_result(traverse_obj(info, ( if username := traverse_obj(
'included', lambda _, v: v['type'] == 'Video', 'attributes', 'uid', info, ('included', lambda _, v: v['type'] == 'channel', 'attributes', 'username'), get_all=False):
{lambda uid: self.url_result(f'https://www.aparat.com/v/{uid}?playlist={playlist_id}')}, user_info = self._download_json(
), default=[]), playlist_id, **info_dict) f'https://www.aparat.com/api/fa/v1/user/user/information/username/{username}', playlist_id,
fatal=False, note=f'Getting channel info ({username})', errnote=f'Failed to get channel info ({username})',
)
info_dict.update({
**traverse_obj(user_info, ('data', 'attributes', {
'channel_id': ('id', {str_or_none}),
'channel_follower_count': ('follower_cnt_num', {int_or_none}),
})),
'channel': username,
'channel_url': f'https://www.aparat.com/{username}',
})
return self.playlist_result(**info_dict)