X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fcrunchyroll.py;h=cc141f68ec52f4d3b7f795a099b5b1ccf310fdbb;hb=853a71b628bbf1626c301dc66f496464ad796b2e;hp=95952bc292c05548a88876b7b52cf236f8bdc826;hpb=3ebc121293bde30ffafed6731ee8507911b9f952;p=youtube-dl diff --git a/youtube_dl/extractor/crunchyroll.py b/youtube_dl/extractor/crunchyroll.py index 95952bc29..cc141f68e 100644 --- a/youtube_dl/extractor/crunchyroll.py +++ b/youtube_dl/extractor/crunchyroll.py @@ -1,18 +1,17 @@ -# encoding: utf-8 +# coding: utf-8 from __future__ import unicode_literals import re import json import base64 import zlib -import xml.etree.ElementTree from hashlib import sha1 from math import pow, sqrt, floor from .common import InfoExtractor from ..compat import ( - compat_urllib_parse, - compat_urllib_parse_unquote, + compat_etree_fromstring, + compat_urllib_parse_urlencode, compat_urllib_request, compat_urlparse, ) @@ -21,10 +20,13 @@ from ..utils import ( bytes_to_intlist, intlist_to_bytes, int_or_none, + lowercase_escape, remove_end, + sanitized_Request, unified_strdate, urlencode_postdata, xpath_text, + extract_attributes, ) from ..aes import ( aes_cbc_decrypt, @@ -32,9 +34,65 @@ from ..aes import ( class CrunchyrollBaseIE(InfoExtractor): - def _download_webpage(self, url_or_request, video_id, note=None, errnote=None, fatal=True, tries=1, timeout=5, encoding=None): + _LOGIN_URL = 'https://www.crunchyroll.com/login' + _LOGIN_FORM = 'login_form' + _NETRC_MACHINE = 'crunchyroll' + + def _login(self): + (username, password) = self._get_login_info() + if username is None: + return + + login_page = self._download_webpage( + self._LOGIN_URL, None, 'Downloading login page') + + def is_logged(webpage): + return '