diff --git a/youtube_dl/extractor/markiza.py b/youtube_dl/extractor/markiza.py index 67a9bb07c..cf879bc71 100644 --- a/youtube_dl/extractor/markiza.py +++ b/youtube_dl/extractor/markiza.py @@ -1,20 +1,21 @@ # coding: utf-8 from __future__ import unicode_literals -# update 15.01.2022 jastrab import re -import json from .common import InfoExtractor from ..utils import ( orderedSet, url_or_none, - determine_ext + determine_ext, + try_get, + compat_str ) class MarkizaIE(InfoExtractor): - _VALID_URL = r'https:\/\/(?:www\.)?videoarchiv\.markiza\.sk\/(?:video\/(?:[^\/]+\/)*|embed\/)epizoda\/(?P\d+)(?:[\_\/\-]|$)' + _VALID_URL = r'https?://(?:www\.)?videoarchiv\.markiza\.sk/(?:video/(?:[^/]+/)*|embed/)\S+/(?P\d+)(?:[_/-]|$)' + _TESTS = [{ 'url': 'http://videoarchiv.markiza.sk/video/oteckovia/\ 84723_oteckovia-109', @@ -28,7 +29,7 @@ class MarkizaIE(InfoExtractor): 'duration': 2760, }, }, { - 'url': ' https://videoarchiv.markiza.sk/video/laska-na-prenajom/epizoda/58779-seria-1-epizoda-14', + 'url': 'https://videoarchiv.markiza.sk/video/laska-na-prenajom/epizoda/58779-seria-1-epizoda-14', 'info_dict': { 'id': '85430', 'title': 'Televízne noviny', @@ -52,31 +53,37 @@ class MarkizaIE(InfoExtractor): }] def _real_extract(self, url): + video_id = self._match_id(url) + webpage = self._download_webpage(url, video_id) + embed = self._search_regex( r'