Start new release.

[youtubedl] / youtube_dl / extractor / kickstarter.py

diff --git a/youtube_dl/extractor/kickstarter.py b/youtube_dl/extractor/kickstarter.py
index 1d391e69ff7e0aba1b78ae5e32792b2dca839943..d4da8f48462f61358c649537cb1a41d47d9e82b1 100644 (file)
--- a/youtube_dl/extractor/kickstarter.py
+++ b/youtube_dl/extractor/kickstarter.py
@@ -1,13 +1,14 @@
-# encoding: utf-8
+# coding: utf-8

 from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from __future__ import unicode_literals
 
 from .common import InfoExtractor

+from ..utils import smuggle_url

 
 
 class KickStarterIE(InfoExtractor):
 
 
 class KickStarterIE(InfoExtractor):

-    _VALID_URL = r'https?://www\.kickstarter\.com/projects/(?P<id>[^/]*)/.*'
+    _VALID_URL = r'https?://(?:www\.)?kickstarter\.com/projects/(?P<id>[^/]*)/.*'

     _TESTS = [{
     _TESTS = [{

-        'url': 'https://www.kickstarter.com/projects/1404461844/intersection-the-story-of-josh-grant?ref=home_location',
+        'url': 'https://www.kickstarter.com/projects/1404461844/intersection-the-story-of-josh-grant/description',

         'md5': 'c81addca81327ffa66c642b5d8b08cab',
         'info_dict': {
             'id': '1404461844',
         'md5': 'c81addca81327ffa66c642b5d8b08cab',
         'info_dict': {
             'id': '1404461844',


@@ -27,7 +28,8 @@ class KickStarterIE(InfoExtractor):
             'uploader_id': 'pebble',
             'uploader': 'Pebble Technology',
             'title': 'Pebble iOS Notifications',
             'uploader_id': 'pebble',
             'uploader': 'Pebble Technology',
             'title': 'Pebble iOS Notifications',

-        }
+        },
+        'add_ie': ['Vimeo'],

     }, {
         'url': 'https://www.kickstarter.com/projects/1420158244/power-drive-2000/widget/video.html',
         'info_dict': {
     }, {
         'url': 'https://www.kickstarter.com/projects/1420158244/power-drive-2000/widget/video.html',
         'info_dict': {


@@ -35,7 +37,6 @@ class KickStarterIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Power Drive 2000',
         },
             'ext': 'mp4',
             'title': 'Power Drive 2000',
         },

-        'expected_warnings': ['OpenGraph description'],

     }]
 
     def _real_extract(self, url):
     }]
 
     def _real_extract(self, url):


@@ -43,7 +44,7 @@ class KickStarterIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         title = self._html_search_regex(
         webpage = self._download_webpage(url, video_id)
 
         title = self._html_search_regex(

-            r'<title>\s*(.*?)(?:\s*&mdash; Kickstarter)?\s*</title>',
+            r'<title>\s*(.*?)(?:\s*&mdash;\s*Kickstarter)?\s*</title>',

             webpage, 'title')
         video_url = self._search_regex(
             r'data-video-url="(.*?)"',
             webpage, 'title')
         video_url = self._search_regex(
             r'data-video-url="(.*?)"',


@@ -52,7 +53,7 @@ class KickStarterIE(InfoExtractor):
             return {
                 '_type': 'url_transparent',
                 'ie_key': 'Generic',
             return {
                 '_type': 'url_transparent',
                 'ie_key': 'Generic',

-                'url': url,
+                'url': smuggle_url(url, {'to_generic': True}),

                 'title': title,
             }
 
                 'title': title,
             }
 


@@ -65,6 +66,6 @@ class KickStarterIE(InfoExtractor):
             'id': video_id,
             'url': video_url,
             'title': title,
             'id': video_id,
             'url': video_url,
             'title': title,

-            'description': self._og_search_description(webpage),
+            'description': self._og_search_description(webpage, default=None),

             'thumbnail': thumbnail,
         }
             'thumbnail': thumbnail,
         }