projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[streamango] Make title optional
[youtube-dl]
/
youtube_dl
/
extractor
/
sportdeutschland.py
diff --git
a/youtube_dl/extractor/sportdeutschland.py
b/youtube_dl/extractor/sportdeutschland.py
index 057ef5251dc6855c32a8df5abed6917556d190e9..a3c35a899a2186f1e937771cd0e34df408b2d361 100644
(file)
--- a/
youtube_dl/extractor/sportdeutschland.py
+++ b/
youtube_dl/extractor/sportdeutschland.py
@@
-5,8
+5,8
@@
import re
from .common import InfoExtractor
from ..utils import (
from .common import InfoExtractor
from ..utils import (
- compat_urllib_request,
parse_iso8601,
parse_iso8601,
+ sanitized_Request,
)
)
@@
-20,8
+20,8
@@
class SportDeutschlandIE(InfoExtractor):
'title': 're:Li-Ning Badminton Weltmeisterschaft 2014 Kopenhagen',
'categories': ['Badminton'],
'view_count': int,
'title': 're:Li-Ning Badminton Weltmeisterschaft 2014 Kopenhagen',
'categories': ['Badminton'],
'view_count': int,
- 'thumbnail': 're:^https?://.*\.jpg$',
- 'description': 're:Die Badminton-WM 2014 aus Kopenhagen bei Sportdeutschland\.TV',
+ 'thumbnail':
r
're:^https?://.*\.jpg$',
+ 'description':
r
're:Die Badminton-WM 2014 aus Kopenhagen bei Sportdeutschland\.TV',
'timestamp': int,
'upload_date': 're:^201408[23][0-9]$',
},
'timestamp': int,
'upload_date': 're:^201408[23][0-9]$',
},
@@
-36,10
+36,12
@@
class SportDeutschlandIE(InfoExtractor):
'upload_date': '20140825',
'description': 'md5:60a20536b57cee7d9a4ec005e8687504',
'timestamp': 1408976060,
'upload_date': '20140825',
'description': 'md5:60a20536b57cee7d9a4ec005e8687504',
'timestamp': 1408976060,
+ 'duration': 2732,
'title': 'Li-Ning Badminton Weltmeisterschaft 2014 Kopenhagen: Herren Einzel, Wei Lee vs. Keun Lee',
'title': 'Li-Ning Badminton Weltmeisterschaft 2014 Kopenhagen: Herren Einzel, Wei Lee vs. Keun Lee',
- 'thumbnail': 're:^https?://.*\.jpg$',
+ 'thumbnail':
r
're:^https?://.*\.jpg$',
'view_count': int,
'categories': ['Li-Ning Badminton WM 2014'],
'view_count': int,
'categories': ['Li-Ning Badminton WM 2014'],
+
}
}]
}
}]
@@
-48,16
+50,16
@@
class SportDeutschlandIE(InfoExtractor):
video_id = mobj.group('id')
sport_id = mobj.group('sport')
video_id = mobj.group('id')
sport_id = mobj.group('sport')
- api_url = 'http://
splink.tv/api/permalinks/%s/%s
' % (
+ api_url = 'http://
proxy.vidibusdynamic.net/sportdeutschland.tv/api/permalinks/%s/%s?access_token=true
' % (
sport_id, video_id)
sport_id, video_id)
- req =
compat_urllib_request.
Request(api_url, headers={
+ req =
sanitized_
Request(api_url, headers={
'Accept': 'application/vnd.vidibus.v2.html+json',
'Referer': url,
})
data = self._download_json(req, video_id)
'Accept': 'application/vnd.vidibus.v2.html+json',
'Referer': url,
})
data = self._download_json(req, video_id)
- categories = list(data.get('section', {}).get('tags', {}).values())
asset = data['asset']
asset = data['asset']
+ categories = [data['section']['title']]
formats = []
smil_url = asset['video']
formats = []
smil_url = asset['video']
@@
-68,10
+70,12
@@
class SportDeutschlandIE(InfoExtractor):
smil_doc = self._download_xml(
smil_url, video_id, note='Downloading SMIL metadata')
smil_doc = self._download_xml(
smil_url, video_id, note='Downloading SMIL metadata')
- base_url = smil_doc.find('./head/meta').attrib['base']
+ base_url_el = smil_doc.find('./head/meta')
+ if base_url_el:
+ base_url = base_url_el.attrib['base']
formats.extend([{
'format_id': 'rmtp',
formats.extend([{
'format_id': 'rmtp',
- 'url': base_url,
+ 'url': base_url
if base_url_el else n.attrib['src']
,
'play_path': n.attrib['src'],
'ext': 'flv',
'preference': -100,
'play_path': n.attrib['src'],
'ext': 'flv',
'preference': -100,
@@
-88,6
+92,7
@@
class SportDeutschlandIE(InfoExtractor):
'title': asset['title'],
'thumbnail': asset.get('image'),
'description': asset.get('teaser'),
'title': asset['title'],
'thumbnail': asset.get('image'),
'description': asset.get('teaser'),
+ 'duration': asset.get('duration'),
'categories': categories,
'view_count': asset.get('views'),
'rtmp_live': asset.get('live'),
'categories': categories,
'view_count': asset.get('views'),
'rtmp_live': asset.get('live'),