projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eae89f9
)
[dfb] Extract display_id and modernize
author
Sergey M․
<dstftw@gmail.com>
Tue, 14 Jul 2015 17:59:21 +0000
(23:59 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 14 Jul 2015 17:59:21 +0000
(23:59 +0600)
youtube_dl/extractor/dfb.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/dfb.py
b/youtube_dl/extractor/dfb.py
index 6732e1751b6b5099cce2714a6936408d97850b67..f1df9b9a0d52f126ab9a8a0dfed3e75bd63a3a32 100644
(file)
--- a/
youtube_dl/extractor/dfb.py
+++ b/
youtube_dl/extractor/dfb.py
@@
-3,17
+3,19
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
+from ..utils import unified_strdate
class DFBIE(InfoExtractor):
IE_NAME = 'tv.dfb.de'
class DFBIE(InfoExtractor):
IE_NAME = 'tv.dfb.de'
- _VALID_URL = r'https?://tv\.dfb\.de/video/
[^/]+
/(?P<id>\d+)'
+ _VALID_URL = r'https?://tv\.dfb\.de/video/
(?P<display_id>[^/]+)
/(?P<id>\d+)'
_TEST = {
'url': 'http://tv.dfb.de/video/u-19-em-stimmen-zum-spiel-gegen-russland/11633/',
# The md5 is different each time
'info_dict': {
'id': '11633',
_TEST = {
'url': 'http://tv.dfb.de/video/u-19-em-stimmen-zum-spiel-gegen-russland/11633/',
# The md5 is different each time
'info_dict': {
'id': '11633',
+ 'display_id': 'u-19-em-stimmen-zum-spiel-gegen-russland',
'ext': 'flv',
'title': 'U 19-EM: Stimmen zum Spiel gegen Russland',
'upload_date': '20150714',
'ext': 'flv',
'title': 'U 19-EM: Stimmen zum Spiel gegen Russland',
'upload_date': '20150714',
@@
-23,22
+25,25
@@
class DFBIE(InfoExtractor):
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
+ display_id = mobj.group('display_id')
- webpage = self._download_webpage(url,
video
_id)
+ webpage = self._download_webpage(url,
display
_id)
player_info = self._download_xml(
'http://tv.dfb.de/server/hd_video.php?play=%s' % video_id,
player_info = self._download_xml(
'http://tv.dfb.de/server/hd_video.php?play=%s' % video_id,
-
video
_id)
+
display
_id)
video_info = player_info.find('video')
video_info = player_info.find('video')
- f4m_info = self._download_xml(self._proto_relative_url(video_info.find('url').text.strip()), video_id)
+ f4m_info = self._download_xml(
+ self._proto_relative_url(video_info.find('url').text.strip()), display_id)
token_el = f4m_info.find('token')
manifest_url = token_el.attrib['url'] + '?' + 'hdnea=' + token_el.attrib['auth'] + '&hdcore=3.2.0'
return {
'id': video_id,
token_el = f4m_info.find('token')
manifest_url = token_el.attrib['url'] + '?' + 'hdnea=' + token_el.attrib['auth'] + '&hdcore=3.2.0'
return {
'id': video_id,
+ 'display_id': display_id,
'title': video_info.find('title').text,
'url': manifest_url,
'ext': 'flv',
'thumbnail': self._og_search_thumbnail(webpage),
'title': video_info.find('title').text,
'url': manifest_url,
'ext': 'flv',
'thumbnail': self._og_search_thumbnail(webpage),
- 'upload_date':
''.join(video_info.find('time_date').text.split('.')[::-1]
),
+ 'upload_date':
unified_strdate(video_info.find('time_date').text
),
}
}