Update upstream source from tag 'upstream/2019.06.08'

[youtubedl] / youtube_dl / extractor / unistra.py

diff --git a/youtube_dl/extractor/unistra.py b/youtube_dl/extractor/unistra.py
index f70978299ac9e682f5cdb99a7396541fd08c115c..a724cdbef8620821e65cb22324fcfcb33c1a3b4c 100644 (file)
--- a/youtube_dl/extractor/unistra.py
+++ b/youtube_dl/extractor/unistra.py
@@ -7,7 +7,7 @@ from ..utils import qualities
 
 
 class UnistraIE(InfoExtractor):
 
 
 class UnistraIE(InfoExtractor):

-    _VALID_URL = r'http://utv\.unistra\.fr/(?:index|video)\.php\?id_video\=(?P<id>\d+)'
+    _VALID_URL = r'https?://utv\.unistra\.fr/(?:index|video)\.php\?id_video\=(?P<id>\d+)'

 
     _TESTS = [
         {
 
     _TESTS = [
         {


@@ -38,7 +38,7 @@ class UnistraIE(InfoExtractor):
 
         webpage = self._download_webpage(url, video_id)
 
 
         webpage = self._download_webpage(url, video_id)
 

-        files = set(re.findall(r'file\s*:\s*"([^"]+)"', webpage))
+        files = set(re.findall(r'file\s*:\s*"(/[^"]+)"', webpage))

 
         quality = qualities(['SD', 'HD'])
         formats = []
 
         quality = qualities(['SD', 'HD'])
         formats = []


@@ -49,6 +49,7 @@ class UnistraIE(InfoExtractor):
                 'format_id': format_id,
                 'quality': quality(format_id)
             })
                 'format_id': format_id,
                 'quality': quality(format_id)
             })

+        self._sort_formats(formats)

 
         title = self._html_search_regex(
             r'<title>UTV - (.*?)</', webpage, 'title')
 
         title = self._html_search_regex(
             r'<title>UTV - (.*?)</', webpage, 'title')