Commit graph

8467 commits

Author SHA1 Message Date
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
Sergey M․ 5ec5461e1a
[pbs] Clarify comment on http formats 2016-08-13 22:50:18 +07:00
Sergey M․ 542130a5d9
[pbs] Fix description extraction and update tests 2016-08-13 21:59:29 +07:00
Sergey M․ 82997dad57
[franceculture] Fix extraction (Closes #10324) 2016-08-13 21:00:34 +07:00
Sergey M․ 647a7bf5e8
[pornotube] Fix extraction (Closes #10322) 2016-08-13 20:49:16 +07:00
Sergey M․ 77afa008dd
[4tube] Fix metadata extraction (Closes #10321) 2016-08-13 19:55:09 +07:00
Yen Chi Hsuan db535435b3
[bigflix] Remove an invalid test
There's no video anymore
2016-08-13 18:02:11 +08:00
Sergey M․ c2a453b461
[imgur] Fix width and height extraction (Closes #10325) 2016-08-13 16:46:07 +07:00
Sergey M․ cd29eaab95
[vbox7] Remove unused imports 2016-08-13 16:45:34 +07:00
Sergey M․ e97c55ee6a
[expotv] Improve extraction and update test 2016-08-13 16:29:05 +07:00
Sergey M․ cb55908e51
[vbox7] Fix extraction (Closes #10309) 2016-08-13 15:47:20 +07:00
Yen Chi Hsuan e581224843
[tapely] Remove extractor. It's shut down
Closes #10323
2016-08-13 16:32:07 +08:00
Remita Amine f50365e91c [pbs] add test for videos with undocumented http formats and remove unused import 2016-08-13 09:10:09 +01:00
Sergey M․ c366f8d30a
[24video] Add support for me and xxx TLDs 2016-08-13 14:47:51 +07:00
Sergey M․ 6a26c5f9d5
[muenchentv] Fix extraction (Closes #10313) 2016-08-13 14:28:44 +07:00
Sergey M․ bd6fb007de
[24video] Fix comment count extraction 2016-08-13 14:22:47 +07:00
Sergey M․ b69b2ff736
[sunporno] Add support for embed URLs 2016-08-13 14:13:49 +07:00
Sergey M․ 794e5dcd7e
[sunporno] Fix metadata extraction (Closes #10316) 2016-08-13 14:09:35 +07:00
Remita Amine f0d3669437 [hgtv] Add new extractor(closes #3999) 2016-08-12 18:05:49 +01:00
Remita Amine 3cddb8d6a7 [pbs] check all http formats and remove unnecessary request
- some of the quality that not reported in the documentation
are available(4500k, 6500k)
- the videoInfo request doesn't work for a long time
2016-08-12 08:38:06 +01:00
Sergey M․ 990d533ee4
[crunchyroll] Add support for HLS (Closes #10301) 2016-08-12 00:56:16 +07:00
Sergey M․ a3be69b7f0
[viu] Remove from extractors 2016-08-12 00:14:51 +07:00
Sergey M․ 0fd1b1624c
[goldenmoustache] Remove extractor (Closes #10298)
Now uses dailymotion
2016-08-11 23:52:17 +07:00
Sergey M․ 367976d49f
[drtuber] Improve title extraction 2016-08-11 23:47:52 +07:00
Sergey M․ 0aef0771f8
[drtuber] Make dislike count optional (Closes #10297) 2016-08-11 23:47:27 +07:00
Sergey M․ 0c070681c5
[chirbit] Fix extraction (Closes #10296) 2016-08-11 23:37:56 +07:00
Sergey M․ 30b25d382d
[francetvinfo] Relax _VALID_URL 2016-08-11 21:42:55 +07:00
Sergey M․ 7f2ed47595
[rtlnl] Relax _VALID_URL (Closes #10282) 2016-08-10 21:07:43 +07:00
Sergey M․ c3fa77bdef
[formula1] Relax _VALID_URL (Closes #10283) 2016-08-10 21:00:40 +07:00
Remita Amine 57ce8a6d08 [wat] improve extraction(#10281)
add alternative method to extract http formats
works even if the video is geo-restricted or removed
from public access(most of the cases)
2016-08-10 14:20:28 +01:00
Yen Chi Hsuan 69d8eeeec5
[ctsnews] Fix extraction 2016-08-10 11:38:38 +08:00
Remita Amine 20ef4123b9 [uol] remove unused import 2016-08-09 15:13:15 +01:00
Remita Amine 4e62d26aa2 [uol] Add new extractor(#4263) 2016-08-09 15:09:08 +01:00
Sergey M․ 3a380766d1
[rbmaradio] Improve, simplify and extract all formats (Closes #10242) 2016-08-09 02:46:29 +07:00
Petr Zvoníček affaea0688
[rbmaradio] Fixed extractor 2016-08-09 02:18:33 +07:00
Sergey M․ 77426a087b
[sonyliv] Improve (Closes #10258) 2016-08-09 02:16:28 +07:00
Sukhbir Singh 8991844ea2
[sonyliv] Add new extractor 2016-08-09 02:09:13 +07:00
Sergey M․ 082395d0a0
[extractor/generic] Add proper default to _search_json_ld call 2016-08-08 22:48:33 +07:00
Sergey M․ e8ed7354e6
[flipagram] Add proper default to _search_json_ld call 2016-08-08 22:46:19 +07:00
Sergey M․ 1e7f602e2a
[condenast] Make _search_json_ld call non fatal 2016-08-08 22:45:49 +07:00
Sergey M․ 522f6c066d
[bbc] Add proper default to _search_json_ld call 2016-08-08 22:44:36 +07:00
Sergey M․ 321b5e082a
[extractor/common] Respect default in _search_json_ld 2016-08-08 22:36:18 +07:00
Sergey M․ 3711fa1eb2
Revert "[flipagram] Make _search_json_ld non fatal"
This reverts commit d34995a9e3.
2016-08-08 21:49:45 +07:00
Sergey M․ 395c74615c
Revert "[extractor/generic] Make _search_json_ld non fatal"
This reverts commit 958849275f.
2016-08-08 21:49:27 +07:00
Yen Chi Hsuan 3dc240e8c6
[sohu] Update _TESTS (closes #10260) 2016-08-08 18:48:21 +08:00
Yen Chi Hsuan a41a6c5094
[chaturbate] Skip the invalid test 2016-08-08 13:06:02 +08:00
Yen Chi Hsuan d71207121d
[biqle] Skip an invalid test 2016-08-08 12:59:55 +08:00
Yen Chi Hsuan b1c6f21c74
[aparat] Fix extraction 2016-08-08 12:59:07 +08:00
Yen Chi Hsuan 412abb8760
[bilibili] Update _TESTS 2016-08-08 12:57:17 +08:00
Yen Chi Hsuan f17d5f6d14
[features.aol.com] Fix _TESTS 2016-08-08 12:52:36 +08:00