[Auengine] corrected extractions logic

[youtube-dl] / youtube_dl / extractor / auengine.py

diff --git a/youtube_dl/extractor/auengine.py b/youtube_dl/extractor/auengine.py
index 40ea5ec95f89f8d20ac8eb0b81350a7c5c14440b..17c3ad2ef6d62119062a44f8c01c85cb08e33b28 100644 (file)
--- a/youtube_dl/extractor/auengine.py
+++ b/youtube_dl/extractor/auengine.py
@@ -1,36 +1,50 @@
-import os.path
+from __future__ import unicode_literals
+
 import re
-import urllib
-import urlparse
 
 from .common import InfoExtractor
+from ..compat import compat_urllib_parse
+from ..utils import (
+    determine_ext,
+    ExtractorError,
+)
+
 
-class AuengineIE(InfoExtractor):
-    _VALID_URL = r'(?:http://)?(?:www\.)?auengine\.com/embed.php\?.*?file=([^&]+).*?'
+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',
+        'md5': '48972bdbcf1a3a2f5533e62425b41d4f',
+        'info_dict': {
+            'id': 'lfvlytY6',
+            'ext': 'mp4',
+            'title': '[Commie]The Legend of the Legendary Heroes - 03 - Replication Eye (Alpha Stigma)[F9410F5A]'
+        }
+    }
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group(1)
+        video_id = self._match_id(url)
+
         webpage = self._download_webpage(url, video_id)
-        title = self._html_search_regex(r'<title>(?P<title>.+?)</title>',
-                webpage, u'title')
+        title = self._html_search_regex(r'<title>(?P<title>.+?)</title>', webpage, 'title')
         title = title.strip()
-        links = re.findall(r'[^A-Za-z0-9]?(?:file|url):\s*["\'](http[^\'"&]*)', webpage)
-        links = [urllib.unquote(l) for l in links]
-        for link in links:
-            root, pathext = os.path.splitext(urlparse.urlparse(link).path)
-            if pathext == '.png':
-                thumbnail = link
-            elif pathext == '.mp4':
-                url = link
-                ext = pathext
+        video_url = re.findall(r'http://\w+.auengine.com/vod/.*[^\W]', webpage)
+        video_url = map(compat_urllib_parse.unquote, video_url)[0]
+        thumbnail = re.findall(r'http://\w+.auengine.com/thumb/.*[^\W]', webpage)
+        thumbnail = map(compat_urllib_parse.unquote, thumbnail)[0]
+
+        if video_url == "" and thumbnail =="":
+            raise ExtractorError('Could not find video URL')
+        ext = '.' + determine_ext(video_url)
         if ext == title[-len(ext):]:
             title = title[:-len(ext)]
-        ext = ext[1:]
-        return [{
-            'id':        video_id,
-            'url':       url,
-            'ext':       ext,
-            'title':     title,
+
+        return {
+            'id': video_id,
+            'url': video_url,
+            'title': title,
             'thumbnail': thumbnail,
-        }]
+            'http_referer': 'http://www.auengine.com/flowplayer/flowplayer.commercial-3.2.14.swf',
+        }
+