[spankwire] Fixed extractor

Fixed spankwire and added duration, categories and tags

youtube_dl/extractor/spankwire.py

@@ -3,16 +3,11 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_urllib_parse_unquote,
-    compat_urllib_parse_urlparse,
-)
 from ..utils import (
+    int_or_none,
     sanitized_Request,
-    str_to_int,
     unified_strdate,
 )
-from ..aes import aes_decrypt_text
 
 
 class SpankwireIE(InfoExtractor):
@@ -54,61 +49,48 @@ class SpankwireIE(InfoExtractor):
         req = sanitized_Request('http://www.' + mobj.group('url'))
         req.add_header('Cookie', 'age_verified=1')
         webpage = self._download_webpage(req, video_id)
+        video_data = self._download_json(
+            sanitized_Request('https://www.spankwire.com/api/video/' + video_id + '.json'), video_id)
 
-        title = self._html_search_regex(
+        title = video_data.get('title') or self._html_search_regex(
             r'<h1>([^<]+)', webpage, 'title')
-        description = self._html_search_regex(
+        thumbnail = video_data.get('poster')
-            r'(?s)<div\s+id="descriptionContent">(.+?)</div>',
+        description = video_data.get('description')
-            webpage, 'description', fatal=False)
-        thumbnail = self._html_search_regex(
-            r'playerData\.screenShot\s*=\s*["\']([^"\']+)["\']',
-            webpage, 'thumbnail', fatal=False)
 
-        uploader = self._html_search_regex(
+        uploader = self._search_regex(
-            r'by:\s*<a [^>]*>(.+?)</a>',
+            r'<a[^>]+class="uploaded__by"[^>]*>(.+?)</a>',
-            webpage, 'uploader', fatal=False)
+            webpage, 'uploader', flags=re.DOTALL, fatal=False)
         uploader_id = self._html_search_regex(
-            r'by:\s*<a href="/(?:user/viewProfile|Profile\.aspx)\?.*?UserId=(\d+).*?"',
+            r'by\s*<a href="/(?:user/viewProfile|Profile\.aspx)\?.*?UserId=(\d+).*?"',
             webpage, 'uploader id', fatal=False)
         upload_date = unified_strdate(self._html_search_regex(
-            r'</a> on (.+?) at \d+:\d+',
+            r'</span>(.+?) at \d+:\d+ (?:AM|PM) by',
             webpage, 'upload date', fatal=False))
 
-        view_count = str_to_int(self._html_search_regex(
+        view_count = int_or_none(video_data.get('viewed'))
-            r'<div id="viewsCounter"><span>([\d,\.]+)</span> views</div>',
+        comment_count = int_or_none(video_data.get('comments'))
-            webpage, 'view count', fatal=False))
+        duration = int_or_none(video_data.get('duration'))
-        comment_count = str_to_int(self._html_search_regex(
-            r'<span\s+id="spCommentCount"[^>]*>([\d,\.]+)</span>',
-            webpage, 'comment count', fatal=False))
 
-        videos = re.findall(
+        def extract_list(arr):
-            r'playerData\.cdnPath([0-9]{3,})\s*=\s*(?:encodeURIComponent\()?["\']([^"\']+)["\']', webpage)
+            names = []
-        heights = [int(video[0]) for video in videos]
+            for i in arr:
-        video_urls = list(map(compat_urllib_parse_unquote, [video[1] for video in videos]))
+                names.append(i.get('name'))
-        if webpage.find(r'flashvars\.encrypted = "true"') != -1:
+            return names
-            password = self._search_regex(
-                r'flashvars\.video_title = "([^"]+)',
-                webpage, 'password').replace('+', ' ')
-            video_urls = list(map(
-                lambda s: aes_decrypt_text(s, password, 32).decode('utf-8'),
-                video_urls))
 
+        categories = extract_list(video_data.get('categories'))
+        tags = extract_list(video_data.get('tags'))
+
+        videos = video_data.get('videos').items()
+        videos.sort()
         formats = []
-        for height, video_url in zip(heights, video_urls):
+        for quality, video_url in videos:
-            path = compat_urllib_parse_urlparse(video_url).path
+            height = quality.replace('quality_', '').replace('p', '')
-            m = re.search(r'/(?P<height>\d+)[pP]_(?P<tbr>\d+)[kK]', path)
-            if m:
-                tbr = int(m.group('tbr'))
-                height = int(m.group('height'))
-            else:
-                tbr = None
             formats.append({
                 'url': video_url,
-                'format_id': '%dp' % height,
+                'format_id': quality,
-                'height': height,
+                'height': int_or_none(height),
-                'tbr': tbr,
+                'tbr': None
             })
-        self._sort_formats(formats)
 
         age_limit = self._rta_search(webpage)
 
@@ -124,4 +106,7 @@ class SpankwireIE(InfoExtractor):
             'comment_count': comment_count,
             'formats': formats,
             'age_limit': age_limit,
+            'duration': duration,
+            'categories': categories,
+            'tags': tags,
         }