projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Remove info el for get_video_info request
[youtube-dl]
/
youtube_dl
/
extractor
/
karrierevideos.py
diff --git
a/youtube_dl/extractor/karrierevideos.py
b/youtube_dl/extractor/karrierevideos.py
index bed94bc9338d158c77087d4e74ef341aa236f94f..f236a2f78e600d45c3f7dbd40de2f320f4cf277e 100644
(file)
--- a/
youtube_dl/extractor/karrierevideos.py
+++ b/
youtube_dl/extractor/karrierevideos.py
@@
-12,7
+12,7
@@
from ..utils import (
class KarriereVideosIE(InfoExtractor):
class KarriereVideosIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?karrierevideos\.at(?:/[^/]+)+/(?P<id>[^/]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?karrierevideos\.at(?:/[^/]+)+/(?P<id>[^/]+)'
_TESTS = [{
'url': 'http://www.karrierevideos.at/berufsvideos/mittlere-hoehere-schulen/altenpflegerin',
'info_dict': {
_TESTS = [{
'url': 'http://www.karrierevideos.at/berufsvideos/mittlere-hoehere-schulen/altenpflegerin',
'info_dict': {
@@
-20,7
+20,7
@@
class KarriereVideosIE(InfoExtractor):
'ext': 'flv',
'title': 'AltenpflegerIn',
'description': 'md5:dbadd1259fde2159a9b28667cb664ae2',
'ext': 'flv',
'title': 'AltenpflegerIn',
'description': 'md5:dbadd1259fde2159a9b28667cb664ae2',
- 'thumbnail': 're:^http://.*\.png',
+ 'thumbnail':
r
're:^http://.*\.png',
},
'params': {
# rtmp download
},
'params': {
# rtmp download
@@
-34,7
+34,7
@@
class KarriereVideosIE(InfoExtractor):
'ext': 'flv',
'title': 'Väterkarenz und neue Chancen für Mütter - "Baby - was nun?"',
'description': 'md5:97092c6ad1fd7d38e9d6a5fdeb2bcc33',
'ext': 'flv',
'title': 'Väterkarenz und neue Chancen für Mütter - "Baby - was nun?"',
'description': 'md5:97092c6ad1fd7d38e9d6a5fdeb2bcc33',
- 'thumbnail': 're:^http://.*\.png',
+ 'thumbnail':
r
're:^http://.*\.png',
},
'params': {
# rtmp download
},
'params': {
# rtmp download
@@
-48,13
+48,16
@@
class KarriereVideosIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
title = (self._html_search_meta('title', webpage, default=None) or
webpage = self._download_webpage(url, video_id)
title = (self._html_search_meta('title', webpage, default=None) or
- self._search_regex(r'<h1 class="title">([^<]+)</h1>'))
+ self._search_regex(r'<h1 class="title">([^<]+)</h1>'
, webpage, 'video title'
))
video_id = self._search_regex(
r'/config/video/(.+?)\.xml', webpage, 'video id')
video_id = self._search_regex(
r'/config/video/(.+?)\.xml', webpage, 'video id')
+ # Server returns malformed headers
+ # Force Accept-Encoding: * to prevent gzipped results
playlist = self._download_xml(
'http://www.karrierevideos.at/player-playlist.xml.php?p=%s' % video_id,
playlist = self._download_xml(
'http://www.karrierevideos.at/player-playlist.xml.php?p=%s' % video_id,
- video_id, transform_source=fix_xml_ampersands)
+ video_id, transform_source=fix_xml_ampersands,
+ headers={'Accept-Encoding': '*'})
NS_MAP = {
'jwplayer': 'http://developer.longtailvideo.com/trac/wiki/FlashFormats'
NS_MAP = {
'jwplayer': 'http://developer.longtailvideo.com/trac/wiki/FlashFormats'