From: Remita Amine <remitamine@gmail.com>
Date: Tue, 23 Aug 2016 16:31:08 +0000 (+0100)
Subject: [syfy,bravotv] restrict drupal settings regex
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=ccb6570e9e625ff5e9adf88729e745acadcaff0e;p=youtube-dl

[syfy,bravotv] restrict drupal settings regex
---

diff --git a/youtube_dl/extractor/bravotv.py b/youtube_dl/extractor/bravotv.py
index 31763b4c6..a25d500e4 100644
--- a/youtube_dl/extractor/bravotv.py
+++ b/youtube_dl/extractor/bravotv.py
@@ -32,7 +32,7 @@ class BravoTVIE(AdobePassIE):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
         settings = self._parse_json(self._search_regex(
-            r'jQuery\.extend\([^,]+,\s*({.+})\);', webpage, 'drupal settings'),
+            r'jQuery\.extend\(Drupal\.settings\s*,\s*({.+?})\);', webpage, 'drupal settings'),
             display_id)
         info = {}
         query = {
diff --git a/youtube_dl/extractor/syfy.py b/youtube_dl/extractor/syfy.py
index cc81f6003..ab8bab5cd 100644
--- a/youtube_dl/extractor/syfy.py
+++ b/youtube_dl/extractor/syfy.py
@@ -31,7 +31,7 @@ class SyfyIE(AdobePassIE):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
         syfy_mpx = list(self._parse_json(self._search_regex(
-            r'jQuery\.extend\([^,]+,\s*({.+})\);', webpage, 'drupal settings'),
+            r'jQuery\.extend\(Drupal\.settings\s*,\s*({.+?})\);', webpage, 'drupal settings'),
             display_id)['syfy']['syfy_mpx'].values())[0]
         video_id = syfy_mpx['mpxGUID']
         title = syfy_mpx['episodeTitle']