瀏覽代碼

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

Sergey M․ 9 年之前
父節點
當前提交
9796a9b20c
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      youtube_dl/extractor/ndr.py

+ 2 - 2
youtube_dl/extractor/ndr.py

@@ -88,10 +88,10 @@ class NDRIE(NDRBaseIE):
             'embedURL', webpage, 'embed URL', fatal=True)
             'embedURL', webpage, 'embed URL', fatal=True)
         description = self._search_regex(
         description = self._search_regex(
             r'<p[^>]+itemprop="description">([^<]+)</p>',
             r'<p[^>]+itemprop="description">([^<]+)</p>',
-            webpage, 'description', fatal=False)
+            webpage, 'description', default=None) or self._og_search_description(webpage)
         timestamp = parse_iso8601(
         timestamp = parse_iso8601(
             self._search_regex(
             self._search_regex(
-                r'<span itemprop="datePublished" content="([^"]+)">',
+                r'<span[^>]+itemprop="(?:datePublished|uploadDate)"[^>]+content="([^"]+)"',
                 webpage, 'upload date', fatal=False))
                 webpage, 'upload date', fatal=False))
         return {
         return {
             '_type': 'url_transparent',
             '_type': 'url_transparent',