|
@@ -94,7 +94,15 @@ class LyndaBaseIE(InfoExtractor):
|
|
class LyndaIE(LyndaBaseIE):
|
|
class LyndaIE(LyndaBaseIE):
|
|
IE_NAME = 'lynda'
|
|
IE_NAME = 'lynda'
|
|
IE_DESC = 'lynda.com videos'
|
|
IE_DESC = 'lynda.com videos'
|
|
- _VALID_URL = r'https?://(?:www\.)?(?:lynda\.com|educourse\.ga)/(?:[^/]+/[^/]+/(?P<course_id>\d+)|player/embed)/(?P<id>\d+)'
|
|
|
|
|
|
+ _VALID_URL = r'''(?x)
|
|
|
|
+ https?://
|
|
|
|
+ (?:www\.)?(?:lynda\.com|educourse\.ga)/
|
|
|
|
+ (?:
|
|
|
|
+ (?:[^/]+/){2,3}(?P<course_id>\d+)|
|
|
|
|
+ player/embed
|
|
|
|
+ )/
|
|
|
|
+ (?P<id>\d+)
|
|
|
|
+ '''
|
|
|
|
|
|
_TIMECODE_REGEX = r'\[(?P<timecode>\d+:\d+:\d+[\.,]\d+)\]'
|
|
_TIMECODE_REGEX = r'\[(?P<timecode>\d+:\d+:\d+[\.,]\d+)\]'
|
|
|
|
|
|
@@ -113,6 +121,9 @@ class LyndaIE(LyndaBaseIE):
|
|
}, {
|
|
}, {
|
|
'url': 'https://educourse.ga/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html',
|
|
'url': 'https://educourse.ga/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html',
|
|
'only_matching': True,
|
|
'only_matching': True,
|
|
|
|
+ }, {
|
|
|
|
+ 'url': 'https://www.lynda.com/de/Graphic-Design-tutorials/Willkommen-Grundlagen-guten-Gestaltung/393570/393572-4.html',
|
|
|
|
+ 'only_matching': True,
|
|
}]
|
|
}]
|
|
|
|
|
|
def _raise_unavailable(self, video_id):
|
|
def _raise_unavailable(self, video_id):
|
|
@@ -257,7 +268,15 @@ class LyndaCourseIE(LyndaBaseIE):
|
|
|
|
|
|
# Course link equals to welcome/introduction video link of same course
|
|
# Course link equals to welcome/introduction video link of same course
|
|
# We will recognize it as course link
|
|
# We will recognize it as course link
|
|
- _VALID_URL = r'https?://(?:www|m)\.(?:lynda\.com|educourse\.ga)/(?P<coursepath>[^/]+/[^/]+/(?P<courseid>\d+))-\d\.html'
|
|
|
|
|
|
+ _VALID_URL = r'https?://(?:www|m)\.(?:lynda\.com|educourse\.ga)/(?P<coursepath>(?:[^/]+/){2,3}(?P<courseid>\d+))-2\.html'
|
|
|
|
+
|
|
|
|
+ _TESTS = [{
|
|
|
|
+ 'url': 'https://www.lynda.com/Graphic-Design-tutorials/Grundlagen-guten-Gestaltung/393570-2.html',
|
|
|
|
+ 'only_matching': True,
|
|
|
|
+ }, {
|
|
|
|
+ 'url': 'https://www.lynda.com/de/Graphic-Design-tutorials/Grundlagen-guten-Gestaltung/393570-2.html',
|
|
|
|
+ 'only_matching': True,
|
|
|
|
+ }]
|
|
|
|
|
|
def _real_extract(self, url):
|
|
def _real_extract(self, url):
|
|
mobj = re.match(self._VALID_URL, url)
|
|
mobj = re.match(self._VALID_URL, url)
|