Initiate new release.

[youtubedl] / youtube_dl / extractor / tlc.py

diff --git a/youtube_dl/extractor/tlc.py b/youtube_dl/extractor/tlc.py
index ad175b83ebb6ada365722787932ec80179456560..13263614cc06b099d929ee71564899ac3620f76a 100644 (file)
--- a/youtube_dl/extractor/tlc.py
+++ b/youtube_dl/extractor/tlc.py
@@ -5,23 +5,29 @@ 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):
     IE_NAME = 'tlc.com'
     _VALID_URL = r'http://www\.tlc\.com\/[a-zA-Z0-9\-]*/[a-zA-Z0-9\-]*/videos/(?P<id>[a-zA-Z0-9\-]*)(.htm)?'
 
 
 
 class TlcIE(DiscoveryIE):
     IE_NAME = 'tlc.com'
     _VALID_URL = r'http://www\.tlc\.com\/[a-zA-Z0-9\-]*/[a-zA-Z0-9\-]*/videos/(?P<id>[a-zA-Z0-9\-]*)(.htm)?'
 

-    _TEST = {
+    # DiscoveryIE has _TESTS
+    _TESTS = [{

         'url': 'http://www.tlc.com/tv-shows/cake-boss/videos/too-big-to-fly.htm',
         'url': 'http://www.tlc.com/tv-shows/cake-boss/videos/too-big-to-fly.htm',

-        'md5': 'c4038f4a9b44d0b5d74caaa64ed2a01a',

         'info_dict': {
         'info_dict': {

-            'id': '853232',
+            'id': '104493',

             'ext': 'mp4',
             'ext': 'mp4',

-            'title': 'Cake Boss: Too Big to Fly',
+            'title': 'Too Big to Fly',

             'description': 'Buddy has taken on a high flying task.',
             'duration': 119,
             'description': 'Buddy has taken on a high flying task.',
             'duration': 119,

+            'timestamp': 1393365060,
+            'upload_date': '20140225',

         },
         },

-    }
+        'params': {
+            'skip_download': True,  # requires ffmpef
+        },
+    }]

 
 
 class TlcDeIE(InfoExtractor):
 
 
 class TlcDeIE(InfoExtractor):


@@ -35,9 +41,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 +58,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 {