[extractor/opencast] Add ltitools to _VALID_URL (#6371)

Authored by: C0D3D3V
This commit is contained in:
Daniel Vogt 2023-03-09 17:21:39 +01:00 committed by GitHub
parent 2d5cae9636
commit 3588be59ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -105,10 +105,9 @@ def _parse_mediapackage(self, video):
class OpencastIE(OpencastBaseIE): class OpencastIE(OpencastBaseIE):
_VALID_URL = r'''(?x) _VALID_URL = rf'''(?x)
https?://(?P<host>%s)/paella/ui/watch.html\?.*? https?://(?P<host>{OpencastBaseIE._INSTANCES_RE})/paella/ui/watch\.html\?
id=(?P<id>%s) (?:[^#]+&)?id=(?P<id>{OpencastBaseIE._UUID_RE})'''
''' % (OpencastBaseIE._INSTANCES_RE, OpencastBaseIE._UUID_RE)
_API_BASE = 'https://%s/search/episode.json?id=%s' _API_BASE = 'https://%s/search/episode.json?id=%s'
@ -123,6 +122,9 @@ class OpencastIE(OpencastBaseIE):
'thumbnail': r're:^https?://.*\.jpg$', 'thumbnail': r're:^https?://.*\.jpg$',
'timestamp': 1606208400, 'timestamp': 1606208400,
'upload_date': '20201124', 'upload_date': '20201124',
'season_id': 'cf68a4a1-36b1-4a53-a6ba-61af5705a0d0',
'series': 'Kryptographie - WiSe 15/16',
'creator': 'Alexander May',
}, },
} }
] ]
@ -134,10 +136,11 @@ def _real_extract(self, url):
class OpencastPlaylistIE(OpencastBaseIE): class OpencastPlaylistIE(OpencastBaseIE):
_VALID_URL = r'''(?x) _VALID_URL = rf'''(?x)
https?://(?P<host>%s)/engage/ui/index.html\?.*? https?://(?P<host>{OpencastBaseIE._INSTANCES_RE})(?:
epFrom=(?P<id>%s) /engage/ui/index\.html\?(?:[^#]+&)?epFrom=|
''' % (OpencastBaseIE._INSTANCES_RE, OpencastBaseIE._UUID_RE) /ltitools/index\.html\?(?:[^#]+&)?series=
)(?P<id>{OpencastBaseIE._UUID_RE})'''
_API_BASE = 'https://%s/search/episode.json?sid=%s' _API_BASE = 'https://%s/search/episode.json?sid=%s'
@ -148,15 +151,23 @@ class OpencastPlaylistIE(OpencastBaseIE):
'id': 'cf68a4a1-36b1-4a53-a6ba-61af5705a0d0', 'id': 'cf68a4a1-36b1-4a53-a6ba-61af5705a0d0',
'title': 'Kryptographie - WiSe 15/16', 'title': 'Kryptographie - WiSe 15/16',
}, },
'playlist_mincount': 28, 'playlist_mincount': 29,
}, },
{ {
'url': 'https://oc-video.ruhr-uni-bochum.de/engage/ui/index.html?e=1&p=1&epFrom=b1a54262-3684-403f-9731-8e77c3766f9a', 'url': 'https://oc-video1.ruhr-uni-bochum.de/ltitools/index.html?subtool=series&series=cf68a4a1-36b1-4a53-a6ba-61af5705a0d0&lng=de',
'info_dict': { 'info_dict': {
'id': 'b1a54262-3684-403f-9731-8e77c3766f9a', 'id': 'cf68a4a1-36b1-4a53-a6ba-61af5705a0d0',
'title': 'inSTUDIES-Social movements and prefigurative politics in a global perspective', 'title': 'Kryptographie - WiSe 15/16',
}, },
'playlist_mincount': 6, 'playlist_mincount': 29,
},
{
'url': 'https://electures.uni-muenster.de/engage/ui/index.html?e=1&p=1&epFrom=39391d10-a711-4d23-b21d-afd2ed7d758c',
'info_dict': {
'id': '39391d10-a711-4d23-b21d-afd2ed7d758c',
'title': '021670 Theologische Themen bei Hans Blumenberg WiSe 2017/18',
},
'playlist_mincount': 13,
}, },
] ]