X-Git-Url: https://jfr.im/git/yt-dlp.git/blobdiff_plain/a06916d98e1669f9b7d821bcb3ca6d13bd6429fe..e897bd8292a41999cf51dba91b390db5643c72db:/yt_dlp/extractor/onet.py diff --git a/yt_dlp/extractor/onet.py b/yt_dlp/extractor/onet.py index 219ac349e..da10f3779 100644 --- a/yt_dlp/extractor/onet.py +++ b/yt_dlp/extractor/onet.py @@ -1,17 +1,14 @@ -# coding: utf-8 -from __future__ import unicode_literals - import re from .common import InfoExtractor from ..utils import ( - determine_ext, + NO_DEFAULT, ExtractorError, + determine_ext, float_or_none, get_element_by_class, int_or_none, js_to_json, - NO_DEFAULT, parse_iso8601, remove_start, strip_or_none, @@ -83,7 +80,6 @@ def _extract_from_id(self, video_id, webpage=None): 'vbr': float_or_none(f.get('video_bitrate')), }) formats.append(http_f) - self._sort_formats(formats) meta = video.get('meta', {}) @@ -138,7 +134,7 @@ class OnetIE(OnetBaseIE): }] def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) + mobj = self._match_valid_url(url) display_id, video_id = mobj.group('display_id', 'id') webpage = self._download_webpage(url, display_id) @@ -182,14 +178,9 @@ def _real_extract(self, url): video_id = remove_start(current_clip_info['ckmId'], 'mvp:') video_name = url_basename(current_clip_info['url']) - if self.get_param('noplaylist'): - self.to_screen( - 'Downloading just video %s because of --no-playlist' % video_name) + if not self._yes_playlist(channel_id, video_name, playlist_label='channel'): return self._extract_from_id(video_id, webpage) - self.to_screen( - 'Downloading channel %s - add --no-playlist to just download video %s' % ( - channel_id, video_name)) matches = re.findall( r']+href=[\'"](%s[a-z]+/[0-9a-z-]+/[0-9a-z]+)' % self._URL_BASE_RE, webpage)