Merge tag 'upstream/2017.05.18.1'

[youtubedl] / youtube_dl / extractor / xminus.py

diff --git a/youtube_dl/extractor/xminus.py b/youtube_dl/extractor/xminus.py
index f7e2e8ac9594ef45a1d329c6359e447796b70f4b..36e5ead1e690db9bb0c1c1a64650a69c784bbe76 100644 (file)
--- a/youtube_dl/extractor/xminus.py
+++ b/youtube_dl/extractor/xminus.py
@@ -1,14 +1,16 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
 # coding: utf-8
 from __future__ import unicode_literals
 

+import re
+import time
+

 from .common import InfoExtractor
 from ..compat import (
 from .common import InfoExtractor
 from ..compat import (

-    compat_chr,

     compat_ord,
 )
 from ..utils import (
     int_or_none,
     compat_ord,
 )
 from ..utils import (
     int_or_none,

-    parse_filesize,
+    parse_duration,

 )
 
 
 )
 
 


@@ -20,11 +22,12 @@ class XMinusIE(InfoExtractor):
         'info_dict': {
             'id': '4542',
             'ext': 'mp3',
         'info_dict': {
             'id': '4542',
             'ext': 'mp3',

-            'title': 'Леонид Агутин-Песенка шофера',
+            'title': 'Леонид Агутин-Песенка шофёра',

             'duration': 156,
             'tbr': 320,
             'filesize_approx': 5900000,
             'view_count': int,
             'duration': 156,
             'tbr': 320,
             'filesize_approx': 5900000,
             'view_count': int,

+            'description': 'md5:03238c5b663810bc79cf42ef3c03e371',

         }
     }
 
         }
     }
 


@@ -33,35 +36,44 @@ class XMinusIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         artist = self._html_search_regex(
         webpage = self._download_webpage(url, video_id)
 
         artist = self._html_search_regex(

-            r'minus_track\.artist="(.+?)"', webpage, 'artist')
+            r'<a[^>]+href="/artist/\d+">([^<]+)</a>', webpage, 'artist')

         title = artist + '-' + self._html_search_regex(
         title = artist + '-' + self._html_search_regex(

-            r'minus_track\.title="(.+?)"', webpage, 'title')
-        duration = int_or_none(self._html_search_regex(
-            r'minus_track\.dur_sec=\'([0-9]*?)\'',
+            r'<span[^>]+class="minustrack-full-title(?:\s+[^"]+)?"[^>]*>([^<]+)', webpage, 'title')
+        duration = parse_duration(self._html_search_regex(
+            r'<span[^>]+class="player-duration(?:\s+[^"]+)?"[^>]*>([^<]+)',

             webpage, 'duration', fatal=False))
             webpage, 'duration', fatal=False))

-        filesize_approx = parse_filesize(self._html_search_regex(
-            r'<div class="filesize[^"]*"></div>\s*([0-9.]+\s*[a-zA-Z][bB])',
-            webpage, 'approximate filesize', fatal=False))
-        tbr = int_or_none(self._html_search_regex(
-            r'<div class="quality[^"]*"></div>\s*([0-9]+)\s*kbps',
-            webpage, 'bitrate', fatal=False))
+        mobj = re.search(
+            r'<div[^>]+class="dw-info(?:\s+[^"]+)?"[^>]*>(?P<tbr>\d+)\s*кбит/c\s+(?P<filesize>[0-9.]+)\s*мб</div>',
+            webpage)
+        tbr = filesize_approx = None
+        if mobj:
+            filesize_approx = float(mobj.group('filesize')) * 1000000
+            tbr = float(mobj.group('tbr'))

         view_count = int_or_none(self._html_search_regex(
         view_count = int_or_none(self._html_search_regex(

-            r'<div class="quality.*?► ([0-9]+)',
+            r'<span><[^>]+class="icon-chart-bar".*?>(\d+)</span>',

             webpage, 'view count', fatal=False))
             webpage, 'view count', fatal=False))

+        description = self._html_search_regex(
+            r'(?s)<pre[^>]+id="lyrics-original"[^>]*>(.*?)</pre>',
+            webpage, 'song lyrics', fatal=False)
+        if description:
+            description = re.sub(' *\r *', '\n', description)

 
 

-        enc_token = self._html_search_regex(
-            r'minus_track\.tkn="(.+?)"', webpage, 'enc_token')
-        token = ''.join(
-            c if pos == 3 else compat_chr(compat_ord(c) - 1)
-            for pos, c in enumerate(reversed(enc_token)))
-        video_url = 'http://x-minus.org/dwlf/%s/%s.mp3' % (video_id, token)
+        k = self._search_regex(
+            r'<div[^>]+id="player-bottom"[^>]+data-k="([^"]+)">', webpage,
+            'encoded data')
+        h = time.time() / 3600
+        a = sum(map(int, [compat_ord(c) for c in k])) + int(video_id) + h
+        video_url = 'http://x-minus.me/dl/minus?id=%s&tkn2=%df%d' % (video_id, a, h)

 
         return {
             'id': video_id,
             'title': title,
             'url': video_url,
 
         return {
             'id': video_id,
             'title': title,
             'url': video_url,

+            # The extension is unknown until actual downloading
+            'ext': 'mp3',

             'duration': duration,
             'filesize_approx': filesize_approx,
             'tbr': tbr,
             'view_count': view_count,
             'duration': duration,
             'filesize_approx': filesize_approx,
             'tbr': tbr,
             'view_count': view_count,

+            'description': description,

         }
         }