diff --git a/haruhi_dl/extractor/cda.py b/haruhi_dl/extractor/cda.py index 0c3af23d5..15498dfd1 100644 --- a/haruhi_dl/extractor/cda.py +++ b/haruhi_dl/extractor/cda.py @@ -1,17 +1,17 @@ # coding: utf-8 from __future__ import unicode_literals -import codecs import re from .common import InfoExtractor from ..utils import ( + compat_urllib_parse_unquote_plus, ExtractorError, float_or_none, - int_or_none, multipart_encode, parse_duration, random_birthday, + rot47, urljoin, ) @@ -43,25 +43,21 @@ class CDAIE(InfoExtractor): 'description': 'md5:60d76b71186dcce4e0ba6d4bbdb13e1a', 'thumbnail': r're:^https?://.*\.jpg$', 'uploader': 'crash404', - 'view_count': int, 'average_rating': float, 'duration': 137, 'age_limit': 0, } }, { # Age-restricted - 'url': 'http://www.cda.pl/video/1273454c4', + 'url': 'https://www.cda.pl/video/225836e', 'info_dict': { - 'id': '1273454c4', + 'id': '225836e', 'ext': 'mp4', - 'title': 'Bronson (2008) napisy HD 1080p', - 'description': 'md5:1b6cb18508daf2dc4e0fa4db77fec24c', - 'height': 1080, - 'uploader': 'boniek61', + 'title': 'Cycki', + 'description': 'cycki cycuszki fajne ciekawe azja ajzatka', 'thumbnail': r're:^https?://.*\.jpg$', - 'duration': 5554, + 'duration': 6, 'age_limit': 18, - 'view_count': int, 'average_rating': float, }, }, { @@ -90,7 +86,7 @@ class CDAIE(InfoExtractor): raise ExtractorError('This video is only available for premium users.', expected=True) need_confirm_age = False - if self._html_search_regex(r'(