]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[syfy,bravotv] restrict drupal settings regex
authorRemita Amine <remitamine@gmail.com>
Tue, 23 Aug 2016 16:31:08 +0000 (17:31 +0100)
committerRemita Amine <remitamine@gmail.com>
Tue, 23 Aug 2016 16:31:35 +0000 (17:31 +0100)
youtube_dl/extractor/bravotv.py
youtube_dl/extractor/syfy.py

index 31763b4c651852a9ac060b8a548355909728ce26..a25d500e478b90c983cd676249fdf6bc676c68fa 100644 (file)
@@ -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 = {
index cc81f60036794da7ba9f0f3f584e632aefb557ee..ab8bab5cd42e6d11b3396ab57c7c8a7e3c9a0a72 100644 (file)
@@ -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']