From 57182dca509a476825754682a9107c8bfb8f7f08 Mon Sep 17 00:00:00 2001 From: Bastian de Groot Date: Sat, 14 Apr 2018 17:14:51 +0200 Subject: [PATCH] [generic] prefer enclosures over following links --- youtube_dl/extractor/generic.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index e3cb5c5ce..994a6511b 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -2009,13 +2009,14 @@ class GenericIE(InfoExtractor): entries = [] for it in doc.findall('./channel/item'): - next_url = xpath_text(it, 'link', fatal=False) - if not next_url: - enclosure_nodes = it.findall('./enclosure') - for e in enclosure_nodes: - next_url = e.attrib.get('url') - if next_url: - break + enclosure_nodes = it.findall('./enclosure') + for e in enclosure_nodes: + next_url = e.attrib.get('url') + if next_url: + break + + if not enclosure_nodes: + next_url = xpath_text(it, 'link', fatal=False) if not next_url: continue