Просмотр исходного кода

[kwuo:song] Improve error detection (closes #10650)

Yen Chi Hsuan 9 лет назад
Родитель
Сommit
961516bfd1
2 измененных файлов с 3 добавлено и 2 удалено
  1. 1 0
      ChangeLog
  2. 2 2
      youtube_dl/extractor/kuwo.py

+ 1 - 0
ChangeLog

@@ -1,6 +1,7 @@
 version <unreleased>
 version <unreleased>
 
 
 Extractors
 Extractors
+* [kwuo] Improve error detection (#10650)
 * [bilibili] Fix extraction for specific videos (#10647)
 * [bilibili] Fix extraction for specific videos (#10647)
 + [nbc] Add support for NBC Olympics (#10361)
 + [nbc] Add support for NBC Olympics (#10361)
 
 

+ 2 - 2
youtube_dl/extractor/kuwo.py

@@ -91,10 +91,10 @@ class KuwoIE(KuwoBaseIE):
 
 
     def _real_extract(self, url):
     def _real_extract(self, url):
         song_id = self._match_id(url)
         song_id = self._match_id(url)
-        webpage = self._download_webpage(
+        webpage, urlh = self._download_webpage_handle(
             url, song_id, note='Download song detail info',
             url, song_id, note='Download song detail info',
             errnote='Unable to get song detail info')
             errnote='Unable to get song detail info')
-        if '对不起,该歌曲由于版权问题已被下线,将返回网站首页' in webpage:
+        if song_id not in urlh.geturl() or '对不起,该歌曲由于版权问题已被下线,将返回网站首页' in webpage:
             raise ExtractorError('this song has been offline because of copyright issues', expected=True)
             raise ExtractorError('this song has been offline because of copyright issues', expected=True)
 
 
         song_name = self._html_search_regex(
         song_name = self._html_search_regex(