Merge tag 'upstream/2016.06.25'

[youtubedl] / youtube_dl / extractor / tvplay.py

diff --git a/youtube_dl/extractor/tvplay.py b/youtube_dl/extractor/tvplay.py
index 445e0ec419ccc7eb2e23e522f6f3eba6010dcd69..df70a6b230a4217261f3f69a3e1213a88f07afbf 100644 (file)
--- a/youtube_dl/extractor/tvplay.py
+++ b/youtube_dl/extractor/tvplay.py
@@ -4,9 +4,8 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

+from ..compat import compat_str

 from ..utils import (
 from ..utils import (

-    ExtractorError,
-    compat_str,

     parse_iso8601,
     qualities,
 )
     parse_iso8601,
     qualities,
 )


@@ -14,9 +13,10 @@ from ..utils import (
 
 class TVPlayIE(InfoExtractor):
     IE_DESC = 'TV3Play and related services'
 
 class TVPlayIE(InfoExtractor):
     IE_DESC = 'TV3Play and related services'

-    _VALID_URL = r'''(?x)http://(?:www\.)?
+    _VALID_URL = r'''(?x)https?://(?:www\.)?

         (?:tvplay\.lv/parraides|
            tv3play\.lt/programos|
         (?:tvplay\.lv/parraides|
            tv3play\.lt/programos|

+           play\.tv3\.lt/programos|

            tv3play\.ee/sisu|
            tv3play\.se/program|
            tv6play\.se/program|
            tv3play\.ee/sisu|
            tv3play\.se/program|
            tv6play\.se/program|


@@ -26,6 +26,7 @@ class TVPlayIE(InfoExtractor):
            viasat4play\.no/programmer|
            tv6play\.no/programmer|
            tv3play\.dk/programmer|
            viasat4play\.no/programmer|
            tv6play\.no/programmer|
            tv3play\.dk/programmer|

+           play\.novatv\.bg/programi

         )/[^/]+/(?P<id>\d+)
         '''
     _TESTS = [
         )/[^/]+/(?P<id>\d+)
         '''
     _TESTS = [


@@ -46,7 +47,7 @@ class TVPlayIE(InfoExtractor):
             },
         },
         {
             },
         },
         {

-            'url': 'http://www.tv3play.lt/programos/moterys-meluoja-geriau/409229?autostart=true',
+            'url': 'http://play.tv3.lt/programos/moterys-meluoja-geriau/409229?autostart=true',

             'info_dict': {
                 'id': '409229',
                 'ext': 'flv',
             'info_dict': {
                 'id': '409229',
                 'ext': 'flv',


@@ -103,6 +104,7 @@ class TVPlayIE(InfoExtractor):
                 'duration': 1492,
                 'timestamp': 1330522854,
                 'upload_date': '20120229',
                 'duration': 1492,
                 'timestamp': 1330522854,
                 'upload_date': '20120229',

+                'age_limit': 18,

             },
             'params': {
                 # rtmp download
             },
             'params': {
                 # rtmp download


@@ -173,18 +175,33 @@ class TVPlayIE(InfoExtractor):
                 'skip_download': True,
             },
         },
                 'skip_download': True,
             },
         },

+        {
+            'url': 'http://play.novatv.bg/programi/zdravei-bulgariya/624952?autostart=true',
+            'info_dict': {
+                'id': '624952',
+                'ext': 'flv',
+                'title': 'Здравей, България (12.06.2015 г.) ',
+                'description': 'md5:99f3700451ac5bb71a260268b8daefd7',
+                'duration': 8838,
+                'timestamp': 1434100372,
+                'upload_date': '20150612',
+            },
+            'params': {
+                # rtmp download
+                'skip_download': True,
+            },
+        },

     ]
 
     def _real_extract(self, url):
     ]
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
+        video_id = self._match_id(url)

 
         video = self._download_json(
             'http://playapi.mtgx.tv/v1/videos/%s' % video_id, video_id, 'Downloading video JSON')
 
         if video['is_geo_blocked']:
 
         video = self._download_json(
             'http://playapi.mtgx.tv/v1/videos/%s' % video_id, video_id, 'Downloading video JSON')
 
         if video['is_geo_blocked']:

-            raise ExtractorError(
-                'This content is not available in your country due to copyright reasons', expected=True)
+            self.report_warning(
+                'This content might not be available in your country due to copyright reasons')

 
         streams = self._download_json(
             'http://playapi.mtgx.tv/v1/videos/stream/%s' % video_id, video_id, 'Downloading streams JSON')
 
         streams = self._download_json(
             'http://playapi.mtgx.tv/v1/videos/stream/%s' % video_id, video_id, 'Downloading streams JSON')


@@ -208,6 +225,10 @@ class TVPlayIE(InfoExtractor):
                     'app': m.group('app'),
                     'play_path': m.group('playpath'),
                 })
                     'app': m.group('app'),
                     'play_path': m.group('playpath'),
                 })

+            elif video_url.endswith('.f4m'):
+                formats.extend(self._extract_f4m_formats(
+                    video_url + '?hdcore=3.5.0&plugin=aasp-3.5.0.151.81', video_id))
+                continue

             else:
                 fmt.update({
                     'url': video_url,
             else:
                 fmt.update({
                     'url': video_url,