From e2447083863615f89ceddf62ded2875496a7a502 Mon Sep 17 00:00:00 2001 From: Daan van Vugt Date: Mon, 17 Dec 2018 08:54:07 +0100 Subject: [PATCH 1/3] Also allow download from mediasite presentations --- youtube_dl/extractor/mediasite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/mediasite.py b/youtube_dl/extractor/mediasite.py index 84876b883..2bdb36e76 100644 --- a/youtube_dl/extractor/mediasite.py +++ b/youtube_dl/extractor/mediasite.py @@ -21,7 +21,7 @@ from ..utils import ( class MediasiteIE(InfoExtractor): - _VALID_URL = r'(?xi)https?://[^/]+/Mediasite/Play/(?P[0-9a-f]{32,34})(?P\?[^#]+|)' + _VALID_URL = r'(?xi)https?://[^/]+/Mediasite/(Play|Showcase/livebroadcast/Presentation)/(?P[0-9a-f]{32,34})(?P\?[^#]+|)' _TESTS = [ { 'url': 'https://hitsmediaweb.h-its.org/mediasite/Play/2db6c271681e4f199af3c60d1f82869b1d', From 049016c97670a411e53d8d84a3b578166d0fde8c Mon Sep 17 00:00:00 2001 From: Daan van Vugt Date: Mon, 17 Dec 2018 09:45:26 +0100 Subject: [PATCH 2/3] Add test --- youtube_dl/extractor/mediasite.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/mediasite.py b/youtube_dl/extractor/mediasite.py index 2bdb36e76..249aac02c 100644 --- a/youtube_dl/extractor/mediasite.py +++ b/youtube_dl/extractor/mediasite.py @@ -21,7 +21,7 @@ from ..utils import ( class MediasiteIE(InfoExtractor): - _VALID_URL = r'(?xi)https?://[^/]+/Mediasite/(Play|Showcase/livebroadcast/Presentation)/(?P[0-9a-f]{32,34})(?P\?[^#]+|)' + _VALID_URL = r'(?xi)https?://[^/]+/Mediasite/(?:Play|Showcase/livebroadcast/Presentation)/(?P[0-9a-f]{32,34})(?P\?[^#]+|)' _TESTS = [ { 'url': 'https://hitsmediaweb.h-its.org/mediasite/Play/2db6c271681e4f199af3c60d1f82869b1d', @@ -84,7 +84,20 @@ class MediasiteIE(InfoExtractor): 'timestamp': 1333983600, 'duration': 7794, } - } + }, + { + 'url': 'https://collegerama.tudelft.nl/Mediasite/Showcase/livebroadcast/Presentation/ada7020854f743c49fbb45c9ec7dbb351d', + 'info_dict': { + 'id': 'ada7020854f743c49fbb45c9ec7dbb351d', + 'ext': 'mp4', + 'title': 'Nachtelijk weer: een koud kunstje?', + 'description': '', + 'thumbnail': r're:^https?://.*\.jpg(?:\?.*?)?$', + 'duration': 4000, + 'timestamp': 1542981600, + 'upload_date': '20181123', + }, + }, ] # look in Mediasite.Core.js (Mediasite.ContentStreamType[*]) From e1f3745bc637631835ef2a9a5045a15667d702fa Mon Sep 17 00:00:00 2001 From: Sergey M Date: Tue, 18 Dec 2018 00:02:12 +0700 Subject: [PATCH 3/3] Update mediasite.py --- youtube_dl/extractor/mediasite.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/youtube_dl/extractor/mediasite.py b/youtube_dl/extractor/mediasite.py index 249aac02c..de37df0c6 100644 --- a/youtube_dl/extractor/mediasite.py +++ b/youtube_dl/extractor/mediasite.py @@ -87,16 +87,7 @@ class MediasiteIE(InfoExtractor): }, { 'url': 'https://collegerama.tudelft.nl/Mediasite/Showcase/livebroadcast/Presentation/ada7020854f743c49fbb45c9ec7dbb351d', - 'info_dict': { - 'id': 'ada7020854f743c49fbb45c9ec7dbb351d', - 'ext': 'mp4', - 'title': 'Nachtelijk weer: een koud kunstje?', - 'description': '', - 'thumbnail': r're:^https?://.*\.jpg(?:\?.*?)?$', - 'duration': 4000, - 'timestamp': 1542981600, - 'upload_date': '20181123', - }, + 'only_matching': True, }, ]