about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2017-02-11 01:04:09 +0700
committerSergey M․ <dstftw@gmail.com>2017-02-11 01:05:22 +0700
commit71cdd75628f851975eef551a96b1a24f94066d74 (patch)
tree237d307cf5eb7ea562d8fec6f2f501cfbd69fba2
parentc7d6f614f35c81cf64941affdf683a478078274b (diff)
downloadyoutube-dl-71cdd75628f851975eef551a96b1a24f94066d74.tar.gz
youtube-dl-71cdd75628f851975eef551a96b1a24f94066d74.tar.xz
youtube-dl-71cdd75628f851975eef551a96b1a24f94066d74.zip
[facebook] Relax video id matching (closes #11017, closes #12055, closes #12056)
-rw-r--r--youtube_dl/extractor/facebook.py28
1 files changed, 27 insertions, 1 deletions
diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py
index 4a3c839f4..78a4ad666 100644
--- a/youtube_dl/extractor/facebook.py
+++ b/youtube_dl/extractor/facebook.py
@@ -149,6 +149,32 @@ class FacebookIE(InfoExtractor):
             'skip_download': True,
         },
     }, {
+        'url': 'https://www.facebook.com/LaGuiaDelVaron/posts/1072691702860471',
+        'info_dict': {
+            'id': '1072691702860471',
+            'ext': 'mp4',
+            'title': 'md5:ae2d22a93fbb12dad20dc393a869739d',
+            'timestamp': 1477305000,
+            'upload_date': '20161024',
+            'uploader': 'La Guía Del Varón',
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        'url': 'https://www.facebook.com/groups/1024490957622648/permalink/1396382447100162/',
+        'info_dict': {
+            'id': '1396382447100162',
+            'ext': 'mp4',
+            'title': 'md5:e2d2700afdf84e121f5d0f999bad13a3',
+            'timestamp': 1486035494,
+            'upload_date': '20170202',
+            'uploader': 'Elisabeth Ahtn',
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {
         'url': 'https://www.facebook.com/video.php?v=10204634152394104',
         'only_matching': True,
     }, {
@@ -263,7 +289,7 @@ class FacebookIE(InfoExtractor):
             for item in instances:
                 if item[1][0] == 'VideoConfig':
                     video_item = item[2][0]
-                    if video_item.get('video_id') == video_id:
+                    if video_item.get('video_id'):
                         return video_item['videoData']
 
         server_js_data = self._parse_json(self._search_regex(