From 0b6645fdb50d388716cff5b5e072945aa9686939 Mon Sep 17 00:00:00 2001 From: Steven Gosseling Date: Sat, 27 Feb 2016 18:06:38 +0100 Subject: [PATCH] processed comments on commit 5650b0d, fixed feedback from flake8 --- youtube_dl/extractor/closertotruth.py | 47 +++++++-------------------- 1 file changed, 12 insertions(+), 35 deletions(-) diff --git a/youtube_dl/extractor/closertotruth.py b/youtube_dl/extractor/closertotruth.py index 11781b0b7..1e5fa1be5 100644 --- a/youtube_dl/extractor/closertotruth.py +++ b/youtube_dl/extractor/closertotruth.py @@ -2,14 +2,9 @@ from __future__ import unicode_literals import re -import itertools -import hashlib from .common import InfoExtractor -from ..utils import ( - int_or_none, - unified_strdate, -) + class CloserToTruthIE(InfoExtractor): _VALID_URL = r'http?://(?:www\.)?closertotruth\.com/series/\S+#video-(?P\w+)' @@ -17,45 +12,27 @@ class CloserToTruthIE(InfoExtractor): 'url': 'http://closertotruth.com/series/solutions-the-mind-body-problem#video-3688', 'md5': '2aa5b8971633d86fe32152827846a5b4', 'info_dict': { - 'id': '3688', + 'id': '0_zh2b6eqr', 'ext': 'mov', - 'title': 'Solutions to the Mind-Body Problem? - Dean W.Zimmerman ' - } - },{ - 'url': 'http://closertotruth.com/series/solutions-the-mind-body-problem#video-4048', - 'md5': 'a3882bb6e453720d8a7a3983f58abd04', - 'info_dict': { - 'id': '4048', - 'ext': 'mov', - 'title': 'Solutions to the Mind-Body Problem? - John Searle ' + 'title': 'ZimDe-010-S', + 'upload_date': '20140307', + 'timestamp': 1394236392, + 'uploader_id': 'CTTXML' } }] - def _real_extract(self, url): video_id = self._match_id(url) webpage = self._download_webpage(url, video_id) - - #compose title for video + video_title = self._search_regex(r'(.+) \|.+', webpage, 'video title') - entry_id = self._search_regex(r'.+', webpage, "video entry_id") - interviewee_name = re.sub(r'(<[^>]+>)', '',self._search_regex(r'(.+)', webpage, "video interviewee_name")) + entry_id = self._search_regex(r'.+', webpage, "video entry_id") + interviewee_name = re.sub(r'(<[^>]+>)', '', self._search_regex(r'(.+)', webpage, "video interviewee_name")) video_title = video_title + ' - ' + interviewee_name - #extract the partner id for kaltura.com + # extract the partner id for kaltura.com p_id = self._search_regex(r'', webpage, "kaltura partner_id") - - #request video url at kaltura API - #from: http://knowledge.kaltura.com/faq/how-retrieve-download-or-streaming-url-using-api-calls - api_request_url = 'http://www.kaltura.com/p/'+p_id+'/sp/0/playManifest/entryId/'+entry_id+'/protocol/HTTPS/flavorParamId/0/video.mp4' - api_response = self._download_webpage(api_request_url, video_id) - - video_url = self._search_regex(r'