Merge tag 'upstream/2014.07.11'

[youtubedl] / youtube_dl / extractor / auengine.py

diff --git a/youtube_dl/extractor/auengine.py b/youtube_dl/extractor/auengine.py
index c6f30e62616c09f50f8826d4d30cc6069cf3367f..20bf12550d4b4493982ca3ea6f31578368e31aba 100644 (file)
--- a/youtube_dl/extractor/auengine.py
+++ b/youtube_dl/extractor/auengine.py
@@ -11,22 +11,24 @@ from ..utils import (
 
 
 class AUEngineIE(InfoExtractor):
 
 
 class AUEngineIE(InfoExtractor):

+    _VALID_URL = r'http://(?:www\.)?auengine\.com/embed\.php\?.*?file=(?P<id>[^&]+).*?'
+

     _TEST = {
         'url': 'http://auengine.com/embed.php?file=lfvlytY6&w=650&h=370',
     _TEST = {
         'url': 'http://auengine.com/embed.php?file=lfvlytY6&w=650&h=370',

-        'file': 'lfvlytY6.mp4',

         'md5': '48972bdbcf1a3a2f5533e62425b41d4f',
         'info_dict': {
         'md5': '48972bdbcf1a3a2f5533e62425b41d4f',
         'info_dict': {

+            'id': 'lfvlytY6',
+            'ext': 'mp4',

             'title': '[Commie]The Legend of the Legendary Heroes - 03 - Replication Eye (Alpha Stigma)[F9410F5A]'
         }
     }
             'title': '[Commie]The Legend of the Legendary Heroes - 03 - Replication Eye (Alpha Stigma)[F9410F5A]'
         }
     }

-    _VALID_URL = r'(?:http://)?(?:www\.)?auengine\.com/embed\.php\?.*?file=([^&]+).*?'

 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)

-        video_id = mobj.group(1)
+        video_id = mobj.group('id')
+

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

-        title = self._html_search_regex(r'<title>(?P<title>.+?)</title>',
-                webpage, 'title')
+        title = self._html_search_regex(r'<title>(?P<title>.+?)</title>', webpage, 'title')

         title = title.strip()
         links = re.findall(r'\s(?:file|url):\s*["\']([^\'"]+)["\']', webpage)
         links = map(compat_urllib_parse.unquote, links)
         title = title.strip()
         links = re.findall(r'\s(?:file|url):\s*["\']([^\'"]+)["\']', webpage)
         links = map(compat_urllib_parse.unquote, links)


@@ -39,14 +41,15 @@ class AUEngineIE(InfoExtractor):
             elif '/videos/' in link:
                 video_url = link
         if not video_url:
             elif '/videos/' in link:
                 video_url = link
         if not video_url:

-            raise ExtractorError(u'Could not find video URL')
+            raise ExtractorError('Could not find video URL')

         ext = '.' + determine_ext(video_url)
         if ext == title[-len(ext):]:
             title = title[:-len(ext)]
 
         return {
         ext = '.' + determine_ext(video_url)
         if ext == title[-len(ext):]:
             title = title[:-len(ext)]
 
         return {

-            'id':        video_id,
-            'url':       video_url,
-            'title':     title,
+            'id': video_id,
+            'url': video_url,
+            'title': title,

             'thumbnail': thumbnail,
             'thumbnail': thumbnail,

+            'http_referer': 'http://www.auengine.com/flowplayer/flowplayer.commercial-3.2.14.swf',

         }
         }