Commit Graph

11279 Commits (fafabc0712d95e6a5b2ac56e9375fe90060738f5)

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.
8 years ago
Sergey M․ 73a85620ee
release 2016.08.13 8 years ago
Sergey M․ 5ec5461e1a
[pbs] Clarify comment on http formats 8 years ago
Sergey M․ 542130a5d9
[pbs] Fix description extraction and update tests 8 years ago
Sergey M․ 82997dad57
[franceculture] Fix extraction (Closes #10324) 8 years ago
Sergey M․ 647a7bf5e8
[pornotube] Fix extraction (Closes #10322) 8 years ago
Sergey M․ 77afa008dd
[4tube] Fix metadata extraction (Closes #10321) 8 years ago
Yen Chi Hsuan db535435b3
[bigflix] Remove an invalid test
There's no video anymore
8 years ago
Sergey M․ c2a453b461
[imgur] Fix width and height extraction (Closes #10325) 8 years ago
Sergey M․ cd29eaab95
[vbox7] Remove unused imports 8 years ago
Sergey M․ e97c55ee6a
[expotv] Improve extraction and update test 8 years ago
Remita Amine acfccacad5 [downloader/external:curl] Clarify why CurlFD should not capture stderr 8 years ago
Sergey M․ cb55908e51
[vbox7] Fix extraction (Closes #10309) 8 years ago
Yen Chi Hsuan e581224843
[tapely] Remove extractor. It's shut down
Closes #10323
8 years ago
Remita Amine f50365e91c [pbs] add test for videos with undocumented http formats and remove unused import 8 years ago
Sergey M․ c366f8d30a
[24video] Add support for me and xxx TLDs 8 years ago
Sergey M․ 6a26c5f9d5
[muenchentv] Fix extraction (Closes #10313) 8 years ago
Sergey M․ bd6fb007de
[24video] Fix comment count extraction 8 years ago
Sergey M․ b69b2ff736
[sunporno] Add support for embed URLs 8 years ago
Sergey M․ 794e5dcd7e
[sunporno] Fix metadata extraction (Closes #10316) 8 years ago
Remita Amine f0d3669437 [hgtv] Add new extractor(closes #3999) 8 years ago
Remita Amine 98e698f1ff [external/curl] respect more downloader options and display progress 8 years ago
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
8 years ago
Sergey M․ 990d533ee4
[crunchyroll] Add support for HLS (Closes #10301) 8 years ago
Sergey M․ b0081562d2
release 2016.08.12 8 years ago
Sergey M․ a3be69b7f0
[viu] Remove from extractors 8 years ago
Sergey M․ 0fd1b1624c
[goldenmoustache] Remove extractor (Closes #10298)
Now uses dailymotion
8 years ago
Sergey M․ 367976d49f
[drtuber] Improve title extraction 8 years ago
Sergey M․ 0aef0771f8
[drtuber] Make dislike count optional (Closes #10297) 8 years ago
Sergey M․ 0c070681c5
[chirbit] Fix extraction (Closes #10296) 8 years ago
Sergey M․ 30b25d382d
[francetvinfo] Relax _VALID_URL 8 years ago
Yen Chi Hsuan e2e84aed7e
Merge branch 'lkho-pr/#10268' 8 years ago
Yen Chi Hsuan b1927f4e8a
[YoutubeDL] Disable newline conversion when writing subtitles
By default io.open() convert all '\n' occurrences to '\r\n' when writing
files. If the content already contains '\r\n', it will be converted to
'\r\r\n', breaking some video players.
8 years ago
Yen Chi Hsuan 3b9323d96e
Merge branch 'pr/#10268' of https://github.com/lkho/youtube-dl into lkho-pr/#10268 8 years ago
lkho 7f832413d6 Preserve line endings for downloaded subtitle files 8 years ago
Sergey M․ 7f2ed47595
[rtlnl] Relax _VALID_URL (Closes #10282) 8 years ago
Sergey M․ c3fa77bdef
[formula1] Relax _VALID_URL (Closes #10283) 8 years ago
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)
8 years ago
Yen Chi Hsuan 69d8eeeec5
[ctsnews] Fix extraction 8 years ago
Yen Chi Hsuan 81c13222c6
[utils] Recognize more formats in unified_timestamp
Used in CtsNews
8 years ago
Sergey M․ b1ce2ba197
release 2016.08.10 8 years ago
Remita Amine 20ef4123b9 [uol] remove unused import 8 years ago
Remita Amine 4e62d26aa2 [uol] Add new extractor(#4263) 8 years ago
Sergey M․ 25dd58ca6a
[metadatafromtitle] Remove unused exception class 8 years ago
nyorain 5e42f8a0ad
Make --metadata-from-title non fatal
Output a warning if the metadata can't be parsed from the title (and don't write any metadata) instead of raising a critical error.
8 years ago
Sergey M․ 1ad6b891b2
Add more checks for --min/max-sleep-interval arguments and use more idiomatic naming 8 years ago
Sergey M․ 7aa589a5e1
Fix --min/max-sleep-interval wording 8 years ago
singh-pratyush96 065bc35489
Add --max-sleep-interval (Closes #9930) 8 years ago
Sergey M․ 3a380766d1
[rbmaradio] Improve, simplify and extract all formats (Closes #10242) 8 years ago
Petr Zvoníček affaea0688
[rbmaradio] Fixed extractor 8 years ago