New upstream version 2017.10.15.1

[youtubedl] / youtube_dl / extractor / collegerama.py

diff --git a/youtube_dl/extractor/collegerama.py b/youtube_dl/extractor/collegerama.py
index 40667a0f12621c72732d51f24eb733365b403bd4..6a41db87cb57f127b2b79470a95bac1c32743fc3 100644 (file)
--- a/youtube_dl/extractor/collegerama.py
+++ b/youtube_dl/extractor/collegerama.py
@@ -21,7 +21,7 @@ class CollegeRamaIE(InfoExtractor):
                 'ext': 'mp4',
                 'title': 'Een nieuwe wereld: waarden, bewustzijn en techniek van de mensheid 2.0.',
                 'description': '',
                 'ext': 'mp4',
                 'title': 'Een nieuwe wereld: waarden, bewustzijn en techniek van de mensheid 2.0.',
                 'description': '',

-                'thumbnail': 're:^https?://.*\.jpg$',
+                'thumbnail': r're:^https?://.*\.jpg(?:\?.*?)?$',

                 'duration': 7713.088,
                 'timestamp': 1413309600,
                 'upload_date': '20141014',
                 'duration': 7713.088,
                 'timestamp': 1413309600,
                 'upload_date': '20141014',


@@ -35,6 +35,7 @@ class CollegeRamaIE(InfoExtractor):
                 'ext': 'wmv',
                 'title': '64ste Vakantiecursus: Afvalwater',
                 'description': 'md5:7fd774865cc69d972f542b157c328305',
                 'ext': 'wmv',
                 'title': '64ste Vakantiecursus: Afvalwater',
                 'description': 'md5:7fd774865cc69d972f542b157c328305',

+                'thumbnail': r're:^https?://.*\.jpg(?:\?.*?)?$',

                 'duration': 10853,
                 'timestamp': 1326446400,
                 'upload_date': '20120113',
                 'duration': 10853,
                 'timestamp': 1326446400,
                 'upload_date': '20120113',


@@ -46,9 +47,9 @@ class CollegeRamaIE(InfoExtractor):
         video_id = self._match_id(url)
 
         player_options_request = {
         video_id = self._match_id(url)
 
         player_options_request = {

-            "getPlayerOptionsRequest": {
-                "ResourceId": video_id,
-                "QueryString": "",
+            'getPlayerOptionsRequest': {
+                'ResourceId': video_id,
+                'QueryString': '',

             }
         }
 
             }
         }