浏览代码

[pluralsight] Improve authentication (closes #17762)

Sergey M․ 7 年之前
父节点
当前提交
21c1a00dd7
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      youtube_dl/extractor/pluralsight.py

+ 5 - 1
youtube_dl/extractor/pluralsight.py

@@ -4,6 +4,7 @@ import collections
 import json
 import os
 import random
+import re
 
 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 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(