From: Sergey M. <dstftw@gmail.com>
Date: Mon, 15 Jun 2015 15:31:47 +0000 (+0500)
Subject: Merge pull request #5985 from zx8/master
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=636a9637f4cc4f40b10a9db3be4ff6fc7e5b38f5;hp=99e6833c85868b78df7c810603ffdccdaeb4eaf0;p=youtube-dl

Merge pull request #5985 from zx8/master

[safari] make url regex more lenient
---

diff --git a/youtube_dl/extractor/safari.py b/youtube_dl/extractor/safari.py
index 10251f29e..20ba6fa33 100644
--- a/youtube_dl/extractor/safari.py
+++ b/youtube_dl/extractor/safari.py
@@ -83,7 +83,7 @@ class SafariIE(SafariBaseIE):
                                     library/view/[^/]+|
                                     api/v1/book
                                 )/
-                                (?P<course_id>\d+)/
+                                (?P<course_id>[^/]+)/
                                     (?:chapter(?:-content)?/)?
                                 (?P<part>part\d+)\.html
     '''
@@ -122,7 +122,7 @@ class SafariCourseIE(SafariBaseIE):
     IE_NAME = 'safari:course'
     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 = [{
         'url': 'https://www.safaribooksonline.com/library/view/hadoop-fundamentals-livelessons/9780133392838/',