Browse Source

[porncom] Fix extraction (closes #16808)

Sergey M․ 7 years ago
parent
commit
c3bcd206eb
1 changed files with 3 additions and 2 deletions
  1. 3 2
      youtube_dl/extractor/porncom.py

+ 3 - 2
youtube_dl/extractor/porncom.py

@@ -43,7 +43,8 @@ class PornComIE(InfoExtractor):
 
 
         config = self._parse_json(
         config = self._parse_json(
             self._search_regex(
             self._search_regex(
-                r'=\s*({.+?})\s*,\s*[\da-zA-Z_]+\s*=',
+                (r'=\s*({.+?})\s*;\s*v1ar\b',
+                 r'=\s*({.+?})\s*,\s*[\da-zA-Z_]+\s*='),
                 webpage, 'config', default='{}'),
                 webpage, 'config', default='{}'),
             display_id, transform_source=js_to_json, fatal=False)
             display_id, transform_source=js_to_json, fatal=False)
 
 
@@ -69,7 +70,7 @@ class PornComIE(InfoExtractor):
                 'height': int(height),
                 'height': int(height),
                 'filesize_approx': parse_filesize(filesize),
                 'filesize_approx': parse_filesize(filesize),
             } for format_url, height, filesize in re.findall(
             } for format_url, height, filesize in re.findall(
-                r'<a[^>]+href="(/download/[^"]+)">MPEG4 (\d+)p<span[^>]*>(\d+\s+[a-zA-Z]+)<',
+                r'<a[^>]+href="(/download/[^"]+)">[^<]*?(\d+)p<span[^>]*>(\d+\s*[a-zA-Z]+)<',
                 webpage)]
                 webpage)]
             thumbnail = None
             thumbnail = None
             duration = None
             duration = None