From b6a91ea7509b5a0905adacf6c7d2356c4e947fac Mon Sep 17 00:00:00 2001
From: flatt3rn <gj-sec@web.de>
Date: Sat, 7 Jan 2017 15:15:26 +0100
Subject: [PATCH] Error Prevention and Different Qualitys

Added some error preventions and an autoselection for the best quality, thats avaible
---
 youtube_dl/extractor/universalmusicservice.py | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/youtube_dl/extractor/universalmusicservice.py b/youtube_dl/extractor/universalmusicservice.py
index 7c6443983..c13a5f1b2 100644
--- a/youtube_dl/extractor/universalmusicservice.py
+++ b/youtube_dl/extractor/universalmusicservice.py
@@ -17,13 +17,34 @@ class UniversalMusicServiceIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        video_url = "http://mediadelivery.universal-music-services.de/vod/mp4:autofill/storage/" + video_id[0:1] + "/" + video_id[1:2] + "/" + video_id[2:3] + "/" + video_id[3:4] + "/" + video_id[4:5] + "/" + video_id[5:6] + "/content/836/file/playlist.m3u8"
-        #video_url = "http://mediadelivery.universal-music-services.de/vod/mp4:autofill/storage/" + video_id[0:1] + "/" + video_id[1:2] + "/" + video_id[2:3] + "/" + video_id[3:4] + "/" + video_id[4:5] + "/" + video_id[5:6] + "/content/686/file/playlist.m3u8"
 
         webpage = self._download_webpage(url, video_id)
+        if " <p>Dieser Inhalt ist nicht (mehr) verfügbar.</p>" in webpage:
+            self.to_screen("ERROR: Webpage not found")
+            sys.exit()
         title = self._html_search_regex(r'<title>.+ \| (.+) \| .+<\/title>', webpage, 'title')
         album = self._html_search_regex(r'class="product-banner-text1">(.+)<\/p>', webpage, 'album')
 
+        if len(title) == 0:
+            self.to_screen("Title not found")
+            title = "Unknown"
+        if len(album) == 0:
+            self.to_screen("Album not found"))
+            album = "Unknown"
+
+        qualitys = ["940","836",867]
+        #836: 1024x576
+        #940: 1920x1080
+        #867: 483x272
+        for quality in qualitys:            
+            video_url = "http://mediadelivery.universal-music-services.de/vod/mp4:autofill/storage/" + video_id[0:1] + "/" + video_id[1:2] + "/" + video_id[2:3] + "/" + video_id[3:4] + "/" + video_id[4:5] + "/" + video_id[5:6] + "/content/" + quality + "/file/playlist.m3u8"
+            webpage = self._download_webpage(video_url, video_id)
+            if "RESOLUTION=" in webpage:
+                break
+        if len(video_url) == 0:
+            self.to_screen("ERROR: No Stream found")
+            sys.exit()
+
         return {
             'id': video_id,
             'title': title,