projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3c6ae8b
)
[tagesschau] set description=None for empty descriptions
author
Roland Hieber
<rohieb@rohieb.name>
Sun, 19 Jul 2015 03:09:29 +0000
(
05:09
+0200)
committer
Roland Hieber
<rohieb@rohieb.name>
Sun, 19 Jul 2015 03:09:29 +0000
(
05:09
+0200)
youtube_dl/extractor/tagesschau.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/tagesschau.py
b/youtube_dl/extractor/tagesschau.py
index 682f8df8f6d1f701af14d9009a63cab822c7ddd6..4a755c65789acee4b985aee3142189622838792d 100644
(file)
--- a/
youtube_dl/extractor/tagesschau.py
+++ b/
youtube_dl/extractor/tagesschau.py
@@
-36,7
+36,7
@@
class TagesschauIE(InfoExtractor):
'info_dict': {
'id': '3771',
'ext': 'mp4',
'info_dict': {
'id': '3771',
'ext': 'mp4',
- 'description':
''
,
+ 'description':
None
,
'title': 'Sendung: tagesschau (mit Gebärdensprache) \t14.07.2015 20:00 Uhr',
'thumbnail': 're:^http:.*\.jpg$',
}
'title': 'Sendung: tagesschau (mit Gebärdensprache) \t14.07.2015 20:00 Uhr',
'thumbnail': 're:^http:.*\.jpg$',
}
@@
-66,7
+66,7
@@
class TagesschauIE(InfoExtractor):
'info_dict': {
'id': '959',
'ext': 'mp4',
'info_dict': {
'id': '959',
'ext': 'mp4',
- 'description':
''
,
+ 'description':
None
,
'title': 'Sendung: tagesschau vor 20 Jahren \t14.07.2015 22:45 Uhr',
'thumbnail': 're:^http:.*\.jpg$',
}
'title': 'Sendung: tagesschau vor 20 Jahren \t14.07.2015 22:45 Uhr',
'thumbnail': 're:^http:.*\.jpg$',
}
@@
-76,7
+76,7
@@
class TagesschauIE(InfoExtractor):
'info_dict': {
'id': '3299',
'ext': 'mp4',
'info_dict': {
'id': '3299',
'ext': 'mp4',
- 'description':
''
,
+ 'description':
None
,
'title': 'Nach dem Referendum: Schaltgespräch nach Athen',
'thumbnail': 're:^http:.*\.jpg$',
}
'title': 'Nach dem Referendum: Schaltgespräch nach Athen',
'thumbnail': 're:^http:.*\.jpg$',
}
@@
-154,12
+154,9
@@
class TagesschauIE(InfoExtractor):
webpage, 'thumbnail', fatal=False)
# there are some videos without description
description = ""
webpage, 'thumbnail', fatal=False)
# there are some videos without description
description = ""
- try:
- description = self._html_search_regex(
- r'(?s)<p class="teasertext">(.*?)</p>',
- webpage, 'description', fatal=False)
- except ExtractorError:
- pass
+ description = self._html_search_regex(
+ r'(?s)<p class="teasertext">(.*?)</p>',
+ webpage, 'description', fatal=False, default=None)
title = self._html_search_regex(
r'<span class="headline".*?>(.*?)</span>', webpage, 'title')
title = self._html_search_regex(
r'<span class="headline".*?>(.*?)</span>', webpage, 'title')