Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6439 from remitamine/facebook 

[facebook] extract uploader
pull/5581/merge
Sergey M. 2015-08-03 05:43:01 +06:00
parent 8de922724b 67b8a28a2f
commit 2a04d2c799
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
youtube_dl/extractor/facebook.py
View File

@ -17,6 +17,8 @@ from ..utils import (
int_or_none, int_or_none,
limit_length, limit_length,
urlencode_postdata, urlencode_postdata,
get_element_by_id,
clean_html,
) )
@ -42,6 +44,7 @@ class FacebookIE(InfoExtractor):
'id': '637842556329505', 'id': '637842556329505',
'ext': 'mp4', 'ext': 'mp4',
'title': 're:Did you know Kei Nishikori is the first Asian man to ever reach a Grand Slam', 'title': 're:Did you know Kei Nishikori is the first Asian man to ever reach a Grand Slam',
'uploader': 'Tennis on Facebook',
} }
}, { }, {
'note': 'Video without discernible title', 'note': 'Video without discernible title',
@ -50,6 +53,7 @@ class FacebookIE(InfoExtractor):
'id': '274175099429670', 'id': '274175099429670',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Facebook video #274175099429670', 'title': 'Facebook video #274175099429670',
'uploader': 'Asif Nawab Butt',
}, },
'expected_warnings': [ 'expected_warnings': [
'title' 'title'
@ -161,6 +165,7 @@ class FacebookIE(InfoExtractor):
video_title = limit_length(video_title, 80) video_title = limit_length(video_title, 80)
if not video_title: if not video_title:
video_title = 'Facebook video #%s' % video_id video_title = 'Facebook video #%s' % video_id
uploader = clean_html(get_element_by_id('fbPhotoPageAuthorName', webpage))
return { return {
'id': video_id, 'id': video_id,
@ -168,4 +173,5 @@ class FacebookIE(InfoExtractor):
'formats': formats, 'formats': formats,
'duration': int_or_none(video_data.get('video_duration')), 'duration': int_or_none(video_data.get('video_duration')),
'thumbnail': video_data.get('thumbnail_src'), 'thumbnail': video_data.get('thumbnail_src'),
'uploader': uploader,
} }