From 17bc795e0777344381b9323c31882d74af5610be Mon Sep 17 00:00:00 2001
From: Paul Hartmann <phaaurlt@gmail.com>
Date: Tue, 25 Aug 2015 21:56:57 +0200
Subject: [PATCH 1/2] [MTV] add support for German site mtv.de

---
 youtube_dl/extractor/mtv.py | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index b48fac5e3..b188fc388 100644
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dl/extractor/mtv.py
@@ -109,6 +109,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
     def _get_video_info(self, itemdoc):
         uri = itemdoc.find('guid').text
         video_id = self._id_from_uri(uri)
+        video_id = re.sub(r'^music_video-', '', video_id)
         self.report_extraction(video_id)
         mediagen_url = itemdoc.find('%s/%s' % (_media_xml_tag('group'), _media_xml_tag('content'))).attrib['url']
         # Remove the templates, like &device={device}
@@ -149,6 +150,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
         if title is None:
             raise ExtractorError('Could not find video title')
         title = title.strip()
+        title = re.sub(r'^MusicVideo_', '', title)
 
         # This a short id that's used in the webpage urls
         mtvn_id = None
@@ -180,6 +182,25 @@ class MTVServicesInfoExtractor(InfoExtractor):
         return self.playlist_result(
             [self._get_video_info(item) for item in idoc.findall('.//item')])
 
+    def _get_videos_info_de(self, url, video_path):
+        """Extract from German site mtv.de"""
+        webpage = self._download_webpage(url, video_path)
+        playlist_js = self._search_regex(r'<script>\s*window.pagePlaylist =(.*?\]);\s*window.trackingParams =', webpage, 'playlist', flags=re.DOTALL)
+        playlist = self._parse_json(playlist_js, video_path)
+        info = None
+        for item in playlist:
+            if item['video_path'] == video_path:
+                info = item
+                break
+        if info == None:
+            raise ExtractorError('video not in playlist')
+        mrss_url = info['mrss']
+        idoc = self._download_xml(
+            mrss_url, video_path,
+            'Downloading info', transform_source=fix_xml_ampersands)
+        return self.playlist_result(
+            [self._get_video_info(item) for item in idoc.findall('.//item')])
+
     def _real_extract(self, url):
         title = url_basename(url)
         webpage = self._download_webpage(url, title)
@@ -237,7 +258,8 @@ class MTVServicesEmbeddedIE(MTVServicesInfoExtractor):
 class MTVIE(MTVServicesInfoExtractor):
     _VALID_URL = r'''(?x)^https?://
         (?:(?:www\.)?mtv\.com/videos/.+?/(?P<videoid>[0-9]+)/[^/]+$|
-           m\.mtv\.com/videos/video\.rbml\?.*?id=(?P<mgid>[^&]+))'''
+           m\.mtv\.com/videos/video\.rbml\?.*?id=(?P<mgid>[^&]+)|
+           (?:www\.)?mtv\.de(?P<video_path>/artists/.*))'''
 
     _FEED_URL = 'http://www.mtv.com/player/embed/AS3/rss/'
 
@@ -252,6 +274,15 @@ class MTVIE(MTVServicesInfoExtractor):
                 'description': 'Album: Taylor Swift performs "Ours" for VH1 Storytellers at Harvey Mudd College.',
             },
         },
+        {
+            'url': 'http://www.mtv.de/artists/10571-cro/videos/61131-traum',
+            'info_dict': {
+                'id': 'a50bc5f0b3aa4b3190aa',
+                'ext': 'mp4',
+                'title': 'cro-traum',
+                'description': 'Cro - Traum',
+            },
+        },
     ]
 
     def _get_thumbnail_url(self, uri, itemdoc):
@@ -259,6 +290,8 @@ class MTVIE(MTVServicesInfoExtractor):
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
+        if mobj.group('video_path'):
+            return self._get_videos_info_de(url, mobj.group('video_path'))
         video_id = mobj.group('videoid')
         uri = mobj.groupdict().get('mgid')
         if uri is None:

From c9e729e34cbb4ff0945cbf21bfd8db4a7cf721d7 Mon Sep 17 00:00:00 2001
From: Paul Hartmann <phaaurlt@gmail.com>
Date: Wed, 26 Aug 2015 00:06:44 +0200
Subject: [PATCH 2/2] [MTV] move German mtv site to new class

---
 youtube_dl/extractor/__init__.py |  1 +
 youtube_dl/extractor/mtv.py      | 70 +++++++++++++++++---------------
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index d59882598..66422b005 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -340,6 +340,7 @@ from .mtv import (
     MTVIE,
     MTVServicesEmbeddedIE,
     MTVIggyIE,
+    MTVDEIE,
 )
 from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE
diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index b188fc388..f7b340521 100644
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dl/extractor/mtv.py
@@ -182,25 +182,6 @@ class MTVServicesInfoExtractor(InfoExtractor):
         return self.playlist_result(
             [self._get_video_info(item) for item in idoc.findall('.//item')])
 
-    def _get_videos_info_de(self, url, video_path):
-        """Extract from German site mtv.de"""
-        webpage = self._download_webpage(url, video_path)
-        playlist_js = self._search_regex(r'<script>\s*window.pagePlaylist =(.*?\]);\s*window.trackingParams =', webpage, 'playlist', flags=re.DOTALL)
-        playlist = self._parse_json(playlist_js, video_path)
-        info = None
-        for item in playlist:
-            if item['video_path'] == video_path:
-                info = item
-                break
-        if info == None:
-            raise ExtractorError('video not in playlist')
-        mrss_url = info['mrss']
-        idoc = self._download_xml(
-            mrss_url, video_path,
-            'Downloading info', transform_source=fix_xml_ampersands)
-        return self.playlist_result(
-            [self._get_video_info(item) for item in idoc.findall('.//item')])
-
     def _real_extract(self, url):
         title = url_basename(url)
         webpage = self._download_webpage(url, title)
@@ -258,8 +239,7 @@ class MTVServicesEmbeddedIE(MTVServicesInfoExtractor):
 class MTVIE(MTVServicesInfoExtractor):
     _VALID_URL = r'''(?x)^https?://
         (?:(?:www\.)?mtv\.com/videos/.+?/(?P<videoid>[0-9]+)/[^/]+$|
-           m\.mtv\.com/videos/video\.rbml\?.*?id=(?P<mgid>[^&]+)|
-           (?:www\.)?mtv\.de(?P<video_path>/artists/.*))'''
+           m\.mtv\.com/videos/video\.rbml\?.*?id=(?P<mgid>[^&]+))'''
 
     _FEED_URL = 'http://www.mtv.com/player/embed/AS3/rss/'
 
@@ -274,15 +254,6 @@ class MTVIE(MTVServicesInfoExtractor):
                 'description': 'Album: Taylor Swift performs "Ours" for VH1 Storytellers at Harvey Mudd College.',
             },
         },
-        {
-            'url': 'http://www.mtv.de/artists/10571-cro/videos/61131-traum',
-            'info_dict': {
-                'id': 'a50bc5f0b3aa4b3190aa',
-                'ext': 'mp4',
-                'title': 'cro-traum',
-                'description': 'Cro - Traum',
-            },
-        },
     ]
 
     def _get_thumbnail_url(self, uri, itemdoc):
@@ -290,8 +261,6 @@ class MTVIE(MTVServicesInfoExtractor):
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
-        if mobj.group('video_path'):
-            return self._get_videos_info_de(url, mobj.group('video_path'))
         video_id = mobj.group('videoid')
         uri = mobj.groupdict().get('mgid')
         if uri is None:
@@ -321,3 +290,40 @@ class MTVIggyIE(MTVServicesInfoExtractor):
         }
     }
     _FEED_URL = 'http://all.mtvworldverticals.com/feed-xml/'
+
+class MTVDEIE(MTVServicesInfoExtractor):
+    IE_NAME = 'mtv.de'
+    _VALID_URL = r'''(?x)^https?://(?:www\.)?mtv\.de(?P<video_path>/artists/.*)'''
+    _TESTS = [
+        {
+            'url': 'http://www.mtv.de/artists/10571-cro/videos/61131-traum',
+            'info_dict': {
+                'id': 'a50bc5f0b3aa4b3190aa',
+                'ext': 'mp4',
+                'title': 'cro-traum',
+                'description': 'Cro - Traum',
+            },
+        },
+    ]
+
+    def _real_extract(self, url):
+        mobj = re.match(self._VALID_URL, url)
+        return self._get_videos_info(url, mobj.group('video_path'))
+
+    def _get_videos_info(self, url, video_path):
+        webpage = self._download_webpage(url, video_path)
+        playlist_js = self._search_regex(r'<script>\s*window.pagePlaylist =(.*?\]);\s*window.trackingParams =', webpage, 'playlist', flags=re.DOTALL)
+        playlist = self._parse_json(playlist_js, video_path)
+        info = None
+        for item in playlist:
+            if item['video_path'] == video_path:
+                info = item
+                break
+        if info == None:
+            raise ExtractorError('video not in playlist')
+        mrss_url = info['mrss']
+        idoc = self._download_xml(
+            mrss_url, video_path,
+            'Downloading info', transform_source=fix_xml_ampersands)
+        return self.playlist_result(
+            [self._get_video_info(item) for item in idoc.findall('.//item')])