projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unnecessary assignment parenthesis
[youtube-dl]
/
youtube_dl
/
extractor
/
pluralsight.py
diff --git
a/youtube_dl/extractor/pluralsight.py
b/youtube_dl/extractor/pluralsight.py
index aacc5d4bb8a8c139b354be7f724612c308bfc6c5..a207ca9cb93a3c839bf9304267d6a5b10d426b5e 100644
(file)
--- a/
youtube_dl/extractor/pluralsight.py
+++ b/
youtube_dl/extractor/pluralsight.py
@@
-94,7
+94,7
@@
class PluralsightIE(PluralsightBaseIE):
self._login()
def _login(self):
self._login()
def _login(self):
-
(username, password)
= self._get_login_info()
+
username, password
= self._get_login_info()
if username is None:
return
if username is None:
return
@@
-140,10
+140,10
@@
class PluralsightIE(PluralsightBaseIE):
raise ExtractorError('Unable to log in')
raise ExtractorError('Unable to log in')
- def _get_subtitles(self, author, clip_id, lang, name, duration, video_id):
+ def _get_subtitles(self, author, clip_id
x
, lang, name, duration, video_id):
captions_post = {
'a': author,
captions_post = {
'a': author,
- 'cn': clip_id,
+ 'cn': clip_id
x
,
'lc': lang,
'm': name,
}
'lc': lang,
'm': name,
}
@@
-195,13
+195,13
@@
class PluralsightIE(PluralsightBaseIE):
author = qs.get('author', [None])[0]
name = qs.get('name', [None])[0]
author = qs.get('author', [None])[0]
name = qs.get('name', [None])[0]
- clip_id = qs.get('clip', [None])[0]
+ clip_id
x
= qs.get('clip', [None])[0]
course_name = qs.get('course', [None])[0]
course_name = qs.get('course', [None])[0]
- if any(not f for f in (author, name, clip_id, course_name,)):
+ if any(not f for f in (author, name, clip_id
x
, course_name,)):
raise ExtractorError('Invalid URL', expected=True)
raise ExtractorError('Invalid URL', expected=True)
- display_id = '%s-%s' % (name, clip_id)
+ display_id = '%s-%s' % (name, clip_id
x
)
course = self._download_course(course_name, url, display_id)
course = self._download_course(course_name, url, display_id)
@@
-217,7
+217,7
@@
class PluralsightIE(PluralsightBaseIE):
clip_index = clip_.get('index')
if clip_index is None:
continue
clip_index = clip_.get('index')
if clip_index is None:
continue
- if compat_str(clip_index) == clip_id:
+ if compat_str(clip_index) == clip_id
x
:
clip = clip_
break
clip = clip_
break
@@
-225,6
+225,7
@@
class PluralsightIE(PluralsightBaseIE):
raise ExtractorError('Unable to resolve clip')
title = clip['title']
raise ExtractorError('Unable to resolve clip')
title = clip['title']
+ clip_id = clip.get('clipName') or clip.get('name') or clip['clipId']
QUALITIES = {
'low': {'width': 640, 'height': 480},
QUALITIES = {
'low': {'width': 640, 'height': 480},
@@
-277,7
+278,7
@@
class PluralsightIE(PluralsightBaseIE):
clip_post = {
'author': author,
'includeCaptions': False,
clip_post = {
'author': author,
'includeCaptions': False,
- 'clipIndex': int(clip_id),
+ 'clipIndex': int(clip_id
x
),
'courseName': course_name,
'locale': 'en',
'moduleName': name,
'courseName': course_name,
'locale': 'en',
'moduleName': name,
@@
-330,10
+331,10
@@
class PluralsightIE(PluralsightBaseIE):
# TODO: other languages?
subtitles = self.extract_subtitles(
# TODO: other languages?
subtitles = self.extract_subtitles(
- author, clip_id, 'en', name, duration, display_id)
+ author, clip_id
x
, 'en', name, duration, display_id)
return {
return {
- 'id': clip
.get('clipName') or clip['name']
,
+ 'id': clip
_id
,
'title': title,
'duration': duration,
'creator': author,
'title': title,
'duration': duration,
'creator': author,