mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-23 09:17:48 +00:00
[pluralsight] Do not rely on argument order in query (Closes #7583)
This commit is contained in:
parent
6da620de58
commit
71bd93b89c
1 changed files with 15 additions and 9 deletions
|
@ -1,6 +1,5 @@
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import re
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
|
@ -19,11 +18,11 @@ from ..utils import (
|
||||||
|
|
||||||
class PluralsightIE(InfoExtractor):
|
class PluralsightIE(InfoExtractor):
|
||||||
IE_NAME = 'pluralsight'
|
IE_NAME = 'pluralsight'
|
||||||
_VALID_URL = r'https?://(?:www\.)?pluralsight\.com/training/player\?author=(?P<author>[^&]+)&name=(?P<name>[^&]+)(?:&mode=live)?&clip=(?P<clip>\d+)&course=(?P<course>[^&]+)'
|
_VALID_URL = r'https?://(?:(?:www|app)\.)?pluralsight\.com/training/player\?'
|
||||||
_LOGIN_URL = 'https://www.pluralsight.com/id/'
|
_LOGIN_URL = 'https://www.pluralsight.com/id/'
|
||||||
_NETRC_MACHINE = 'pluralsight'
|
_NETRC_MACHINE = 'pluralsight'
|
||||||
|
|
||||||
_TEST = {
|
_TESTS = [{
|
||||||
'url': 'http://www.pluralsight.com/training/player?author=mike-mckeown&name=hosting-sql-server-windows-azure-iaas-m7-mgmt&mode=live&clip=3&course=hosting-sql-server-windows-azure-iaas',
|
'url': 'http://www.pluralsight.com/training/player?author=mike-mckeown&name=hosting-sql-server-windows-azure-iaas-m7-mgmt&mode=live&clip=3&course=hosting-sql-server-windows-azure-iaas',
|
||||||
'md5': '4d458cf5cf4c593788672419a8dd4cf8',
|
'md5': '4d458cf5cf4c593788672419a8dd4cf8',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
|
@ -33,7 +32,10 @@ class PluralsightIE(InfoExtractor):
|
||||||
'duration': 338,
|
'duration': 338,
|
||||||
},
|
},
|
||||||
'skip': 'Requires pluralsight account credentials',
|
'skip': 'Requires pluralsight account credentials',
|
||||||
}
|
}, {
|
||||||
|
'url': 'https://app.pluralsight.com/training/player?course=angularjs-get-started&author=scott-allen&name=angularjs-get-started-m1-introduction&clip=0&mode=live',
|
||||||
|
'only_matching': True,
|
||||||
|
}]
|
||||||
|
|
||||||
def _real_initialize(self):
|
def _real_initialize(self):
|
||||||
self._login()
|
self._login()
|
||||||
|
@ -74,11 +76,15 @@ class PluralsightIE(InfoExtractor):
|
||||||
raise ExtractorError('Unable to login: %s' % error, expected=True)
|
raise ExtractorError('Unable to login: %s' % error, expected=True)
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
qs = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query)
|
||||||
author = mobj.group('author')
|
|
||||||
name = mobj.group('name')
|
author = qs.get('author', [None])[0]
|
||||||
clip_id = mobj.group('clip')
|
name = qs.get('name', [None])[0]
|
||||||
course = mobj.group('course')
|
clip_id = qs.get('clip', [None])[0]
|
||||||
|
course = qs.get('course', [None])[0]
|
||||||
|
|
||||||
|
if any(not f for f in (author, name, clip_id, course,)):
|
||||||
|
raise ExtractorError('Invalid URL', expected=True)
|
||||||
|
|
||||||
display_id = '%s-%s' % (name, clip_id)
|
display_id = '%s-%s' % (name, clip_id)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue