projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
76bee08
)
[wdr:maus] Fix extraction and update tests
author
runningbits
<runningbits@users.noreply.github.com>
Fri, 10 Mar 2017 15:59:32 +0000
(16:59 +0100)
committer
Sergey M
<dstftw@gmail.com>
Fri, 10 Mar 2017 15:59:32 +0000
(23:59 +0800)
youtube_dl/extractor/wdr.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/wdr.py
b/youtube_dl/extractor/wdr.py
index f7e6360a33e8b6d2cc3096232bfa1d2c458ab3c7..11099982729ffddea6b2b5b56c5063f95ad5c4ec 100644
(file)
--- a/
youtube_dl/extractor/wdr.py
+++ b/
youtube_dl/extractor/wdr.py
@@
-19,9
+19,9
@@
class WDRBaseIE(InfoExtractor):
def _extract_wdr_video(self, webpage, display_id):
# for wdr.de the data-extension is in a tag with the class "mediaLink"
# for wdr.de radio players, in a tag with the class "wdrrPlayerPlayBtn"
def _extract_wdr_video(self, webpage, display_id):
# for wdr.de the data-extension is in a tag with the class "mediaLink"
# for wdr.de radio players, in a tag with the class "wdrrPlayerPlayBtn"
- # for wdrmaus its in a link to the page in a multiline "videoLink"-tag
+ # for wdrmaus it
i
s in a link to the page in a multiline "videoLink"-tag
json_metadata = self._html_search_regex(
json_metadata = self._html_search_regex(
- r'class=(?:"(?:mediaLink|wdrrPlayerPlayBtn)\b[^"]*"[^>]+|"videoLink\b[^"]*"[\s]*>\n[^\n]*)data-extension="([^"]+)"',
+ r'class=(?:"(?:mediaLink|wdrrPlayerPlayBtn
|videoButton
)\b[^"]*"[^>]+|"videoLink\b[^"]*"[\s]*>\n[^\n]*)data-extension="([^"]+)"',
webpage, 'media link', default=None, flags=re.MULTILINE)
if not json_metadata:
webpage, 'media link', default=None, flags=re.MULTILINE)
if not json_metadata:
@@
-161,23
+161,23
@@
class WDRIE(WDRBaseIE):
{
'url': 'http://www.wdrmaus.de/aktuelle-sendung/index.php5',
'info_dict': {
{
'url': 'http://www.wdrmaus.de/aktuelle-sendung/index.php5',
'info_dict': {
- 'id': 'mdb-1
096487
',
- 'ext': '
flv
',
+ 'id': 'mdb-1
323501
',
+ 'ext': '
mp4
',
'upload_date': 're:^[0-9]{8}$',
'title': 're:^Die Sendung mit der Maus vom [0-9.]{10}$',
'upload_date': 're:^[0-9]{8}$',
'title': 're:^Die Sendung mit der Maus vom [0-9.]{10}$',
- 'description': '
- Die Sendung
mit der Maus -',
+ 'description': '
Die Seite
mit der Maus -',
},
'skip': 'The id changes from week to week because of the new episode'
},
{
},
'skip': 'The id changes from week to week because of the new episode'
},
{
- 'url': 'http://www.wdrmaus.de/
sachgeschichten
/sachgeschichten/achterbahn.php5',
+ 'url': 'http://www.wdrmaus.de/
filme
/sachgeschichten/achterbahn.php5',
'md5': '803138901f6368ee497b4d195bb164f2',
'info_dict': {
'id': 'mdb-186083',
'ext': 'mp4',
'upload_date': '20130919',
'title': 'Sachgeschichte - Achterbahn ',
'md5': '803138901f6368ee497b4d195bb164f2',
'info_dict': {
'id': 'mdb-186083',
'ext': 'mp4',
'upload_date': '20130919',
'title': 'Sachgeschichte - Achterbahn ',
- 'description': '
- Die Sendung
mit der Maus -',
+ 'description': '
Die Seite
mit der Maus -',
},
},
{
},
},
{
@@
-186,7
+186,7
@@
class WDRIE(WDRBaseIE):
'info_dict': {
'id': 'mdb-869971',
'ext': 'flv',
'info_dict': {
'id': 'mdb-869971',
'ext': 'flv',
- 'title': '
Funkhaus Europa
Livestream',
+ 'title': '
COSMO
Livestream',
'description': 'md5:2309992a6716c347891c045be50992e4',
'upload_date': '20160101',
},
'description': 'md5:2309992a6716c347891c045be50992e4',
'upload_date': '20160101',
},