projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start moving to ytdl-org
[youtube-dl]
/
youtube_dl
/
extractor
/
pluralsight.py
diff --git
a/youtube_dl/extractor/pluralsight.py
b/youtube_dl/extractor/pluralsight.py
index daf1725702a3fe3002c35d8490226b6ad533a11b..abd08bc285c3c107bd548ddf0ec1c86fe77ecd9a 100644
(file)
--- a/
youtube_dl/extractor/pluralsight.py
+++ b/
youtube_dl/extractor/pluralsight.py
@@
-4,6
+4,7
@@
import collections
import json
import os
import random
import json
import os
import random
+import re
from .common import InfoExtractor
from ..compat import (
from .common import InfoExtractor
from ..compat import (
@@
-196,7
+197,10
@@
query viewClip {
if error:
raise ExtractorError('Unable to login: %s' % error, expected=True)
if error:
raise ExtractorError('Unable to login: %s' % error, expected=True)
- if all(p not in response for p in ('__INITIAL_STATE__', '"currentUser"')):
+ if all(not re.search(p, response) for p in (
+ r'__INITIAL_STATE__', r'["\']currentUser["\']',
+ # new layout?
+ r'>\s*Sign out\s*<')):
BLOCKED = 'Your account has been blocked due to suspicious activity'
if BLOCKED in response:
raise ExtractorError(
BLOCKED = 'Your account has been blocked due to suspicious activity'
if BLOCKED in response:
raise ExtractorError(
@@
-323,7
+327,7
@@
query viewClip {
)
# Some courses also offer widescreen resolution for high quality (see
)
# Some courses also offer widescreen resolution for high quality (see
- # https://github.com/
rg3
/youtube-dl/issues/7766)
+ # https://github.com/
ytdl-org
/youtube-dl/issues/7766)
widescreen = course.get('supportsWideScreenVideoFormats') is True
best_quality = 'high-widescreen' if widescreen else 'high'
if widescreen:
widescreen = course.get('supportsWideScreenVideoFormats') is True
best_quality = 'high-widescreen' if widescreen else 'high'
if widescreen:
@@
-384,8
+388,8
@@
query viewClip {
# Pluralsight tracks multiple sequential calls to ViewClip API and start
# to return 429 HTTP errors after some time (see
# Pluralsight tracks multiple sequential calls to ViewClip API and start
# to return 429 HTTP errors after some time (see
- # https://github.com/
rg3
/youtube-dl/pull/6989). Moreover it may even lead
- # to account ban (see https://github.com/
rg3
/youtube-dl/issues/6842).
+ # https://github.com/
ytdl-org
/youtube-dl/pull/6989). Moreover it may even lead
+ # to account ban (see https://github.com/
ytdl-org
/youtube-dl/issues/6842).
# To somewhat reduce the probability of these consequences
# we will sleep random amount of time before each call to ViewClip.
self._sleep(
# To somewhat reduce the probability of these consequences
# we will sleep random amount of time before each call to ViewClip.
self._sleep(