Initiate new release.

[youtubedl] / youtube_dl / extractor / neteasemusic.py

diff --git a/youtube_dl/extractor/neteasemusic.py b/youtube_dl/extractor/neteasemusic.py
index a8e0a64ed4933644965fd07c3eb3216fc532c915..978a05841ce68161330f9db24169dd330e51efc1 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_urllib_parse_urlencode,

     compat_str,
     compat_itertools_count,
 )
     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)
 


@@ -77,6 +89,7 @@ class NetEaseMusicIE(NetEaseMusicBaseIE):
             'timestamp': 1431878400,
             'description': 'md5:a10a54589c2860300d02e1de821eb2ef',
         },
             'timestamp': 1431878400,
             'description': 'md5:a10a54589c2860300d02e1de821eb2ef',
         },

+        'skip': 'Blocked outside Mainland China',

     }, {
         'note': 'No lyrics translation.',
         'url': 'http://music.163.com/#/song?id=29822014',
     }, {
         'note': 'No lyrics translation.',
         'url': 'http://music.163.com/#/song?id=29822014',


@@ -89,6 +102,7 @@ class NetEaseMusicIE(NetEaseMusicBaseIE):
             'timestamp': 1419523200,
             'description': 'md5:a4d8d89f44656af206b7b2555c0bce6c',
         },
             'timestamp': 1419523200,
             'description': 'md5:a4d8d89f44656af206b7b2555c0bce6c',
         },

+        'skip': 'Blocked outside Mainland China',

     }, {
         'note': 'No lyrics.',
         'url': 'http://music.163.com/song?id=17241424',
     }, {
         'note': 'No lyrics.',
         'url': 'http://music.163.com/song?id=17241424',


@@ -100,6 +114,7 @@ class NetEaseMusicIE(NetEaseMusicBaseIE):
             'upload_date': '20080211',
             'timestamp': 1202745600,
         },
             'upload_date': '20080211',
             'timestamp': 1202745600,
         },

+        'skip': 'Blocked outside Mainland China',

     }, {
         'note': 'Has translated name.',
         'url': 'http://music.163.com/#/song?id=22735043',
     }, {
         'note': 'Has translated name.',
         'url': 'http://music.163.com/#/song?id=22735043',


@@ -112,7 +127,8 @@ class NetEaseMusicIE(NetEaseMusicBaseIE):
             'upload_date': '20100127',
             'timestamp': 1264608000,
             'alt_title': '说出愿望吧(Genie)',
             'upload_date': '20100127',
             'timestamp': 1264608000,
             'alt_title': '说出愿望吧(Genie)',

-        }
+        },
+        'skip': 'Blocked outside Mainland China',

     }]
 
     def _process_lyrics(self, lyrics_info):
     }]
 
     def _process_lyrics(self, lyrics_info):


@@ -141,7 +157,7 @@ class NetEaseMusicIE(NetEaseMusicBaseIE):
             'ids': '[%s]' % song_id
         }
         info = self.query_api(
             'ids': '[%s]' % song_id
         }
         info = self.query_api(

-            'song/detail?' + compat_urllib_parse.urlencode(params),
+            'song/detail?' + compat_urllib_parse_urlencode(params),

             song_id, 'Downloading song info')['songs'][0]
 
         formats = self.extract_formats(info)
             song_id, 'Downloading song info')['songs'][0]
 
         formats = self.extract_formats(info)


@@ -180,6 +196,7 @@ class NetEaseMusicAlbumIE(NetEaseMusicBaseIE):
             'title': 'B\'day',
         },
         'playlist_count': 23,
             'title': 'B\'day',
         },
         'playlist_count': 23,

+        'skip': 'Blocked outside Mainland China',

     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):


@@ -211,6 +228,7 @@ class NetEaseMusicSingerIE(NetEaseMusicBaseIE):
             'title': '张惠妹 - aMEI;阿密特',
         },
         'playlist_count': 50,
             'title': '张惠妹 - aMEI;阿密特',
         },
         'playlist_count': 50,

+        'skip': 'Blocked outside Mainland China',

     }, {
         'note': 'Singer has translated name.',
         'url': 'http://music.163.com/#/artist?id=124098',
     }, {
         'note': 'Singer has translated name.',
         'url': 'http://music.163.com/#/artist?id=124098',


@@ -219,6 +237,7 @@ class NetEaseMusicSingerIE(NetEaseMusicBaseIE):
             'title': '李昇基 - 이승기',
         },
         'playlist_count': 50,
             'title': '李昇基 - 이승기',
         },
         'playlist_count': 50,

+        'skip': 'Blocked outside Mainland China',

     }]
 
     def _real_extract(self, url):
     }]
 
     def _real_extract(self, url):


@@ -254,6 +273,7 @@ class NetEaseMusicListIE(NetEaseMusicBaseIE):
             'description': 'md5:12fd0819cab2965b9583ace0f8b7b022'
         },
         'playlist_count': 99,
             'description': 'md5:12fd0819cab2965b9583ace0f8b7b022'
         },
         'playlist_count': 99,

+        'skip': 'Blocked outside Mainland China',

     }, {
         'note': 'Toplist/Charts sample',
         'url': 'http://music.163.com/#/discover/toplist?id=3733003',
     }, {
         'note': 'Toplist/Charts sample',
         'url': 'http://music.163.com/#/discover/toplist?id=3733003',


@@ -263,6 +283,7 @@ class NetEaseMusicListIE(NetEaseMusicBaseIE):
             'description': 'md5:73ec782a612711cadc7872d9c1e134fc',
         },
         'playlist_count': 50,
             'description': 'md5:73ec782a612711cadc7872d9c1e134fc',
         },
         'playlist_count': 50,

+        'skip': 'Blocked outside Mainland China',

     }]
 
     def _real_extract(self, url):
     }]
 
     def _real_extract(self, url):


@@ -302,6 +323,7 @@ class NetEaseMusicMvIE(NetEaseMusicBaseIE):
             'creator': '白雅言',
             'upload_date': '20150520',
         },
             'creator': '白雅言',
             'upload_date': '20150520',
         },

+        'skip': 'Blocked outside Mainland China',

     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):


@@ -345,6 +367,7 @@ class NetEaseMusicProgramIE(NetEaseMusicBaseIE):
             'upload_date': '20150613',
             'duration': 900,
         },
             'upload_date': '20150613',
             'duration': 900,
         },

+        'skip': 'Blocked outside Mainland China',

     }, {
         'note': 'This program has accompanying songs.',
         'url': 'http://music.163.com/#/program?id=10141022',
     }, {
         'note': 'This program has accompanying songs.',
         'url': 'http://music.163.com/#/program?id=10141022',


@@ -354,6 +377,7 @@ class NetEaseMusicProgramIE(NetEaseMusicBaseIE):
             'description': 'md5:8d594db46cc3e6509107ede70a4aaa3b',
         },
         'playlist_count': 4,
             'description': 'md5:8d594db46cc3e6509107ede70a4aaa3b',
         },
         'playlist_count': 4,

+        'skip': 'Blocked outside Mainland China',

     }, {
         'note': 'This program has accompanying songs.',
         'url': 'http://music.163.com/#/program?id=10141022',
     }, {
         'note': 'This program has accompanying songs.',
         'url': 'http://music.163.com/#/program?id=10141022',


@@ -367,7 +391,8 @@ class NetEaseMusicProgramIE(NetEaseMusicBaseIE):
         },
         'params': {
             'noplaylist': True
         },
         'params': {
             'noplaylist': True

-        }
+        },
+        'skip': 'Blocked outside Mainland China',

     }]
 
     def _real_extract(self, url):
     }]
 
     def _real_extract(self, url):


@@ -426,6 +451,7 @@ class NetEaseMusicDjRadioIE(NetEaseMusicBaseIE):
             'description': 'md5:766220985cbd16fdd552f64c578a6b15'
         },
         'playlist_mincount': 40,
             'description': 'md5:766220985cbd16fdd552f64c578a6b15'
         },
         'playlist_mincount': 40,

+        'skip': 'Blocked outside Mainland China',

     }
     _PAGE_SIZE = 1000
 
     }
     _PAGE_SIZE = 1000