summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXie Yanbo <xieyanbo@gmail.com>2022-10-30 19:46:46 +0800
committerGitHub <noreply@github.com>2022-10-30 11:46:46 +0000
commitd25cf62086443d86a633b8176b5c7e79f4cc569e (patch)
tree514c70c5e2bfec4f1d0b6c65790da3b2daa405ee
parent502cefa41f1d24057b6158748b2072dc911af682 (diff)
downloadyoutube-dl-d25cf62086443d86a633b8176b5c7e79f4cc569e.tar.gz
youtube-dl-d25cf62086443d86a633b8176b5c7e79f4cc569e.tar.xz
[netease] Impove error handling (#31303)
* add warnings for users outside of China * skip empty song urls Co-authored-by: dirkf <fieldhouse@gmx.net>
-rw-r--r--youtube_dl/extractor/neteasemusic.py28
1 files changed, 25 insertions, 3 deletions
diff --git a/youtube_dl/extractor/neteasemusic.py b/youtube_dl/extractor/neteasemusic.py
index fad22a2cd..2bbfc7858 100644
--- a/youtube_dl/extractor/neteasemusic.py
+++ b/youtube_dl/extractor/neteasemusic.py
@@ -20,6 +20,7 @@ from ..compat import (
from ..utils import (
ExtractorError,
bytes_to_intlist,
+ error_to_compat_str,
float_or_none,
int_or_none,
intlist_to_bytes,
@@ -94,17 +95,23 @@ class NetEaseMusicBaseIE(InfoExtractor):
url = 'https://interface3.music.163.com/eapi/song/enhance/player/url'
data, headers = self.make_player_api_request_data_and_headers(song_id, bitrate)
try:
- return self._download_json(
+ msg = 'empty result'
+ result = self._download_json(
url, song_id, data=data.encode('ascii'), headers=headers)
+ if result:
+ return result
except ExtractorError as e:
if type(e.cause) in (ValueError, TypeError):
# JSON load failure
raise
- except Exception:
- pass
+ except Exception as e:
+ msg = error_to_compat_str(e)
+ self.report_warning('%s API call (%s) failed: %s' % (
+ song_id, bitrate, msg))
return {}
def extract_formats(self, info):
+ err = 0
formats = []
song_id = info['id']
for song_format in self._FORMATS:
@@ -116,6 +123,8 @@ class NetEaseMusicBaseIE(InfoExtractor):
data = self._call_player_api(song_id, bitrate)
for song in try_get(data, lambda x: x['data'], list) or []:
song_url = try_get(song, lambda x: x['url'])
+ if not song_url:
+ continue
if self._is_valid_url(song_url, info['id'], 'song'):
formats.append({
'url': song_url,
@@ -125,6 +134,19 @@ class NetEaseMusicBaseIE(InfoExtractor):
'filesize': int_or_none(song.get('size')),
'asr': int_or_none(details.get('sr')),
})
+ elif err == 0:
+ err = try_get(song, lambda x: x['code'], int)
+
+ if not formats:
+ msg = 'No media links found'
+ if err != 0 and (err < 200 or err >= 400):
+ raise ExtractorError(
+ '%s (site code %d)' % (msg, err, ), expected=True)
+ else:
+ self.raise_geo_restricted(
+ msg + ': probably this video is not available from your location due to geo restriction.',
+ countries=['CN'])
+
return formats
@classmethod

Generated by cgit