debian/watch: Skip pgpsigurlmangle for the moment.

[youtubedl] / youtube_dl / extractor / neteasemusic.py

diff --git a/youtube_dl/extractor/neteasemusic.py b/youtube_dl/extractor/neteasemusic.py
index a8e0a64ed4933644965fd07c3eb3216fc532c915..7830616f8fb9498c058504d52c199c6a69a9d98b 100644 (file)
--- a/youtube_dl/extractor/neteasemusic.py
+++ b/youtube_dl/extractor/neteasemusic.py
@@ -8,11 +8,14 @@ import re
 
 from .common import InfoExtractor
 from ..compat import (
 
 from .common import InfoExtractor
 from ..compat import (

-    compat_urllib_request,

     compat_urllib_parse,
     compat_str,
     compat_itertools_count,
 )
     compat_urllib_parse,
     compat_str,
     compat_itertools_count,
 )

+from ..utils import (
+    sanitized_Request,
+    float_or_none,
+)

 
 
 class NetEaseMusicBaseIE(InfoExtractor):
 
 
 class NetEaseMusicBaseIE(InfoExtractor):


@@ -32,23 +35,32 @@ class NetEaseMusicBaseIE(InfoExtractor):
         result = b64encode(m.digest()).decode('ascii')
         return result.replace('/', '_').replace('+', '-')
 
         result = b64encode(m.digest()).decode('ascii')
         return result.replace('/', '_').replace('+', '-')
 

-    @classmethod
-    def extract_formats(cls, info):
+    def extract_formats(self, info):

         formats = []
         formats = []

-        for song_format in cls._FORMATS:
+        for song_format in self._FORMATS:

             details = info.get(song_format)
             if not details:
                 continue
             details = info.get(song_format)
             if not details:
                 continue

-            formats.append({
-                'url': 'http://m1.music.126.net/%s/%s.%s' %
-                       (cls._encrypt(details['dfsId']), details['dfsId'],
-                        details['extension']),
-                'ext': details.get('extension'),
-                'abr': details.get('bitrate', 0) / 1000,
-                'format_id': song_format,
-                'filesize': details.get('size'),
-                'asr': details.get('sr')
-            })
+            song_file_path = '/%s/%s.%s' % (
+                self._encrypt(details['dfsId']), details['dfsId'], details['extension'])
+
+            # 203.130.59.9, 124.40.233.182, 115.231.74.139, etc is a reverse proxy-like feature
+            # from NetEase's CDN provider that can be used if m5.music.126.net does not
+            # work, especially for users outside of Mainland China
+            # via: https://github.com/JixunMoe/unblock-163/issues/3#issuecomment-163115880
+            for host in ('http://m5.music.126.net', 'http://115.231.74.139/m1.music.126.net',
+                         'http://124.40.233.182/m1.music.126.net', 'http://203.130.59.9/m1.music.126.net'):
+                song_url = host + song_file_path
+                if self._is_valid_url(song_url, info['id'], 'song'):
+                    formats.append({
+                        'url': song_url,
+                        'ext': details.get('extension'),
+                        'abr': float_or_none(details.get('bitrate'), scale=1000),
+                        'format_id': song_format,
+                        'filesize': details.get('size'),
+                        'asr': details.get('sr')
+                    })
+                    break

         return formats
 
     @classmethod
         return formats
 
     @classmethod


@@ -56,7 +68,7 @@ class NetEaseMusicBaseIE(InfoExtractor):
         return int(round(ms / 1000.0))
 
     def query_api(self, endpoint, video_id, note):
         return int(round(ms / 1000.0))
 
     def query_api(self, endpoint, video_id, note):

-        req = compat_urllib_request.Request('%s%s' % (self._API_BASE, endpoint))
+        req = sanitized_Request('%s%s' % (self._API_BASE, endpoint))

         req.add_header('Referer', self._API_BASE)
         return self._download_json(req, video_id, note)
 
         req.add_header('Referer', self._API_BASE)
         return self._download_json(req, video_id, note)