diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-02-09 23:42:40 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-02-09 23:42:40 +0700 |
| commit | 78ef214d2d8010f2fc7ab451c9b4ae137c2569dd (patch) | |
| tree | 152d4f0a69c5a06069e3fb664ab0e9bdc4279d49 | |
| parent | be670b8e8f9c32fe3d37666b28c4889d780d5964 (diff) | |
| download | youtube-dl-78ef214d2d8010f2fc7ab451c9b4ae137c2569dd.tar.gz youtube-dl-78ef214d2d8010f2fc7ab451c9b4ae137c2569dd.tar.xz youtube-dl-78ef214d2d8010f2fc7ab451c9b4ae137c2569dd.zip | |
[facebook] Improve JS data regex (closes #12042)
| -rw-r--r-- | youtube_dl/extractor/facebook.py | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py index b325c8200..4a3c839f4 100644 --- a/youtube_dl/extractor/facebook.py +++ b/youtube_dl/extractor/facebook.py @@ -135,6 +135,20 @@ class FacebookIE(InfoExtractor): 'uploader': 'CNN', }, }, { + # bigPipe.onPageletArrive ... onPageletArrive pagelet_group_mall + 'url': 'https://www.facebook.com/yaroslav.korpan/videos/1417995061575415/', + 'info_dict': { + 'id': '1417995061575415', + 'ext': 'mp4', + 'title': 'md5:a7b86ca673f51800cd54687b7f4012fe', + 'timestamp': 1486648217, + 'upload_date': '20170209', + 'uploader': 'Yaroslav Korpan', + }, + 'params': { + 'skip_download': True, + }, + }, { 'url': 'https://www.facebook.com/video.php?v=10204634152394104', 'only_matching': True, }, { @@ -262,7 +276,7 @@ class FacebookIE(InfoExtractor): if not video_data: server_js_data = self._parse_json( self._search_regex( - r'bigPipe\.onPageletArrive\(({.+?})\)\s*;\s*}\s*\)\s*,\s*["\']onPageletArrive\s+stream_pagelet', + r'bigPipe\.onPageletArrive\(({.+?})\)\s*;\s*}\s*\)\s*,\s*["\']onPageletArrive\s+(?:stream_pagelet|pagelet_group_mall)', webpage, 'js data', default='{}'), video_id, transform_source=js_to_json, fatal=False) if server_js_data: |