From 47dd2e9e5e8bddd4f470a1fb635e3c95c3ccc26b Mon Sep 17 00:00:00 2001 From: Joel Leclerc Date: Thu, 20 Nov 2014 14:45:35 -0700 Subject: [PATCH] Some fixes --- youtube-dl | Bin 591259 -> 591265 bytes youtube_dl/extractor/soulanime.py | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube-dl b/youtube-dl index 4c5e5b22b575f8dfe0b439375f837621fe1e5aa9..1ac30b5d95dc690224720f4cf2dc52a70fb260fe 100755 GIT binary patch delta 6437 zcmY*d30RH!_xJAay;9U|+!9L4GAaFrM3VF`a<7pVWSPn^k~YTHq_UKy29f#>k*twv zT1>sjQluub*AUvK(n703Mg70`J$HW3|KIc6=Q-zd&iR~kzWZBZ%-GX0V`JT^EmC>r zl4xsc?lbw7I_s)QqEPsg6(I@(Yx{?)gshMSvuf!`uyB1f!Akd7x2!9E6YQh$Jo7(zsGpQel67UP@AuNGD?F+#ImP3$^fc4Ylb&zs-vP+zE!{aU@a3a!yyU-%jd6a?c$kEMMVLB$*G+0ei^?kd{P~VUXy>0dfLh zR4jQFuv>AYdP%)SWS~0YIC&bZeJ9Dm(2V3PxdN=d=gAo$olhbE1Aebk$*bTOpFx@d zR&a%+p}q$KSp!≦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 delta 6459 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 diff --git a/youtube_dl/extractor/soulanime.py b/youtube_dl/extractor/soulanime.py index 27cfccd7e..72dbcdd68 100644 --- a/youtube_dl/extractor/soulanime.py +++ b/youtube_dl/extractor/soulanime.py @@ -10,7 +10,7 @@ from ..utils import ( class SoulAnimeBaseIE(InfoExtractor): - _VID_VALID_URL = r'http://[w.]*soul-anime\.net/watching/(?P[^/]+)' + _VID_VALID_URL = r'http://[w.]*soul-anime\.net/watch[^/]*/(?P[^/]+)' _VIDEO_URL_REGEX = r'