projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youku] compare bytes and str for compatible; use compat_urllib_parse for making...
[youtube-dl]
/
youtube_dl
/
extractor
/
comcarcoff.py
diff --git
a/youtube_dl/extractor/comcarcoff.py
b/youtube_dl/extractor/comcarcoff.py
index 46953c12eddf1be35088112382941961bf1d9582..9c25b2223184ad1258b399b154aa821954581350 100644
(file)
--- a/
youtube_dl/extractor/comcarcoff.py
+++ b/
youtube_dl/extractor/comcarcoff.py
@@
-1,4
+1,6
@@
# encoding: utf-8
# encoding: utf-8
+from __future__ import unicode_literals
+
import json
from .common import InfoExtractor
import json
from .common import InfoExtractor
@@
-6,7
+8,7
@@
from ..utils import parse_iso8601
class ComCarCoffIE(InfoExtractor):
class ComCarCoffIE(InfoExtractor):
- _VALID_URL = r'http
s?://(?:www\.)?comediansincarsgettingcoffee\.com/(?P<id>[a-z0-9\-]+)/?
'
+ _VALID_URL = r'http
://(?:www\.)?comediansincarsgettingcoffee\.com/(?P<id>[a-z0-9\-]*)
'
_TESTS = [{
'url': 'http://comediansincarsgettingcoffee.com/miranda-sings-happy-thanksgiving-miranda/',
'info_dict': {
_TESTS = [{
'url': 'http://comediansincarsgettingcoffee.com/miranda-sings-happy-thanksgiving-miranda/',
'info_dict': {
@@
-25,6
+27,8
@@
class ComCarCoffIE(InfoExtractor):
def _real_extract(self, url):
display_id = self._match_id(url)
def _real_extract(self, url):
display_id = self._match_id(url)
+ if not display_id:
+ display_id = 'comediansincarsgettingcoffee.com'
webpage = self._download_webpage(url, display_id)
full_data = json.loads(self._search_regex(
webpage = self._download_webpage(url, display_id)
full_data = json.loads(self._search_regex(
@@
-49,4
+53,5
@@
class ComCarCoffIE(InfoExtractor):
'timestamp': parse_iso8601(video_data.get('pubDate')),
'thumbnails': thumbnails,
'formats': formats,
'timestamp': parse_iso8601(video_data.get('pubDate')),
'thumbnails': thumbnails,
'formats': formats,
+ 'webpage_url': 'http://comediansincarsgettingcoffee.com/%s' % (video_data.get('urlSlug', video_data.get('slug'))),
}
}