[xhamster] url regex fix for videos with empty title.

ytdl-org · May 24, 2016 · a4690b3 · a4690b3
1 parent 444417e
commit a4690b3
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py
@@ -12,7 +12,7 @@
 
 
 class XHamsterIE(InfoExtractor):
-    _VALID_URL = r'(?P<proto>https?)://(?:.+?\.)?xhamster\.com/movies/(?P<id>[0-9]+)/(?P<seo>.+?)\.html(?:\?.*)?'
+    _VALID_URL = r'(?P<proto>https?)://(?:.+?\.)?xhamster\.com/movies/(?P<id>[0-9]+)/(?P<seo>.*?)\.html(?:\?.*)?'
     _TESTS = [
         {
             'url': 'http://xhamster.com/movies/1509445/femaleagent_shy_beauty_takes_the_bait.html',
@@ -38,6 +38,18 @@ class XHamsterIE(InfoExtractor):
                 'age_limit': 18,
             }
         },
+        {
+            'url': 'http://xhamster.com/movies/5667973/.html',
+            'info_dict': {
+                'id': '5667973',
+                'ext': 'mp4',
+                'title': '....',
+                'upload_date': '20160208',
+                'uploader': 'parejafree',
+                'duration': 72.0,
+                'age_limit': 18,
+            }
+        },
         {
             'url': 'https://xhamster.com/movies/2272726/amber_slayed_by_the_knight.html',
             'only_matching': True,
@@ -170,7 +182,7 @@ def _real_extract(self, url):
         webpage = self._download_webpage(url, video_id)
 
         video_url = self._search_regex(
-            r'href="(https?://xhamster\.com/movies/%s/[^"]+\.html[^"]*)"' % video_id,
+            r'href="(https?://xhamster\.com/movies/%s/[^"]*\.html[^"]*)"' % video_id,
             webpage, 'xhamster url', default=None)
 
         if not video_url: