Merge tag 'upstream/2015.02.06'

[youtubedl] / youtube_dl / extractor / malemotion.py

diff --git a/youtube_dl/extractor/malemotion.py b/youtube_dl/extractor/malemotion.py
index 8c1966ab25e5215ab96286822d50507aa25ea58d..0b85a59d1c644d7d04e573aae0bdd03ebd4f6c80 100644 (file)
--- a/youtube_dl/extractor/malemotion.py
+++ b/youtube_dl/extractor/malemotion.py
@@ -1,42 +1,33 @@
+# coding: utf-8

 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

-import re
-

 from .common import InfoExtractor
 from .common import InfoExtractor

-from ..utils import (
+from ..compat import (

     compat_urllib_parse,
 )
 
     compat_urllib_parse,
 )
 

+

 class MalemotionIE(InfoExtractor):
 class MalemotionIE(InfoExtractor):

-    _VALID_URL = r'^(?:https?://)?malemotion\.com/video/(.+?)\.(?P<id>.+?)(#|$)'
+    _VALID_URL = r'https?://malemotion\.com/video/(.+?)\.(?P<id>.+?)(#|$)'

     _TEST = {
     _TEST = {

-        'url': 'http://malemotion.com/video/bien-dur.10ew',
-        'file': '10ew.mp4',
-        'md5': 'b3cc49f953b107e4a363cdff07d100ce',
+        'url': 'http://malemotion.com/video/bete-de-concours.ltc',
+        'md5': '3013e53a0afbde2878bc39998c33e8a5',

         'info_dict': {
         'info_dict': {

-            "title": "Bien dur",
-            "age_limit": 18,
+            'id': 'ltc',
+            'ext': 'mp4',
+            'title': 'Bête de Concours',
+            'age_limit': 18,

         },
         },

-        'skip': 'This video has been deleted.'

     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group("id")
-
+        video_id = self._match_id(url)

         webpage = self._download_webpage(url, video_id)
 
         webpage = self._download_webpage(url, video_id)
 

-        self.report_extraction(video_id)
-
-        # Extract video URL
-        video_url = compat_urllib_parse.unquote(
-            self._search_regex(r'<source type="video/mp4" src="(.+?)"', webpage, 'video URL'))
-
-        # Extract title
+        video_url = compat_urllib_parse.unquote(self._search_regex(
+            r'<source type="video/mp4" src="(.+?)"', webpage, 'video URL'))

         video_title = self._html_search_regex(
             r'<title>(.*?)</title', webpage, 'title')
         video_title = self._html_search_regex(
             r'<title>(.*?)</title', webpage, 'title')

-
-        # Extract video thumbnail

         video_thumbnail = self._search_regex(
             r'<video .+?poster="(.+?)"', webpage, 'thumbnail', fatal=False)
 
         video_thumbnail = self._search_regex(
             r'<video .+?poster="(.+?)"', webpage, 'thumbnail', fatal=False)
 


@@ -46,14 +37,12 @@ class MalemotionIE(InfoExtractor):
             'format_id': 'mp4',
             'preference': 1,
         }]
             'format_id': 'mp4',
             'preference': 1,
         }]

+        self._sort_formats(formats)

 
         return {
             'id': video_id,
             'formats': formats,
 
         return {
             'id': video_id,
             'formats': formats,

-            'uploader': None,
-            'upload_date': None,

             'title': video_title,
             'thumbnail': video_thumbnail,
             'title': video_title,
             'thumbnail': video_thumbnail,

-            'description': None,

             'age_limit': 18,
         }
             'age_limit': 18,
         }