X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fnoco.py;h=76bd21e6de74642362043183ab3288797e16ae46;hb=682d8dcd21fc70fd6fbff5d541b0edb2b9744d32;hp=098c564bd1805f9541446a406264b608fb8bbbed;hpb=815ac0293ee9d7f3771499cd71d833c83575bec9;p=youtube-dl.git diff --git a/youtube_dl/extractor/noco.py b/youtube_dl/extractor/noco.py index 098c564bd..76bd21e6d 100644 --- a/youtube_dl/extractor/noco.py +++ b/youtube_dl/extractor/noco.py @@ -9,7 +9,6 @@ from .common import InfoExtractor from ..compat import ( compat_str, compat_urllib_parse, - compat_urllib_request, ) from ..utils import ( clean_html, @@ -17,7 +16,7 @@ from ..utils import ( int_or_none, float_or_none, parse_iso8601, - unified_strdate, + sanitized_Request, ) @@ -51,7 +50,7 @@ class NocoIE(InfoExtractor): 'id': '12610', 'ext': 'mp4', 'title': 'The Guild #1 - Wake-Up Call', - 'description': '', + 'timestamp': 1403863200, 'upload_date': '20140627', 'uploader': 'LBL42', 'uploader_id': 'LBL', @@ -75,7 +74,7 @@ class NocoIE(InfoExtractor): 'username': username, 'password': password, } - request = compat_urllib_request.Request(self._LOGIN_URL, compat_urllib_parse.urlencode(login_form)) + request = sanitized_Request(self._LOGIN_URL, compat_urllib_parse.urlencode(login_form)) request.add_header('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8') login = self._download_json(request, None, 'Logging in as %s' % username) @@ -167,6 +166,10 @@ class NocoIE(InfoExtractor): 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) @@ -192,7 +195,7 @@ class NocoIE(InfoExtractor): if episode_number: title += ' #' + compat_str(episode_number) if episode: - title += ' - ' + episode + title += ' - ' + compat_str(episode) description = show.get('show_resume') or show.get('family_resume')