[rozhlas] Fix regexes and improve extraction (Closes #10253)

[youtube-dl.git] / youtube_dl / extractor / nationalgeographic.py

diff --git a/youtube_dl/extractor/nationalgeographic.py b/youtube_dl/extractor/nationalgeographic.py
index fe43d4bc8b4c809ebbe0c728c00243f553ba02c1..0027ff1b8d33e2bf67b20ca9201a6e3ee85736a9 100644 (file)
--- a/youtube_dl/extractor/nationalgeographic.py
+++ b/youtube_dl/extractor/nationalgeographic.py
@@ -74,7 +74,7 @@ class NationalGeographicIE(ThePlatformIE):
             'url': 'http://channel.nationalgeographic.com/the-story-of-god-with-morgan-freeman/videos/uncovering-a-universal-knowledge/',
             'md5': '518c9aa655686cf81493af5cc21e2a04',
             'info_dict': {
-                'id': 'nB5vIAfmyllm',
+                'id': 'vKInpacll2pC',
                 'ext': 'mp4',
                 'title': 'Uncovering a Universal Knowledge',
                 'description': 'md5:1a89148475bf931b3661fcd6ddb2ae3a',
@@ -88,7 +88,7 @@ class NationalGeographicIE(ThePlatformIE):
             'url': 'http://channel.nationalgeographic.com/wild/destination-wild/videos/the-stunning-red-bird-of-paradise/',
             'md5': 'c4912f656b4cbe58f3e000c489360989',
             'info_dict': {
-                'id': '3TmMv9OvGwIR',
+                'id': 'Pok5lWCkiEFA',
                 'ext': 'mp4',
                 'title': 'The Stunning Red Bird of Paradise',
                 'description': 'md5:7bc8cd1da29686be4d17ad1230f0140c',
@@ -161,8 +161,8 @@ class NationalGeographicEpisodeGuideIE(ThePlatformIE):
             r'<div[^>]+class="select-seasons[^"]*".*?<a[^>]*>(.*?)</a>',
             webpage, 'selected season')
         entries = [
-            self.url_result(self._proto_relative_url(url), 'NationalGeographic')
-            for url in re.findall('(?s)<div[^>]+class="col-inner"[^>]*?>.*?<a[^>]+href="([^"]+)"', webpage)]
+            self.url_result(self._proto_relative_url(entry_url), 'NationalGeographic')
+            for entry_url in re.findall('(?s)<div[^>]+class="col-inner"[^>]*?>.*?<a[^>]+href="([^"]+)"', webpage)]
         return self.playlist_result(
             entries, '%s-%s' % (display_id, selected_season.lower().replace(' ', '-')),
             '%s - %s' % (show, selected_season))