diff --git a/youtube_dl/extractor/joj.py b/youtube_dl/extractor/joj.py index 62b28e980..fb9c4393d 100644 --- a/youtube_dl/extractor/joj.py +++ b/youtube_dl/extractor/joj.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals import re +import json from .common import InfoExtractor from ..compat import compat_str @@ -21,7 +22,8 @@ class JojIE(InfoExtractor): (?P[^/?#^]+) ''' _TESTS = [{ - 'url': 'https://media.joj.sk/embed/a388ec4c-6019-4a4a-9312-b1bee194e932', + 'url': + 'https://media.joj.sk/embed/a388ec4c-6019-4a4a-9312-b1bee194e932', 'info_dict': { 'id': 'a388ec4c-6019-4a4a-9312-b1bee194e932', 'ext': 'mp4', @@ -64,16 +66,20 @@ class JojIE(InfoExtractor): r'(?s)(?:src|bitrates)\s*=\s*({.+?});', webpage, 'bitrates', default='{}'), video_id, transform_source=js_to_json, fatal=False) + quality = self._search_regex( + r'var qualityLabels = ({.*?});', webpage, 'quality', default=None) + quality = json.loads(quality) formats = [] for format_url in try_get(bitrates, lambda x: x['mp4'], list) or []: if isinstance(format_url, compat_str): height = self._search_regex( - r'(\d+)[pP]\.', format_url, 'height', default=None) + r'-(\d+)p?\.', format_url, 'height', default=None) formats.append({ 'url': format_url, 'format_id': '%sp' % height if height else None, 'height': int(height), + 'resolution': quality.get(compat_str(height)+'p') }) if not formats: playlist = self._download_xml( @@ -104,5 +110,5 @@ class JojIE(InfoExtractor): 'title': title, 'thumbnail': thumbnail, 'duration': duration, - 'formats': formats, + 'formats': formats } diff --git a/youtube_dl/extractor/markiza.py b/youtube_dl/extractor/markiza.py index def960a0c..67a9bb07c 100644 --- a/youtube_dl/extractor/markiza.py +++ b/youtube_dl/extractor/markiza.py @@ -1,21 +1,23 @@ # coding: utf-8 from __future__ import unicode_literals +# update 15.01.2022 jastrab import re +import json from .common import InfoExtractor -from ..compat import compat_str from ..utils import ( orderedSet, - parse_duration, - try_get, + url_or_none, + determine_ext ) class MarkizaIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?videoarchiv\.markiza\.sk/(?:video/(?:[^/]+/)*|embed/)(?P\d+)(?:[_/]|$)' + _VALID_URL = r'https:\/\/(?:www\.)?videoarchiv\.markiza\.sk\/(?:video\/(?:[^\/]+\/)*|embed\/)epizoda\/(?P\d+)(?:[\_\/\-]|$)' _TESTS = [{ - 'url': 'http://videoarchiv.markiza.sk/video/oteckovia/84723_oteckovia-109', + 'url': 'http://videoarchiv.markiza.sk/video/oteckovia/\ + 84723_oteckovia-109', 'md5': 'ada4e9fad038abeed971843aa028c7b0', 'info_dict': { 'id': '139078', @@ -26,54 +28,89 @@ class MarkizaIE(InfoExtractor): 'duration': 2760, }, }, { - 'url': 'http://videoarchiv.markiza.sk/video/televizne-noviny/televizne-noviny/85430_televizne-noviny', + 'url': ' https://videoarchiv.markiza.sk/video/laska-na-prenajom/epizoda/58779-seria-1-epizoda-14', 'info_dict': { 'id': '85430', 'title': 'Televízne noviny', }, 'playlist_count': 23, }, { - 'url': 'http://videoarchiv.markiza.sk/video/oteckovia/84723', + 'url': 'https://videoarchiv.markiza.sk/video/oteckovia/84723', 'only_matching': True, }, { - 'url': 'http://videoarchiv.markiza.sk/video/84723', + 'url': 'https://videoarchiv.markiza.sk/video/84723', 'only_matching': True, }, { - 'url': 'http://videoarchiv.markiza.sk/video/filmy/85190_kamenak', + 'url': 'https://videoarchiv.markiza.sk/video/filmy/85190_kamenak', 'only_matching': True, }, { - 'url': 'http://videoarchiv.markiza.sk/video/reflex/zo-zakulisia/84651_pribeh-alzbetky', + 'url': 'https://videoarchiv.markiza.sk/video/reflex/zo-zakulisia/84651_pribeh-alzbetky', 'only_matching': True, }, { - 'url': 'http://videoarchiv.markiza.sk/embed/85295', + 'url': 'https://videoarchiv.markiza.sk/embed/85295', 'only_matching': True, }] def _real_extract(self, url): video_id = self._match_id(url) + webpage = self._download_webpage(url, video_id) + embed = self._search_regex( + r'