debian/control: Update list of extractors.

[youtubedl] / youtube_dl / extractor / auengine.py

diff --git a/youtube_dl/extractor/auengine.py b/youtube_dl/extractor/auengine.py
index 0febbff4f6c42afd10f8dbc13ea9df883edae4c6..95c038003b431dc48ac3bb89dcc03f8aa39ea07f 100644 (file)
--- a/youtube_dl/extractor/auengine.py
+++ b/youtube_dl/extractor/auengine.py
@@ -1,10 +1,10 @@
-import os.path

 import re
 
 from .common import InfoExtractor
 from ..utils import (
     compat_urllib_parse,
 import re
 
 from .common import InfoExtractor
 from ..utils import (
     compat_urllib_parse,

-    compat_urllib_parse_urlparse,
+    determine_ext,
+    ExtractorError,

 )
 
 class AUEngineIE(InfoExtractor):
 )
 
 class AUEngineIE(InfoExtractor):


@@ -25,22 +25,25 @@ class AUEngineIE(InfoExtractor):
         title = self._html_search_regex(r'<title>(?P<title>.+?)</title>',
                 webpage, u'title')
         title = title.strip()
         title = self._html_search_regex(r'<title>(?P<title>.+?)</title>',
                 webpage, u'title')
         title = title.strip()

-        links = re.findall(r'[^A-Za-z0-9]?(?:file|url):\s*["\'](http[^\'"&]*)', webpage)
-        links = [compat_urllib_parse.unquote(l) for l in links]
+        links = re.findall(r'\s(?:file|url):\s*["\']([^\'"]+)["\']', webpage)
+        links = map(compat_urllib_parse.unquote, links)
+
+        thumbnail = None
+        video_url = None

         for link in links:
         for link in links:

-            root, pathext = os.path.splitext(compat_urllib_parse_urlparse(link).path)
-            if pathext == '.png':
+            if link.endswith('.png'):

                 thumbnail = link
                 thumbnail = link

-            elif pathext == '.mp4':
-                url = link
-                ext = pathext
+            elif '/videos/' in link:
+                video_url = link
+        if not video_url:
+            raise ExtractorError(u'Could not find video URL')
+        ext = u'.' + determine_ext(video_url)

         if ext == title[-len(ext):]:
             title = title[:-len(ext)]
         if ext == title[-len(ext):]:
             title = title[:-len(ext)]

-        ext = ext[1:]
-        return [{
+
+        return {

             'id':        video_id,
             'id':        video_id,

-            'url':       url,
-            'ext':       ext,
+            'url':       video_url,

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

-        }]
+        }