[facebook] Extend _VALID_URL
authorYen Chi Hsuan <yan12125@gmail.com>
Thu, 16 Apr 2015 16:08:52 +0000 (00:08 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 18 Apr 2015 08:00:33 +0000 (16:00 +0800)
youtube_dl/extractor/facebook.py

index f0e575320015d435889b1bd610b4871dbd84ae21..f3a68b21d839b249112611eb62ad91f92dbd9e8f 100644 (file)
@@ -24,8 +24,12 @@ class FacebookIE(InfoExtractor):
     _VALID_URL = r'''(?x)
         https?://(?:\w+\.)?facebook\.com/
         (?:[^#]*?\#!/)?
-        (?:video/video\.php|photo\.php|video\.php|video/embed)\?(?:.*?)
-        (?:v|video_id)=(?P<id>[0-9]+)
+        (?:
+            (?:video/video\.php|photo\.php|video\.php|video/embed)\?(?:.*?)
+            (?:v|video_id)=|
+            [^/]+/videos/
+        )
+        (?P<id>[0-9]+)
         (?:.*)'''
     _LOGIN_URL = 'https://www.facebook.com/login.php?next=http%3A%2F%2Ffacebook.com%2Fhome.php&login_attempt=1'
     _CHECKPOINT_URL = 'https://www.facebook.com/checkpoint/?next=http%3A%2F%2Ffacebook.com%2Fhome.php&_fb_noscript=1'
@@ -50,6 +54,9 @@ class FacebookIE(InfoExtractor):
     }, {
         'url': 'https://www.facebook.com/video.php?v=10204634152394104',
         'only_matching': True,
+    }, {
+        'url': 'https://www.facebook.com/amogood/videos/1618742068337349/?fref=nf',
+        'only_matching': True,
     }]
 
     def _login(self):