Imported Upstream version 2015.06.04.1

[youtubedl] / youtube_dl / extractor / tlc.py

diff --git a/youtube_dl/extractor/tlc.py b/youtube_dl/extractor/tlc.py
index ad175b83ebb6ada365722787932ec80179456560..9f9e388c50948d658d1022f8514122643b623a03 100644 (file)
--- a/youtube_dl/extractor/tlc.py
+++ b/youtube_dl/extractor/tlc.py
@@ -5,6 +5,7 @@ import re
 from .common import InfoExtractor
 from .brightcove import BrightcoveIE
 from .discovery import DiscoveryIE
 from .common import InfoExtractor
 from .brightcove import BrightcoveIE
 from .discovery import DiscoveryIE

+from ..compat import compat_urlparse

 
 
 class TlcIE(DiscoveryIE):
 
 
 class TlcIE(DiscoveryIE):


@@ -35,9 +36,10 @@ class TlcDeIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Breaking Amish: Die Welt da draußen',
             'uploader': 'Discovery Networks - Germany',
             'ext': 'mp4',
             'title': 'Breaking Amish: Die Welt da draußen',
             'uploader': 'Discovery Networks - Germany',

-            'description': 'Vier Amische und eine Mennonitin wagen in New York'
+            'description': (
+                'Vier Amische und eine Mennonitin wagen in New York'

                 '  den Sprung in ein komplett anderes Leben. Begleitet sie auf'
                 '  den Sprung in ein komplett anderes Leben. Begleitet sie auf'

-                ' ihrem spannenden Weg.',
+                ' ihrem spannenden Weg.'),

         },
     }
 
         },
     }
 


@@ -51,6 +53,10 @@ class TlcDeIE(InfoExtractor):
         # Otherwise we don't get the correct 'BrightcoveExperience' element,
         # example: http://www.tlc.de/sendungen/cake-boss/videos/cake-boss-cannoli-drama/
         iframe_url = iframe_url.replace('.htm?', '.php?')
         # Otherwise we don't get the correct 'BrightcoveExperience' element,
         # example: http://www.tlc.de/sendungen/cake-boss/videos/cake-boss-cannoli-drama/
         iframe_url = iframe_url.replace('.htm?', '.php?')

+        url_fragment = compat_urlparse.urlparse(url).fragment
+        if url_fragment:
+            # Since the fragment is not send to the server, we always get the same iframe
+            iframe_url = re.sub(r'playlist=(\d+)', 'playlist=%s' % url_fragment, iframe_url)

         iframe = self._download_webpage(iframe_url, title)
 
         return {
         iframe = self._download_webpage(iframe_url, title)
 
         return {