From: Tithen-Firion <Tithen-Firion@users.noreply.github.com>
Date: Sun, 30 Nov 2014 18:36:24 +0000 (+0100)
Subject: [myspace] Handle non-playable songs
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=1940fadd5307a11fd64ab26c43fbc31764c213a1;p=youtube-dl

[myspace] Handle non-playable songs
I'm adding this because sometimes there is a song page, but you cannot play it.
Example: https://myspace.com/starset2/music/song/let-it-die-maniac-agenda-remix-bonus-track-95799916-106964439
It will be useful for downloading whole album with songs like this.
---

diff --git a/youtube_dl/extractor/myspace.py b/youtube_dl/extractor/myspace.py
index 1a118a37f..843e1f24a 100644
--- a/youtube_dl/extractor/myspace.py
+++ b/youtube_dl/extractor/myspace.py
@@ -53,9 +53,17 @@ class MySpaceIE(InfoExtractor):
 
         if mobj.group('mediatype').startswith('music/song'):
             # songs don't store any useful info in the 'context' variable
+            song_data = self._search_regex(
+                r'''<button.*data-song-id=(["\'])%s\1.*''' % video_id,
+                webpage, 'song_data', default=None, group=0)
+            if song_data is None:
+                self.to_screen(
+                    '%s: No downloadable song on this page' % video_id)
+                return
             def search_data(name):
                 return self._search_regex(
-                    r'data-%s="(.*?)"' % name, webpage, name)
+                    r'''data-%s=([\'"])(.*?)\1''' % name,
+                    song_data, name, default='', group=2)
             streamUrl = search_data('stream-url')
             info = {
                 'id': video_id,