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
..
__init__.py
abc7news.py
abc.py
abcnews.py
academicearth.py
acast.py
addanime.py
adobetv.py
adultswim.py	[adultswim] Remove superfluous md5 from test	2016-08-06 00:02:05 +07:00
aenetworks.py
afreecatv.py
aftonbladet.py
airmozilla.py
aljazeera.py
allocine.py
alphaporno.py
amp.py
animeondemand.py	[animeondemand] Fix typo	2016-07-09 22:20:34 +07:00
anitube.py
anvato.py
anysex.py
aol.py	[features.aol.com] Fix _TESTS	2016-08-08 12:52:36 +08:00
aparat.py	[aparat] Fix extraction	2016-08-08 12:59:07 +08:00
appleconnect.py
appletrailers.py
archiveorg.py	[archiveorg] PEP 8	2016-08-05 23:16:19 +07:00
ard.py	[ard:mediathek] Skip unavailable test	2016-07-28 21:38:23 +07:00
arkena.py	[arkena] Enable dash formats	2016-07-24 10:28:11 +07:00
arte.py
atresplayer.py
atttechchannel.py
audimedia.py
audioboom.py
audiomack.py
azubu.py
baidu.py
bambuser.py
bandcamp.py
bbc.py	[bbc] Add proper default to _search_json_ld call	2016-08-08 22:44:36 +07:00
beatportpro.py
beeg.py
behindkink.py
bet.py
bigflix.py	[bigflix] Remove an invalid test	2016-08-13 18:02:11 +08:00
bild.py
bilibili.py	[bilibili] Update _TESTS	2016-08-08 12:57:17 +08:00
biobiochiletv.py	[biobiochiletv] Fix extraction and update _TESTS	2016-07-11 13:23:57 +08:00
biqle.py	[biqle] Skip an invalid test	2016-08-08 12:59:55 +08:00
bleacherreport.py
blinkx.py
bloomberg.py	[bloomberg] Support BPlayer() players (closes #10187)	2016-07-31 14:47:19 +08:00
bokecc.py
bpb.py
br.py
bravotv.py
breakcom.py
brightcove.py	[brightcove] skip ism manifests	2016-07-14 14:13:57 +01:00
buzzfeed.py
byutv.py
c56.py
camdemy.py	[camdemy] Extract duration properly	2016-07-25 23:03:58 +07:00
camwithher.py
canalc2.py
canalplus.py
canvas.py
carambatv.py
cbc.py	[cbc] PEP 8	2016-07-26 23:08:08 +07:00
cbs.py
cbsinteractive.py
cbslocal.py	[cbslocal] Fix timestamp parsing (closes #10213)	2016-08-05 11:44:50 +08:00
cbsnews.py	[cbsnews] Update _TESTS of CBSNewsLiveVideoIE	2016-07-16 15:37:54 +08:00
cbssports.py
ccc.py
cda.py
ceskatelevize.py
channel9.py
chaturbate.py	[chaturbate] Skip the invalid test	2016-08-08 13:06:02 +08:00
chilloutzone.py
chirbit.py	[chirbit] Fix extraction (Closes #10296)	2016-08-11 23:37:56 +07:00
cinchcast.py
clipfish.py
cliphunter.py	[cliphunter] Update _TESTS	2016-07-16 15:37:54 +08:00
cliprs.py
clipsyndicate.py
closertotruth.py
cloudy.py	[cloudy] Drop videoraj.to	2016-07-16 15:37:54 +08:00
clubic.py
clyp.py
cmt.py	[cmt] Detect unavailable videos and update _TESTS	2016-07-26 13:13:14 +08:00
cnbc.py
cnn.py
collegerama.py
comcarcoff.py
comedycentral.py	[comedycentral] Re-add shortnames	2016-08-02 14:02:31 +02:00
common.py	[extractor/common] Respect default in _search_json_ld	2016-08-08 22:36:18 +07:00
commonmistakes.py
commonprotocols.py
condenast.py	[condenast] Make _search_json_ld call non fatal	2016-08-08 22:45:49 +07:00
coub.py
cracked.py
crackle.py
criterion.py
crooksandliars.py
crunchyroll.py	[crunchyroll] Add support for HLS (Closes #10301)	2016-08-12 00:56:16 +07:00
cspan.py	Fix unit tests for m3u8 and RTSP extractors that require ffmpeg or mplayer	2016-07-15 03:06:23 +07:00
ctsnews.py	[ctsnews] Fix extraction	2016-08-10 11:38:38 +08:00
ctv.py
ctvnews.py
cultureunplugged.py
cwtv.py	[cwtv] extract http formats	2016-08-07 22:58:12 +01:00
dailymail.py	[DailyMail] Improve title and description extraction	2016-07-24 05:37:13 +07:00
dailymotion.py	[dailymotion:playlist] Carry long line	2016-07-29 22:47:34 +07:00
daum.py
dbtv.py	[dbtv] delegate extraction to BrightcoveNewIE	2016-07-11 16:30:24 +01:00
dcn.py	[dcn] Enable dash formats	2016-07-24 10:35:55 +07:00
dctp.py
deezer.py
defense.py
democracynow.py
dfb.py
dhm.py
digiteka.py
discovery.py
discoverygo.py	[discoverygo] Add extractor (Closes #10245)	2016-08-07 20:57:05 +07:00
dispeak.py
dotsub.py
douyutv.py
dplay.py
dramafever.py
drbonanza.py
dreisat.py	Fix unit tests for m3u8 and RTSP extractors that require ffmpeg or mplayer	2016-07-15 03:06:23 +07:00
dropbox.py
drtuber.py	[drtuber] Improve title extraction	2016-08-11 23:47:52 +07:00
drtv.py
dumpert.py
dvtv.py
dw.py
eagleplatform.py
ebaumsworld.py
echomsk.py
ehow.py
eighttracks.py
einthusan.py
eitb.py
ellentv.py	[ellentv] Improve extraction (Closes #10067)	2016-07-13 22:42:53 +07:00
elpais.py
embedly.py
engadget.py	[engadget] Relax _VALID_URL	2016-08-04 16:34:47 +01:00
eporner.py	[eporner] Fix extraction (Closes #10139)	2016-07-22 23:04:13 +07:00
eroprofile.py
escapist.py
espn.py
esri.py
europa.py
everyonesmixtape.py
exfm.py
expotv.py	[expotv] Improve extraction and update test	2016-08-13 16:29:05 +07:00
extractors.py	[franceculture] Fix extraction (Closes #10324)	2016-08-13 21:00:34 +07:00
extremetube.py
eyedotv.py
facebook.py	[facebook] Relax _VALID_URL (Closes #10151)	2016-07-24 04:36:49 +07:00
faz.py
fc2.py
fczenit.py
firstpost.py
firsttv.py
fivemin.py	[5min] fix _VALID_URL(closes #10228)	2016-08-05 10:22:33 +01:00
fivetv.py
fktv.py
flickr.py
flipagram.py	[flipagram] Add proper default to _search_json_ld call	2016-08-08 22:46:19 +07:00
folketinget.py
footyroom.py
formula1.py	[formula1] Relax _VALID_URL (Closes #10283)	2016-08-10 21:00:40 +07:00
fourtube.py	[4tube] Fix metadata extraction (Closes #10321)	2016-08-13 19:55:09 +07:00
fox.py	[fox] fix theplatform release url query	2016-08-06 20:53:39 +01:00
foxgay.py
foxnews.py
foxsports.py
franceculture.py	[franceculture] Fix extraction (Closes #10324)	2016-08-13 21:00:34 +07:00
franceinter.py
francetv.py	[francetvinfo] Relax _VALID_URL	2016-08-11 21:42:55 +07:00
freesound.py
freespeech.py
freevideo.py
funimation.py
funnyordie.py
fusion.py
gameinformer.py
gameone.py
gamersyde.py
gamespot.py	Fix unit tests for m3u8 and RTSP extractors that require ffmpeg or mplayer	2016-07-15 03:06:23 +07:00
gamestar.py
gazeta.py
gdcvault.py
generic.py	[extractor/generic] Add proper default to _search_json_ld call	2016-08-08 22:48:33 +07:00
gfycat.py
giantbomb.py
giga.py
glide.py
globo.py
godtube.py
godtv.py
golem.py
googledrive.py
googleplus.py
googlesearch.py
goshgay.py
gputechconf.py
groupon.py
hark.py
hbo.py
hearthisat.py
heise.py
hellporno.py
helsinki.py
hentaistigma.py
hgtv.py	[hgtv] Add new extractor(closes #3999)	2016-08-12 18:05:49 +01:00
historicfilms.py
hitbox.py
hornbunny.py
hotnewhiphop.py
hotstar.py
howcast.py
howstuffworks.py
hrti.py
huffpost.py
hypem.py
iconosquare.py
ign.py
imdb.py
imgur.py	[imgur] Fix width and height extraction (Closes #10325)	2016-08-13 16:46:07 +07:00
ina.py
indavideo.py
infoq.py
instagram.py	[instagram] Remove duplicate field in test	2016-07-26 23:07:16 +07:00
internetvideoarchive.py
iprima.py
iqiyi.py
ir90tv.py
ivi.py
ivideon.py
izlesene.py
jeuxvideo.py
jove.py
jpopsukitv.py
jwplatform.py	[jwplatform] add support for playlist extraction and relative urls and improve audio detection	2016-08-05 16:42:15 +01:00
kaltura.py	[kaltura] remove debugging line	2016-08-04 14:54:34 +01:00
kamcord.py
kanalplay.py
kankan.py
karaoketv.py
karrierevideos.py
keek.py
keezmovies.py
khanacademy.py
kickstarter.py
konserthusetplay.py
kontrtube.py
krasview.py
ku6.py
kusi.py
kuwo.py	[kuwo:singer] Fix extraction	2016-08-07 22:59:34 +08:00
la7.py
laola1tv.py
lcp.py	[lcp] Improve extraction	2016-07-23 17:56:11 +07:00
learnr.py
lecture2go.py
leeco.py
lemonde.py
libraryofcongress.py
libsyn.py
lifenews.py
limelight.py	[limelight] extract http formats	2016-08-03 13:12:51 +01:00
litv.py
liveleak.py
livestream.py
lnkgo.py
localnews8.py
lovehomeporn.py
lrt.py
lynda.py	[lynda] Remove md5 from test (Closes #10047)	2016-07-09 21:29:11 +07:00
m6.py
macgamestore.py
mailru.py
makerschannel.py
makertv.py
matchtv.py
mdr.py
meta.py
metacafe.py
metacritic.py
mgoon.py
mgtv.py	[mgtv] Fix typo	2016-07-26 23:06:21 +07:00
microsoftvirtualacademy.py
minhateca.py
ministrygrid.py
minoto.py
miomio.py	[miomio] Fix _TESTS	2016-07-11 00:03:24 +08:00
mit.py
mitele.py
mixcloud.py
mlb.py
mnet.py
moevideo.py
mofosex.py
mojvideo.py
moniker.py
morningstar.py
motherless.py
motorsport.py
movieclips.py
moviezine.py
mpora.py
msn.py
mtv.py	[mtv.de] Skip 2 geo-restricted tests	2016-07-26 13:19:47 +08:00
muenchentv.py	[muenchentv] Fix extraction (Closes #10313)	2016-08-13 14:28:44 +07:00
musicplayon.py
mwave.py
myspace.py
myspass.py
myvi.py
myvideo.py
myvidster.py
nationalgeographic.py	[natgeo] fix tests(closes #10229)	2016-08-05 10:13:26 +01:00
naver.py	[naver] extract upload date	2016-08-05 08:12:25 +01:00
nba.py
nbc.py
ndr.py
ndtv.py
nerdcubed.py
neteasemusic.py
netzkino.py
newgrounds.py
newstube.py
nextmedia.py
nfb.py
nfl.py
nhl.py
nick.py	Update _TESTS for MTV sites	2016-07-26 11:10:41 +08:00
niconico.py
ninecninemedia.py
ninegag.py
ninenow.py	[ninenow] correct test url	2016-07-14 14:19:18 +01:00
nintendo.py	[nintendo] Improve playlist extraction (Closes #9986)	2016-07-17 00:01:25 +07:00
noco.py
normalboots.py
nosvideo.py
nova.py
novamov.py
nowness.py
nowtv.py
noz.py
npo.py
npr.py
nrk.py
ntvde.py
ntvru.py	[ntvru] Fix extraction	2016-08-02 22:56:48 +07:00
nuevo.py
nuvid.py
nytimes.py
odatv.py	[odatv] Improve (Closes #9285)	2016-07-20 21:43:22 +07:00
odnoklassniki.py
oktoberfesttv.py
once.py
onet.py	[onet] Enable dash formats	2016-07-24 10:43:05 +07:00
onionstudios.py
ooyala.py
openload.py	[openload] Fix extraction (closes #9706)	2016-08-07 02:44:15 +08:00
ora.py
orf.py	[orf:oe1] Relax _VALID_URL	2016-07-26 23:14:04 +07:00
pandoratv.py
parliamentliveuk.py
patreon.py
pbs.py	[pbs] Clarify comment on http formats	2016-08-13 22:50:18 +07:00
people.py
periscope.py
philharmoniedeparis.py
phoenix.py
photobucket.py
pinkbike.py
pladform.py
played.py
playfm.py
plays.py
playtvak.py
playvid.py	[playvid] Update _TESTS	2016-07-11 15:15:28 +08:00
playwire.py
pluralsight.py
podomatic.py
pokemon.py	[pokemon] improve _VALID_URL	2016-08-06 12:08:14 +01:00
polskieradio.py
porn91.py
pornhd.py
pornhub.py	[pornhub] Make error regex less ambiguous (Closes #10138)	2016-07-22 21:24:09 +07:00
pornotube.py	[pornotube] Fix extraction (Closes #10322)	2016-08-13 20:49:16 +07:00
pornovoisines.py
pornoxo.py
presstv.py
primesharetv.py
promptfile.py
prosiebensat1.py
puls4.py
pyvideo.py
qqmusic.py
r7.py
radiobremen.py
radiocanada.py
radiode.py
radiofrance.py
radiojavan.py
rai.py
rbmaradio.py	[rbmaradio] Improve, simplify and extract all formats (Closes #10242)	2016-08-09 02:46:29 +07:00
rds.py
redtube.py
regiotv.py
restudy.py
reuters.py
reverbnation.py
revision3.py
rice.py
ringtv.py
ro220.py
rockstargames.py
roosterteeth.py	[roosterteeth] Improve (Closes #9864)	2016-07-10 01:30:12 +07:00
rottentomatoes.py
roxwel.py
rozhlas.py	[rozhlas] Fix regexes and improve extraction (Closes #10253)	2016-08-08 04:58:02 +07:00
rtbf.py
rte.py
rtl2.py
rtlnl.py	[rtlnl] Relax _VALID_URL (Closes #10282)	2016-08-10 21:07:43 +07:00
rtp.py
rts.py
rtve.py	[rtve] Fix extraction for some videos	2016-07-29 17:20:27 +02:00
rtvnh.py
rudo.py	[rudo] Add new extractor	2016-07-11 13:19:25 +08:00
ruhd.py
ruleporn.py
rutube.py
rutv.py
ruutu.py
safari.py	[safari] Relax url regexes (Closes #10202)	2016-08-01 21:48:48 +07:00
sandia.py
sapo.py
savefrom.py
sbs.py
scivee.py
screencast.py
screencastomatic.py
screenjunkies.py
screenwavemedia.py
seeker.py
senateisvp.py
sendtonews.py
servingsys.py
sexu.py
shahid.py	[shahid] try to bypass geo restriction and extract more metadata(closes #10062)	2016-07-12 23:15:38 +01:00
shared.py	[shared] Modernize and make more robust	2016-07-27 23:39:02 +07:00
sharesix.py
sina.py
sixplay.py
skynewsarabia.py
skysports.py
slideshare.py
slutload.py
smotri.py	[smotri] Modernize, make more robust and fix tests	2016-07-24 18:38:18 +07:00
snotr.py
sohu.py	[sohu] Update _TESTS (closes #10260)	2016-08-08 18:48:21 +08:00
sonyliv.py	[sonyliv] Improve (Closes #10258)	2016-08-09 02:16:28 +07:00
soundcloud.py	[soundcloud] Add _extract_urls (#10179)	2016-07-28 22:16:05 +07:00
soundgasm.py
southpark.py	Update _TESTS for MTV sites	2016-07-26 11:10:41 +08:00
spankbang.py
spankwire.py
spiegel.py
spiegeltv.py
spike.py	Update _TESTS for MTV sites	2016-07-26 11:10:41 +08:00
sport5.py
sportbox.py
sportdeutschland.py
sportschau.py
srgssr.py
srmediathek.py	[srmediathek] extend _VALID_URL(closes #9373)	2016-07-09 03:22:09 +01:00
ssa.py
stanfordoc.py
steam.py
stitcher.py
streamable.py	[streamable] Fix title extraction and improve (Closes #9122)	2016-07-17 02:01:00 +07:00
streamcloud.py
streamcz.py
streetvoice.py
sunporno.py	[sunporno] Add support for embed URLs	2016-08-13 14:13:49 +07:00
svt.py
swrmediathek.py
syfy.py	[syfy] fix extraction(closes #9087)(closes #3820)(closes #2388)	2016-07-14 23:59:47 +01:00
sztvhu.py
tagesschau.py
tass.py
tdslifeway.py
teachertube.py
teachingchannel.py
teamcoco.py
techtalks.py
ted.py
tele13.py
telebruxelles.py
telecinco.py
telegraaf.py	[telegraaf] Make hls non fatal	2016-07-24 10:29:26 +07:00
telemb.py
teletask.py
telewebion.py
testurl.py
tf1.py
theintercept.py
theplatform.py
thescene.py
thesixtyone.py
thestar.py
thisamericanlife.py
thisav.py
threeqsdn.py	[3qsdn] Restrict src JS regex	2016-07-15 03:36:50 +07:00
thvideo.py
tinypic.py
tlc.py
tmz.py	[tmz] delegate extraction to KalturaIE	2016-07-11 19:08:22 +01:00
tnaflix.py	[tnaflixnetworkbase] Improve title extraction	2016-08-07 16:00:09 +07:00
toggle.py
toutv.py
toypics.py
traileraddict.py
trilulilu.py
trollvids.py
trutube.py
tube8.py
tubitv.py
tudou.py
tumblr.py
tunein.py
turbo.py
tutv.py
tv2.py	[tv2] Improve extraction	2016-07-29 22:01:34 +07:00
tv3.py
tv4.py
tvc.py
tvigle.py
tvland.py	Update _TESTS for MTV sites	2016-07-26 11:10:41 +08:00
tvp.py	[tvp] extract video id from the webpage(fixes #7799)	2016-08-05 09:44:15 +01:00
tvplay.py	[tvplay] Capture and output native error message	2016-08-05 22:50:42 +07:00
tweakers.py
twentyfourvideo.py	[24video] Add support for me and xxx TLDs	2016-08-13 14:47:51 +07:00
twentymin.py
twentytwotracks.py
twitch.py	[twitch:clips] Sort formats	2016-07-29 09:01:53 +07:00
twitter.py
udemy.py
udn.py
unistra.py
uol.py	[uol] remove unused import	2016-08-09 15:13:15 +01:00
urort.py
urplay.py
usatoday.py
ustream.py
ustudio.py
varzesh3.py
vbox7.py	[vbox7] Remove unused imports	2016-08-13 16:45:34 +07:00
veehd.py
veoh.py
vessel.py
vesti.py
vevo.py
vgtv.py
vh1.py
vice.py
vidbit.py
viddler.py
videodetective.py
videofyme.py
videomega.py
videomore.py
videopremium.py
videott.py
vidio.py
vidme.py
vidzi.py	[vidzi] Add support for embed URLs (Closes #10058)	2016-07-11 03:14:39 +07:00
vier.py
viewlift.py
viewster.py
viidea.py
viki.py	[viki] Fix tests (Closes #10098)	2016-07-17 18:13:54 +07:00
vimeo.py	[vimeo] Recognize non-standard embeds (#1638)	2016-07-09 14:38:27 +08:00
vimple.py
vine.py
vk.py	[vk] Improve login	2016-07-13 21:52:52 +07:00
vlive.py
vodlocker.py
vodplatform.py	[vodplatform] Add new extractor	2016-08-04 09:39:06 +01:00
voicerepublic.py
voxmedia.py
vporn.py
vrt.py
vube.py
vuclip.py	[vuclip] Fix extraction	2016-07-11 00:52:25 +08:00
walla.py
washingtonpost.py
wat.py	[wat] improve extraction(#10281)	2016-08-10 14:20:28 +01:00
watchindianporn.py
wdr.py
webofstories.py
weiqitv.py
wimp.py
wistia.py
worldstarhiphop.py
wrzuta.py
wsj.py
xbef.py
xboxclips.py
xfileshare.py
xhamster.py
xiami.py	bug fix for extractor xiami.py	2016-08-14 02:18:59 +08:00
xminus.py
xnxx.py
xstream.py
xtube.py
xuite.py
xvideos.py
xxxymovies.py
yahoo.py
yam.py
yandexmusic.py	[yandexmusic:track] Fix extraction (Closes #10193)	2016-07-31 07:56:18 +07:00
yesjapan.py
yinyuetai.py
ynet.py
youjizz.py	[youjizz] Relax _VALID_URL (Closes #10131)	2016-07-20 22:41:13 +07:00
youku.py
youporn.py
yourupload.py
youtube.py	[youtube] Fix authentication (Closes #10140)	2016-07-22 21:05:39 +07:00
zapiks.py
zdf.py
zingmp3.py
zippcast.py