[ndr] Fix description and upload date extraction (Closes #7893)

2015-12-18 21:34:17 +06:00 · 2015-12-18 21:34:17 +06:00 · 9796a9b20c
commit 9796a9b20c
parent 016dd82050
1 changed files with 2 additions and 2 deletions
--- a/youtube_dl/extractor/ndr.py
+++ b/youtube_dl/extractor/ndr.py
@ -88,10 +88,10 @@ class NDRIE(NDRBaseIE):
            'embedURL', webpage, 'embed URL', fatal=True)
        description = self._search_regex(
            r'<p[^>]+itemprop="description">([^<]+)</p>',
-            webpage, 'description', fatal=False)
+            webpage, 'description', default=None) or self._og_search_description(webpage)
        timestamp = parse_iso8601(
            self._search_regex(
-                r'<span itemprop="datePublished" content="([^"]+)">',
+                r'<span[^>]+itemprop="(?:datePublished|uploadDate)"[^>]+content="([^"]+)"',
                webpage, 'upload date', fatal=False))
        return {
            '_type': 'url_transparent',