From aa9dc61024f0a365fdf1554f2cee63bd529259e1 Mon Sep 17 00:00:00 2001 From: bato3 Date: Mon, 16 Jul 2018 14:31:10 +0200 Subject: [PATCH 1/2] Fixes #16984 - Don't display og:metadata Warning --- youtube_dl/extractor/dailymotion.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py index 9a74906cb..7ef6b6862 100644 --- a/youtube_dl/extractor/dailymotion.py +++ b/youtube_dl/extractor/dailymotion.py @@ -144,8 +144,9 @@ class DailymotionIE(DailymotionBaseInfoExtractor): age_limit = self._rta_search(webpage) - description = self._og_search_description(webpage) or self._html_search_meta( - 'description', webpage, 'description') + description = self._og_search_description( + webpage, default=self._html_search_meta( + 'description', webpage, 'description')) view_count_str = self._search_regex( (r']+itemprop="interactionCount"[^>]+content="UserPlays:([\s\d,.]+)"', From 88d0a347daf6c5b3c230906f09cd91294cb969e6 Mon Sep 17 00:00:00 2001 From: Sergey M Date: Thu, 19 Jul 2018 02:03:15 +0700 Subject: [PATCH 2/2] Update dailymotion.py --- youtube_dl/extractor/dailymotion.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py index 7ef6b6862..8f5f57b98 100644 --- a/youtube_dl/extractor/dailymotion.py +++ b/youtube_dl/extractor/dailymotion.py @@ -145,8 +145,8 @@ class DailymotionIE(DailymotionBaseInfoExtractor): age_limit = self._rta_search(webpage) description = self._og_search_description( - webpage, default=self._html_search_meta( - 'description', webpage, 'description')) + webpage, default=None) or self._html_search_meta( + 'description', webpage, 'description') view_count_str = self._search_regex( (r']+itemprop="interactionCount"[^>]+content="UserPlays:([\s\d,.]+)"',