Merge 9c8236e0c4b72c260e947040550fbdc19dd0f8db into 3eb8d22ddb8982ca4fb56bb7a8d6517538bf14c6

youtube_dl/extractor/extractors.py

@@ -1477,6 +1477,7 @@ from .videomore import (
 from .videopress import VideoPressIE
 from .vidio import VidioIE
 from .vidlii import VidLiiIE
+from .vidlox import VIDLOXIE
 from .vidme import (
     VidmeIE,
     VidmeUserIE,

youtube_dl/extractor/vidlox.py

@@ -0,0 +1,46 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+from .common import InfoExtractor
+
+
+class VIDLOXIE(InfoExtractor):
+    IE_NAME = 'vidlox'
+    IE_DESC = 'vidlox'
+    _VALID_URL = r'https?://vidlox\.me/(embed-)?(?P<id>[a-z0-9]+).html'
+    _TEST = {
+        'url': 'https://vidlox.me/6wq8gciafziz.html',
+        'info_dict': {
+            'id': '6wq8gciafziz',
+            'title': 'md5:74c82229b059846a82628e60dcc661b5',
+            'ext': 'm3u8',
+        },
+    }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        webpage = self._download_webpage(
+            'https://vidlox.me/%s.html' % video_id, video_id)
+
+        m3u8 = self._search_regex(
+            r'(https.+m3u8)',
+            webpage, 'm3u8')
+
+        title = self._search_regex(
+            r'<title>Watch (?P<title>.+)<\/title>',
+            webpage, 'title', group='title')
+
+        thumbnail = self._search_regex(
+            r'spriteSheetUrl = "(?P<thumbnail>https.+)"',
+            webpage, 'thumbnail', group='thumbnail')
+
+        formats = self._extract_m3u8_formats(m3u8, video_id)
+        self._sort_formats(formats)
+
+        return {
+            'id': video_id,
+            'title': title,
+            'formats': formats,
+            'thumbnail': thumbnail,
+        }

youtube_dl/jsinterp.py

@@ -686,6 +686,8 @@ class JSInterpreter(object):
             raise self.Exception('Cannot get index {idx!r:.100}'.format(**locals()), expr=repr(obj), cause=e)
 
     def _dump(self, obj, namespace):
+        if obj is JS_Undefined:
+            return 'undefined'
         try:
             return json.dumps(obj)
         except TypeError: