New upstream version 2019.07.02

[youtubedl] / youtube_dl / extractor / wistia.py

diff --git a/youtube_dl/extractor/wistia.py b/youtube_dl/extractor/wistia.py
index 2182d6fd485bf4f1ed6ead7d78451b7c357ddc37..fa142b974ae873a7883ede4894421f4f8a010549 100644 (file)
--- a/youtube_dl/extractor/wistia.py
+++ b/youtube_dl/extractor/wistia.py
@@ -12,7 +12,7 @@ from ..utils import (
 
 
 class WistiaIE(InfoExtractor):
 
 
 class WistiaIE(InfoExtractor):

-    _VALID_URL = r'(?:wistia:|https?://(?:fast\.)?wistia\.net/embed/iframe/)(?P<id>[a-z0-9]+)'
+    _VALID_URL = r'(?:wistia:|https?://(?:fast\.)?wistia\.(?:net|com)/embed/(?:iframe|medias)/)(?P<id>[a-z0-9]+)'

     _API_URL = 'http://fast.wistia.com/embed/medias/%s.json'
     _IFRAME_URL = 'http://fast.wistia.net/embed/iframe/%s'
 
     _API_URL = 'http://fast.wistia.com/embed/medias/%s.json'
     _IFRAME_URL = 'http://fast.wistia.net/embed/iframe/%s'
 


@@ -35,12 +35,18 @@ class WistiaIE(InfoExtractor):
         # with hls video
         'url': 'wistia:807fafadvk',
         'only_matching': True,
         # with hls video
         'url': 'wistia:807fafadvk',
         'only_matching': True,

+    }, {
+        'url': 'http://fast.wistia.com/embed/iframe/sh7fpupwlt',
+        'only_matching': True,
+    }, {
+        'url': 'http://fast.wistia.net/embed/medias/sh7fpupwlt.json',
+        'only_matching': True,

     }]
 
     @staticmethod
     def _extract_url(webpage):
         match = re.search(
     }]
 
     @staticmethod
     def _extract_url(webpage):
         match = re.search(

-            r'<(?:meta[^>]+?content|iframe[^>]+?src)=(["\'])(?P<url>(?:https?:)?//(?:fast\.)?wistia\.net/embed/iframe/.+?)\1', webpage)
+            r'<(?:meta[^>]+?content|iframe[^>]+?src)=(["\'])(?P<url>(?:https?:)?//(?:fast\.)?wistia\.(?:net|com)/embed/iframe/.+?)\1', webpage)

         if match:
             return unescapeHTML(match.group('url'))
 
         if match:
             return unescapeHTML(match.group('url'))