projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'dstftw/correct-valid-urls'
[youtube-dl]
/
youtube_dl
/
extractor
/
comedycentral.py
diff --git
a/youtube_dl/extractor/comedycentral.py
b/youtube_dl/extractor/comedycentral.py
index caea446eab42d7484c62f2b08e50f54e27e8849c..a54ce3ee7c44727a9e56b1ab8359bd099b48bb35 100644
(file)
--- a/
youtube_dl/extractor/comedycentral.py
+++ b/
youtube_dl/extractor/comedycentral.py
@@
-1,7
+1,7
@@
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from .mtv import MTV
IE, _media_xml_tag
+from .mtv import MTV
ServicesInfoExtractor
from ..utils import (
compat_str,
compat_urllib_parse,
from ..utils import (
compat_str,
compat_urllib_parse,
@@
-11,8
+11,8
@@
from ..utils import (
)
)
-class ComedyCentralIE(MTV
IE
):
- _VALID_URL = r'https?://(?:www
\.)?comedycentral\
.com/(video-clips|episodes|cc-studios)/(?P<title>.*)'
+class ComedyCentralIE(MTV
ServicesInfoExtractor
):
+ _VALID_URL = r'https?://(?:www
.)?comedycentral
.com/(video-clips|episodes|cc-studios)/(?P<title>.*)'
_FEED_URL = u'http://comedycentral.com/feeds/mrss/'
_TEST = {
_FEED_URL = u'http://comedycentral.com/feeds/mrss/'
_TEST = {
@@
-25,12
+25,6
@@
class ComedyCentralIE(MTVIE):
u'description': u'After a certain point, breastfeeding becomes c**kblocking.',
},
}
u'description': u'After a certain point, breastfeeding becomes c**kblocking.',
},
}
- # Overwrite MTVIE properties we don't want
- _TESTS = []
-
- def _get_thumbnail_url(self, uri, itemdoc):
- search_path = '%s/%s' % (_media_xml_tag('group'), _media_xml_tag('thumbnail'))
- return itemdoc.find(search_path).attrib['url']
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
@@
-197,7
+191,7
@@
class ComedyCentralShowsIE(InfoExtractor):
})
effTitle = showId + u'-' + epTitle + u' part ' + compat_str(partNum+1)
})
effTitle = showId + u'-' + epTitle + u' part ' + compat_str(partNum+1)
-
info =
{
+
results.append(
{
'id': shortMediaId,
'formats': formats,
'uploader': showId,
'id': shortMediaId,
'formats': formats,
'uploader': showId,
@@
-205,11
+199,6
@@
class ComedyCentralShowsIE(InfoExtractor):
'title': effTitle,
'thumbnail': None,
'description': compat_str(officialTitle),
'title': effTitle,
'thumbnail': None,
'description': compat_str(officialTitle),
- }
-
- # TODO: Remove when #980 has been merged
- info.update(info['formats'][-1])
-
- results.append(info)
+ })
return results
return results