1
0
mirror of https://github.com/l1ving/youtube-dl synced 2024-12-21 20:02:55 +08:00
youtube-dl/youtube_dl
phi 097eba019d bug fix for extractor xiami.py
Before applying this patch, when downloading resources from xiami.com, it crashes with these:
Traceback (most recent call last):
  File "/home/phi/.local/bin/youtube-dl", line 11, in <module>
    sys.exit(main())
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/__init__.py", line 433, in main
    _real_main(argv)
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/__init__.py", line 423, in _real_main
    retcode = ydl.download(all_urls)
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/YoutubeDL.py", line 1786, in download
    url, force_generic_extractor=self.params.get('force_generic_extractor', False))
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/YoutubeDL.py", line 691, in extract_info
    ie_result = ie.extract(url)
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/extractor/common.py", line 347, in extract
    return self._real_extract(url)
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/extractor/xiami.py", line 116, in _real_extract
    return self._extract_tracks(self._match_id(url))[0]
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/extractor/xiami.py", line 43, in _extract_tracks
    '%s/%s%s' % (self._API_BASE_URL, item_id, '/type/%s' % typ if typ else ''), item_id)
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/extractor/common.py", line 562, in _download_json
    json_string, video_id, transform_source=transform_source, fatal=fatal)
  File "/home/phi/.local/lib/python3.5/site-packages/youtube_dl/extractor/common.py", line 568, in _parse_json
    return json.loads(json_string)
  File "/usr/lib/python3.5/json/__init__.py", line 312, in loads
    s.__class__.__name__))
TypeError: the JSON object must be str, not 'NoneType'

This patch solves exactly this problem.
2016-08-14 02:18:59 +08:00
..
downloader [downloader/external:curl] Clarify why CurlFD should not capture stderr 2016-08-13 10:26:02 +01:00
extractor bug fix for extractor xiami.py 2016-08-14 02:18:59 +08:00
postprocessor [metadatafromtitle] Remove unused exception class 2016-08-09 04:01:05 +07:00
__init__.py Add more checks for --min/max-sleep-interval arguments and use more idiomatic naming 2016-08-09 03:47:56 +07:00
__main__.py [refactor] Single quotes consistency 2016-02-14 15:37:17 +06:00
aes.py [aes] Switch to new-style classes 2016-02-14 14:01:43 +06:00
cache.py
compat.py [compat] Fix test_cmdline_umlauts on Python 2.6 2016-07-07 22:30:58 +08:00
jsinterp.py [jsinterp] Relax JS function regex (Closes #9863) 2016-06-23 09:41:34 +07:00
options.py Fix --min/max-sleep-interval wording 2016-08-09 03:46:52 +07:00
socks.py Fix misspelling 2016-06-26 01:28:55 +07:00
swfinterp.py [compat] Rename struct_(un)pack to compat_struct_(un)pack 2016-05-10 14:51:38 +08:00
update.py [update] Fix youtube-dl.exe updating from arbitrary directory (Closes #2718) 2016-05-22 10:06:45 +06:00
utils.py [external/curl] respect more downloader options and display progress 2016-08-12 12:30:02 +01:00
version.py release 2016.08.13 2016-08-13 23:17:11 +07:00
YoutubeDL.py [YoutubeDL] Disable newline conversion when writing subtitles 2016-08-11 19:04:23 +08:00