1
0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-05-06 05:37:32 +00:00

Merge 053419cd245e4af1330bf970a0b919c71cdb3a94 into 45aa690868eb8bd6ddc48a948b65e9317b0bdbed

This commit is contained in:
GitHub Merge Button 2011-10-20 15:32:36 -07:00
commit fc8d2a3e81

View File

@ -2712,8 +2712,9 @@ class FacebookIE(InfoExtractor):
_VALID_URL = r'^(?:https?://)?(?:\w+\.)?facebook\.com/video/video\.php\?(?:.*?)v=(?P<ID>\d+)(?:.*)' _VALID_URL = r'^(?:https?://)?(?:\w+\.)?facebook\.com/video/video\.php\?(?:.*?)v=(?P<ID>\d+)(?:.*)'
_LOGIN_URL = 'https://login.facebook.com/login.php?m&next=http%3A%2F%2Fm.facebook.com%2Fhome.php&' _LOGIN_URL = 'https://login.facebook.com/login.php?m&next=http%3A%2F%2Fm.facebook.com%2Fhome.php&'
_NETRC_MACHINE = 'facebook' _NETRC_MACHINE = 'facebook'
_available_formats = ['highqual', 'lowqual'] _available_formats = ['video', 'highqual', 'lowqual']
_video_extensions = { _video_extensions = {
'video': 'mp4',
'highqual': 'mp4', 'highqual': 'mp4',
'lowqual': 'mp4', 'lowqual': 'mp4',
} }
@ -2741,10 +2742,9 @@ class FacebookIE(InfoExtractor):
def _parse_page(self, video_webpage): def _parse_page(self, video_webpage):
"""Extract video information from page""" """Extract video information from page"""
# General data # General data
data = {'title': r'class="video_title datawrap">(.*?)</', data = {'title': r'\("video_title", "(.*?)"\)',
'description': r'<div class="datawrap">(.*?)</div>', 'description': r'<div class="datawrap">(.*?)</div>',
'owner': r'\("video_owner_name", "(.*?)"\)', 'owner': r'\("video_owner_name", "(.*?)"\)',
'upload_date': r'data-date="(.*?)"',
'thumbnail': r'\("thumb_url", "(?P<THUMB>.*?)"\)', 'thumbnail': r'\("thumb_url", "(?P<THUMB>.*?)"\)',
} }
video_info = {} video_info = {}