Update upstream source from tag 'upstream/2019.06.08'

[youtubedl] / youtube_dl / extractor / carambatv.py

diff --git a/youtube_dl/extractor/carambatv.py b/youtube_dl/extractor/carambatv.py
index 9ba909a918755b5a02f8d8fe684a6f73a438ada9..b57b86af7e6b05527e102974b6533b4538f5d366 100644 (file)
--- a/youtube_dl/extractor/carambatv.py
+++ b/youtube_dl/extractor/carambatv.py
@@ -82,6 +82,12 @@ class CarambaTVPageIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         videomore_url = VideomoreIE._extract_url(webpage)
         webpage = self._download_webpage(url, video_id)
 
         videomore_url = VideomoreIE._extract_url(webpage)

+        if not videomore_url:
+            videomore_id = self._search_regex(
+                r'getVMCode\s*\(\s*["\']?(\d+)', webpage, 'videomore id',
+                default=None)
+            if videomore_id:
+                videomore_url = 'videomore:%s' % videomore_id

         if videomore_url:
             title = self._og_search_title(webpage)
             return {
         if videomore_url:
             title = self._og_search_title(webpage)
             return {