debian/copyright: use spaces rather than tabs to start continuation lines.

[youtubedl] / youtube_dl / extractor / porncom.py

diff --git a/youtube_dl/extractor/porncom.py b/youtube_dl/extractor/porncom.py
index 60ade06da37d2bd2a56e717f9761f525cb4b7436..5726cab3ae6763d7466d013898f71925966bed6d 100644 (file)
--- a/youtube_dl/extractor/porncom.py
+++ b/youtube_dl/extractor/porncom.py
@@ -43,7 +43,8 @@ class PornComIE(InfoExtractor):
 
         config = self._parse_json(
             self._search_regex(
 
         config = self._parse_json(
             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='{}'),
             display_id, transform_source=js_to_json, fatal=False)
 
                 webpage, 'config', default='{}'),
             display_id, transform_source=js_to_json, fatal=False)
 


@@ -69,7 +70,7 @@ class PornComIE(InfoExtractor):
                 'height': int(height),
                 'filesize_approx': parse_filesize(filesize),
             } for format_url, height, filesize in re.findall(
                 'height': int(height),
                 'filesize_approx': parse_filesize(filesize),
             } 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)]
             thumbnail = None
             duration = None
                 webpage)]
             thumbnail = None
             duration = None