Initiate new release.

[youtubedl] / youtube_dl / extractor / spankwire.py

diff --git a/youtube_dl/extractor/spankwire.py b/youtube_dl/extractor/spankwire.py
index 97f9c268a4531114912f9209c8a959d567add062..5fa6faf18b738aa32e384972bf65ad56188ad9b4 100644 (file)
--- a/youtube_dl/extractor/spankwire.py
+++ b/youtube_dl/extractor/spankwire.py
@@ -1,28 +1,34 @@
-import os
+from __future__ import unicode_literals
+

 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

-from ..utils import (
+from ..compat import (
+    compat_urllib_parse_unquote,

     compat_urllib_parse_urlparse,
     compat_urllib_request,
     compat_urllib_parse_urlparse,
     compat_urllib_request,

-    compat_urllib_parse,
-    unescapeHTML,

 )
 )

-from ..aes import (
-    aes_decrypt_text
+from ..utils import (
+    str_to_int,
+    unified_strdate,

 )
 )

+from ..aes import aes_decrypt_text
+

 
 class SpankwireIE(InfoExtractor):
 
 class SpankwireIE(InfoExtractor):

-    _VALID_URL = r'^(?:https?://)?(?:www\.)?(?P<url>spankwire\.com/[^/]*/video(?P<videoid>[0-9]+)/?)'
+    _VALID_URL = r'https?://(?:www\.)?(?P<url>spankwire\.com/[^/]*/video(?P<videoid>[0-9]+)/?)'

     _TEST = {
     _TEST = {

-        u'url': u'http://www.spankwire.com/Buckcherry-s-X-Rated-Music-Video-Crazy-Bitch/video103545/',
-        u'file': u'103545.mp4',
-        u'md5': u'1b3f55e345500552dbc252a3e9c1af43',
-        u'info_dict': {
-            u"uploader": u"oreusz", 
-            u"title": u"Buckcherry`s X Rated Music Video Crazy Bitch",
-            u"description": u"Crazy Bitch X rated music video.",
-            u"age_limit": 18,
+        'url': 'http://www.spankwire.com/Buckcherry-s-X-Rated-Music-Video-Crazy-Bitch/video103545/',
+        'md5': '8bbfde12b101204b39e4b9fe7eb67095',
+        'info_dict': {
+            'id': '103545',
+            'ext': 'mp4',
+            'title': 'Buckcherry`s X Rated Music Video Crazy Bitch',
+            'description': 'Crazy Bitch X rated music video.',
+            'uploader': 'oreusz',
+            'uploader_id': '124697',
+            'upload_date': '20070507',
+            'age_limit': 18,

         }
     }
 
         }
     }
 


@@ -35,40 +41,73 @@ class SpankwireIE(InfoExtractor):
         req.add_header('Cookie', 'age_verified=1')
         webpage = self._download_webpage(req, video_id)
 
         req.add_header('Cookie', 'age_verified=1')
         webpage = self._download_webpage(req, video_id)
 

-        video_title = self._html_search_regex(r'<h1>([^<]+)', webpage, u'title')
-        video_uploader = self._html_search_regex(r'by:\s*<a [^>]*>(.+?)</a>', webpage, u'uploader', fatal=False)
-        thumbnail = self._html_search_regex(r'flashvars\.image_url = "([^"]+)', webpage, u'thumbnail', fatal=False)
-        description = self._html_search_regex(r'>\s*Description:</div>\s*<[^>]*>([^<]+)', webpage, u'description', fatal=False)
-        if len(description) == 0:
-            description = None
+        title = self._html_search_regex(
+            r'<h1>([^<]+)', webpage, 'title')
+        description = self._html_search_regex(
+            r'(?s)<div\s+id="descriptionContent">(.+?)</div>',
+            webpage, 'description', fatal=False)
+        thumbnail = self._html_search_regex(
+            r'playerData\.screenShot\s*=\s*["\']([^"\']+)["\']',
+            webpage, 'thumbnail', fatal=False)

 
 

-        video_urls = list(map(compat_urllib_parse.unquote , re.findall(r'flashvars\.quality_[0-9]{3}p = "([^"]+)', webpage)))
+        uploader = self._html_search_regex(
+            r'by:\s*<a [^>]*>(.+?)</a>',
+            webpage, 'uploader', fatal=False)
+        uploader_id = self._html_search_regex(
+            r'by:\s*<a href="/Profile\.aspx\?.*?UserId=(\d+).*?"',
+            webpage, 'uploader id', fatal=False)
+        upload_date = unified_strdate(self._html_search_regex(
+            r'</a> on (.+?) at \d+:\d+',
+            webpage, 'upload date', fatal=False))
+
+        view_count = str_to_int(self._html_search_regex(
+            r'<div id="viewsCounter"><span>([\d,\.]+)</span> views</div>',
+            webpage, 'view count', fatal=False))
+        comment_count = str_to_int(self._html_search_regex(
+            r'<span\s+id="spCommentCount"[^>]*>([\d,\.]+)</span>',
+            webpage, 'comment count', fatal=False))
+
+        video_urls = list(map(
+            compat_urllib_parse_unquote,
+            re.findall(r'playerData\.cdnPath[0-9]{3,}\s*=\s*(?:encodeURIComponent\()?["\']([^"\']+)["\']', webpage)))

         if webpage.find('flashvars\.encrypted = "true"') != -1:
         if webpage.find('flashvars\.encrypted = "true"') != -1:

-            password = self._html_search_regex(r'flashvars\.video_title = "([^"]+)', webpage, u'password').replace('+', ' ')
-            video_urls = list(map(lambda s: aes_decrypt_text(s, password, 32).decode('utf-8'), video_urls))
+            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))

 
         formats = []
         for video_url in video_urls:
             path = compat_urllib_parse_urlparse(video_url).path
 
         formats = []
         for video_url in video_urls:
             path = compat_urllib_parse_urlparse(video_url).path

-            extension = os.path.splitext(path)[1][1:]

             format = path.split('/')[4].split('_')[:2]
             format = path.split('/')[4].split('_')[:2]

+            resolution, bitrate_str = format

             format = "-".join(format)
             format = "-".join(format)

+            height = int(resolution.rstrip('Pp'))
+            tbr = int(bitrate_str.rstrip('Kk'))

             formats.append({
                 'url': video_url,
             formats.append({
                 'url': video_url,

-                'ext': extension,
+                'resolution': resolution,

                 'format': format,
                 'format': format,

+                'tbr': tbr,
+                'height': height,

                 'format_id': format,
             })
                 'format_id': format,
             })

-        formats.sort(key=lambda format: list(map(lambda s: s.zfill(6), format['format'].split('-'))))
+        self._sort_formats(formats)

 
         age_limit = self._rta_search(webpage)
 
         return {
             'id': video_id,
 
         age_limit = self._rta_search(webpage)
 
         return {
             'id': video_id,

-            'uploader': video_uploader,
-            'title': video_title,
-            'thumbnail': thumbnail,
+            'title': title,

             'description': description,
             'description': description,

+            'thumbnail': thumbnail,
+            'uploader': uploader,
+            'uploader_id': uploader_id,
+            'upload_date': upload_date,
+            'view_count': view_count,
+            'comment_count': comment_count,

             'formats': formats,
             'age_limit': age_limit,
         }
             'formats': formats,
             'age_limit': age_limit,
         }