diff options
author | Rogério Brito <rbrito@ime.usp.br> | 2018-01-04 03:48:45 -0200 |
---|---|---|
committer | Rogério Brito <rbrito@ime.usp.br> | 2018-01-04 03:48:45 -0200 |
commit | b4a0c9f9de9d715538a1718922d6ab01a40f7ce3 (patch) | |
tree | 2bd8b6c5ac3b08a19a6c6f173e332eddca024bd6 /youtube_dl/extractor/freespeech.py | |
parent | 32ad8acade51269177cd01c5aa3c7169557eeac8 (diff) | |
download | youtube-dl-b4a0c9f9de9d715538a1718922d6ab01a40f7ce3.zip youtube-dl-b4a0c9f9de9d715538a1718922d6ab01a40f7ce3.tar.gz youtube-dl-b4a0c9f9de9d715538a1718922d6ab01a40f7ce3.tar.bz2 |
New upstream version 2017.12.31
Diffstat (limited to 'youtube_dl/extractor/freespeech.py')
-rw-r--r-- | youtube_dl/extractor/freespeech.py | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/youtube_dl/extractor/freespeech.py b/youtube_dl/extractor/freespeech.py index 7fa271b..486a49c 100644 --- a/youtube_dl/extractor/freespeech.py +++ b/youtube_dl/extractor/freespeech.py @@ -1,37 +1,34 @@ from __future__ import unicode_literals -import re -import json - from .common import InfoExtractor class FreespeechIE(InfoExtractor): IE_NAME = 'freespeech.org' - _VALID_URL = r'https?://(?:www\.)?freespeech\.org/video/(?P<title>.+)' + _VALID_URL = r'https?://(?:www\.)?freespeech\.org/stories/(?P<id>.+)' _TEST = { 'add_ie': ['Youtube'], - 'url': 'https://www.freespeech.org/video/obama-romney-campaign-colorado-ahead-debate-0', + 'url': 'http://www.freespeech.org/stories/fcc-announces-net-neutrality-rollback-whats-stake/', 'info_dict': { - 'id': 'poKsVCZ64uU', - 'ext': 'webm', - 'title': 'Obama, Romney Campaign in Colorado Ahead of Debate', - 'description': 'Obama, Romney Campaign in Colorado Ahead of Debate', - 'uploader': 'freespeechtv', + 'id': 'waRk6IPqyWM', + 'ext': 'mp4', + 'title': 'What\'s At Stake - Net Neutrality Special', + 'description': 'Presented by MNN and FSTV', + 'upload_date': '20170728', 'uploader_id': 'freespeechtv', - 'upload_date': '20121002', + 'uploader': 'freespeechtv', }, } def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - title = mobj.group('title') - webpage = self._download_webpage(url, title) - info_json = self._search_regex(r'jQuery\.extend\(Drupal\.settings, ({.*?})\);', webpage, 'info') - info = json.loads(info_json) + display_id = self._match_id(url) + webpage = self._download_webpage(url, display_id) + youtube_url = self._search_regex( + r'data-video-url="([^"]+)"', + webpage, 'youtube url') return { '_type': 'url', - 'url': info['jw_player']['basic_video_node_player']['file'], + 'url': youtube_url, 'ie_key': 'Youtube', } |