projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7f0bdc7
)
[inc] Improve (closes #11647)
author
Sergey M․
<dstftw@gmail.com>
Mon, 9 Jan 2017 16:08:59 +0000
(23:08 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Mon, 9 Jan 2017 16:08:59 +0000
(23:08 +0700)
youtube_dl/extractor/inc.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/inc.py
b/youtube_dl/extractor/inc.py
index 279e53c154ee5c626710dcc9b2f3f11b7762dbd7..241ec83c4e9ebddc523b961db84fda04199755b6 100644
(file)
--- a/
youtube_dl/extractor/inc.py
+++ b/
youtube_dl/extractor/inc.py
@@
-1,10
+1,11
@@
from __future__ import unicode_literals
from .common import InfoExtractor
from __future__ import unicode_literals
from .common import InfoExtractor
+from .kaltura import KalturaIE
class IncIE(InfoExtractor):
class IncIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?inc\.com
(?:/[\w-]+)+/(?P<id>[\w-]+)(?:\.html)?
'
+ _VALID_URL = r'https?://(?:www\.)?inc\.com
/(?:[^/]+/)+(?P<id>[^.]+).html
'
_TESTS = [{
'url': 'http://www.inc.com/tip-sheet/bill-gates-says-these-5-books-will-make-you-smarter.html',
'md5': '7416739c9c16438c09fa35619d6ba5cb',
_TESTS = [{
'url': 'http://www.inc.com/tip-sheet/bill-gates-says-these-5-books-will-make-you-smarter.html',
'md5': '7416739c9c16438c09fa35619d6ba5cb',
@@
-17,6
+18,9
@@
class IncIE(InfoExtractor):
'upload_date': '20160920',
'uploader_id': 'video@inc.com',
},
'upload_date': '20160920',
'uploader_id': 'video@inc.com',
},
+ 'params': {
+ 'skip_download': True,
+ },
}, {
'url': 'http://www.inc.com/video/david-whitford/founders-forum-tripadvisor-steve-kaufer-most-enjoyable-moment-for-entrepreneur.html',
'only_matching': True,
}, {
'url': 'http://www.inc.com/video/david-whitford/founders-forum-tripadvisor-steve-kaufer-most-enjoyable-moment-for-entrepreneur.html',
'only_matching': True,
@@
-27,14
+31,11
@@
class IncIE(InfoExtractor):
webpage = self._download_webpage(url, display_id)
partner_id = self._search_regex(
webpage = self._download_webpage(url, display_id)
partner_id = self._search_regex(
- r'var\s+_bizo_data_partner_id\s*=\s*"(\d+)";',
- webpage,
- 'partner id')
+ r'var\s+_?bizo_data_partner_id\s*=\s*["\'](\d+)', webpage, 'partner id')
kaltura_id = self._parse_json(self._search_regex(
kaltura_id = self._parse_json(self._search_regex(
- r'pageInfo\.videos\s*=\s*\[(.+)\];',
- webpage,
- 'kaltura id'),
+ r'pageInfo\.videos\s*=\s*\[(.+)\];', webpage, 'kaltura id'),
display_id)['vid_kaltura_id']
display_id)['vid_kaltura_id']
- return self.url_result('kaltura:%s:%s' % (partner_id, kaltura_id), 'Kaltura')
+ return self.url_result(
+ 'kaltura:%s:%s' % (partner_id, kaltura_id), KalturaIE.ie_key())