commit: 1bc1520adcc39a8511c89efa545f46b8fc479629
parent 022e05dc1f6a09f3580c6cd3abdc3f65d2a54505
Author: Remita Amine <remitamine@gmail.com>
Date: Tue, 15 Dec 2020 19:07:14 +0100
[noco] Remove Extractor(closes #10864)
Diffstat:
2 files changed, 0 insertions(+), 236 deletions(-)
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
@@ -747,7 +747,6 @@ from .ninenow import NineNowIE
from .nintendo import NintendoIE
from .njpwworld import NJPWWorldIE
from .nobelprize import NobelPrizeIE
-from .noco import NocoIE
from .nonktube import NonkTubeIE
from .noovo import NoovoIE
from .normalboots import NormalbootsIE
diff --git a/youtube_dl/extractor/noco.py b/youtube_dl/extractor/noco.py
@@ -1,235 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import re
-import time
-import hashlib
-
-from .common import InfoExtractor
-from ..compat import (
- compat_str,
- compat_urlparse,
-)
-from ..utils import (
- clean_html,
- ExtractorError,
- int_or_none,
- float_or_none,
- parse_iso8601,
- sanitized_Request,
- urlencode_postdata,
-)
-
-
-class NocoIE(InfoExtractor):
- _VALID_URL = r'https?://(?:(?:www\.)?noco\.tv/emission/|player\.noco\.tv/\?idvideo=)(?P<id>\d+)'
- _LOGIN_URL = 'https://noco.tv/do.php'
- _API_URL_TEMPLATE = 'https://api.noco.tv/1.1/%s?ts=%s&tk=%s'
- _SUB_LANG_TEMPLATE = '&sub_lang=%s'
- _NETRC_MACHINE = 'noco'
-
- _TESTS = [
- {
- 'url': 'http://noco.tv/emission/11538/nolife/ami-ami-idol-hello-france/',
- 'md5': '0a993f0058ddbcd902630b2047ef710e',
- 'info_dict': {
- 'id': '11538',
- 'ext': 'mp4',
- 'title': 'Ami Ami Idol - Hello! France',
- 'description': 'md5:4eaab46ab68fa4197a317a88a53d3b86',
- 'upload_date': '20140412',
- 'uploader': 'Nolife',
- 'uploader_id': 'NOL',
- 'duration': 2851.2,
- },
- 'skip': 'Requires noco account',
- },
- {
- 'url': 'http://noco.tv/emission/12610/lbl42/the-guild/s01e01-wake-up-call',
- 'md5': 'c190f1f48e313c55838f1f412225934d',
- 'info_dict': {
- 'id': '12610',
- 'ext': 'mp4',
- 'title': 'The Guild #1 - Wake-Up Call',
- 'timestamp': 1403863200,
- 'upload_date': '20140627',
- 'uploader': 'LBL42',
- 'uploader_id': 'LBL',
- 'duration': 233.023,
- },
- 'skip': 'Requires noco account',
- }
- ]
-
- def _real_initialize(self):
- self._login()
-
- def _login(self):
- username, password = self._get_login_info()
- if username is None:
- return
-
- login = self._download_json(
- self._LOGIN_URL, None, 'Logging in',
- data=urlencode_postdata({
- 'a': 'login',
- 'cookie': '1',
- 'username': username,
- 'password': password,
- }),
- headers={
- 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
- })
-
- if 'erreur' in login:
- raise ExtractorError('Unable to login: %s' % clean_html(login['erreur']), expected=True)
-
- @staticmethod
- def _ts():
- return int(time.time() * 1000)
-
- def _call_api(self, path, video_id, note, sub_lang=None):
- ts = compat_str(self._ts() + self._ts_offset)
- tk = hashlib.md5((hashlib.md5(ts.encode('ascii')).hexdigest() + '#8S?uCraTedap6a').encode('ascii')).hexdigest()
- url = self._API_URL_TEMPLATE % (path, ts, tk)
- if sub_lang:
- url += self._SUB_LANG_TEMPLATE % sub_lang
-
- request = sanitized_Request(url)
- request.add_header('Referer', self._referer)
-
- resp = self._download_json(request, video_id, note)
-
- if isinstance(resp, dict) and resp.get('error'):
- self._raise_error(resp['error'], resp['description'])
-
- return resp
-
- def _raise_error(self, error, description):
- raise ExtractorError(
- '%s returned error: %s - %s' % (self.IE_NAME, error, description),
- expected=True)
-
- def _real_extract(self, url):
- video_id = self._match_id(url)
-
- # Timestamp adjustment offset between server time and local time
- # must be calculated in order to use timestamps closest to server's
- # in all API requests (see https://github.com/ytdl-org/youtube-dl/issues/7864)
- webpage = self._download_webpage(url, video_id)
-
- player_url = self._search_regex(
- r'(["\'])(?P<player>https?://noco\.tv/(?:[^/]+/)+NocoPlayer.+?\.swf.*?)\1',
- webpage, 'noco player', group='player',
- default='http://noco.tv/cdata/js/player/NocoPlayer-v1.2.40.swf')
-
- qs = compat_urlparse.parse_qs(compat_urlparse.urlparse(player_url).query)
- ts = int_or_none(qs.get('ts', [None])[0])
- self._ts_offset = ts - self._ts() if ts else 0
- self._referer = player_url
-
- medias = self._call_api(
- 'shows/%s/medias' % video_id,
- video_id, 'Downloading video JSON')
-
- show = self._call_api(
- 'shows/by_id/%s' % video_id,
- video_id, 'Downloading show JSON')[0]
-
- options = self._call_api(
- 'users/init', video_id,
- 'Downloading user options JSON')['options']
- audio_lang_pref = options.get('audio_language') or options.get('language', 'fr')
-
- if audio_lang_pref == 'original':
- audio_lang_pref = show['original_lang']
- if len(medias) == 1:
- audio_lang_pref = list(medias.keys())[0]
- elif audio_lang_pref not in medias:
- audio_lang_pref = 'fr'
-
- qualities = self._call_api(
- 'qualities',
- video_id, 'Downloading qualities JSON')
-
- formats = []
-
- for audio_lang, audio_lang_dict in medias.items():
- preference = 1 if audio_lang == audio_lang_pref else 0
- for sub_lang, lang_dict in audio_lang_dict['video_list'].items():
- for format_id, fmt in lang_dict['quality_list'].items():
- format_id_extended = 'audio-%s_sub-%s_%s' % (audio_lang, sub_lang, format_id)
-
- video = self._call_api(
- 'shows/%s/video/%s/%s' % (video_id, format_id.lower(), audio_lang),
- video_id, 'Downloading %s video JSON' % format_id_extended,
- sub_lang if sub_lang != 'none' else None)
-
- file_url = video['file']
- if not file_url:
- continue
-
- if file_url in ['forbidden', 'not found']:
- popmessage = video['popmessage']
- self._raise_error(popmessage['title'], popmessage['message'])
-
- formats.append({
- 'url': file_url,
- 'format_id': format_id_extended,
- 'width': int_or_none(fmt.get('res_width')),
- 'height': int_or_none(fmt.get('res_lines')),
- 'abr': int_or_none(fmt.get('audiobitrate'), 1000),
- 'vbr': int_or_none(fmt.get('videobitrate'), 1000),
- 'filesize': int_or_none(fmt.get('filesize')),
- 'format_note': qualities[format_id].get('quality_name'),
- 'quality': qualities[format_id].get('priority'),
- 'preference': preference,
- })
-
- self._sort_formats(formats)
-
- timestamp = parse_iso8601(show.get('online_date_start_utc'), ' ')
-
- if timestamp is not None and timestamp < 0:
- timestamp = None
-
- uploader = show.get('partner_name')
- uploader_id = show.get('partner_key')
- duration = float_or_none(show.get('duration_ms'), 1000)
-
- thumbnails = []
- for thumbnail_key, thumbnail_url in show.items():
- m = re.search(r'^screenshot_(?P<width>\d+)x(?P<height>\d+)$', thumbnail_key)
- if not m:
- continue
- thumbnails.append({
- 'url': thumbnail_url,
- 'width': int(m.group('width')),
- 'height': int(m.group('height')),
- })
-
- episode = show.get('show_TT') or show.get('show_OT')
- family = show.get('family_TT') or show.get('family_OT')
- episode_number = show.get('episode_number')
-
- title = ''
- if family:
- title += family
- if episode_number:
- title += ' #' + compat_str(episode_number)
- if episode:
- title += ' - ' + compat_str(episode)
-
- description = show.get('show_resume') or show.get('family_resume')
-
- return {
- 'id': video_id,
- 'title': title,
- 'description': description,
- 'thumbnails': thumbnails,
- 'timestamp': timestamp,
- 'uploader': uploader,
- 'uploader_id': uploader_id,
- 'duration': duration,
- 'formats': formats,
- }