Merge pull request #5985 from zx8/master

[safari] make url regex more lenient
This commit is contained in:
Sergey M. 2015-06-15 20:31:47 +05:00
commit 636a9637f4
1 changed files with 2 additions and 2 deletions

View File

@ -83,7 +83,7 @@ class SafariIE(SafariBaseIE):
library/view/[^/]+| library/view/[^/]+|
api/v1/book api/v1/book
)/ )/
(?P<course_id>\d+)/ (?P<course_id>[^/]+)/
(?:chapter(?:-content)?/)? (?:chapter(?:-content)?/)?
(?P<part>part\d+)\.html (?P<part>part\d+)\.html
''' '''
@ -122,7 +122,7 @@ class SafariCourseIE(SafariBaseIE):
IE_NAME = 'safari:course' IE_NAME = 'safari:course'
IE_DESC = 'safaribooksonline.com online courses' IE_DESC = 'safaribooksonline.com online courses'
_VALID_URL = r'https?://(?:www\.)?safaribooksonline\.com/(?:library/view/[^/]+|api/v1/book)/(?P<id>\d+)/?(?:[#?]|$)' _VALID_URL = r'https?://(?:www\.)?safaribooksonline\.com/(?:library/view/[^/]+|api/v1/book)/(?P<id>[^/]+)/?(?:[#?]|$)'
_TESTS = [{ _TESTS = [{
'url': 'https://www.safaribooksonline.com/library/view/hadoop-fundamentals-livelessons/9780133392838/', 'url': 'https://www.safaribooksonline.com/library/view/hadoop-fundamentals-livelessons/9780133392838/',