From: Sergey M․ <dstftw@gmail.com>
Date: Sun, 9 Aug 2015 13:41:55 +0000 (+0600)
Subject: [extractor/common] Extract _parse_xspf
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=942acef594428b5f5c7e0ed7860cb6d725d8f1e5;p=youtube-dl

[extractor/common] Extract _parse_xspf
---

diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index be91e03e9..5982055be 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -1144,11 +1144,15 @@ class InfoExtractor(object):
             })
         return subtitles
 
-    def _extract_xspf_playlist(self, playlist_url, playlist_id):
-        playlist = self._download_xml(
+    def _extract_xspf_playlist(self, playlist_url, playlist_id, fatal=True):
+        xspf = self._download_xml(
             playlist_url, playlist_id, 'Downloading xpsf playlist',
-            'Unable to download xspf manifest')
+            'Unable to download xspf manifest', fatal=fatal)
+        if xspf is False:
+            return []
+        return self._parse_xspf(xspf, playlist_id)
 
+    def _parse_xspf(self, playlist, playlist_id):
         NS_MAP = {
             'xspf': 'http://xspf.org/ns/0/',
             's1': 'http://static.streamone.nl/player/ns/0',