[franceinter] Fix extraction and modernize
parent
f566d9f1d5
commit
532f5bff70
|
@ -4,16 +4,21 @@ from __future__ import unicode_literals
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
|
from ..utils import int_or_none
|
||||||
|
|
||||||
|
|
||||||
class FranceInterIE(InfoExtractor):
|
class FranceInterIE(InfoExtractor):
|
||||||
_VALID_URL = r'http://(?:www\.)?franceinter\.fr/player/reecouter\?play=(?P<id>[0-9]{6})'
|
_VALID_URL = r'http://(?:www\.)?franceinter\.fr/player/reecouter\?play=(?P<id>[0-9]+)'
|
||||||
_TEST = {
|
_TEST = {
|
||||||
'url': 'http://www.franceinter.fr/player/reecouter?play=793962',
|
'url': 'http://www.franceinter.fr/player/reecouter?play=793962',
|
||||||
'file': '793962.mp3',
|
|
||||||
'md5': '4764932e466e6f6c79c317d2e74f6884',
|
'md5': '4764932e466e6f6c79c317d2e74f6884',
|
||||||
"info_dict": {
|
"info_dict": {
|
||||||
"title": "L’Histoire dans les jeux vidéo",
|
'id': '793962',
|
||||||
|
'ext': 'mp3',
|
||||||
|
'title': 'L’Histoire dans les jeux vidéo',
|
||||||
|
'description': 'md5:7e93ddb4451e7530022792240a3049c7',
|
||||||
|
'timestamp': 1387369800,
|
||||||
|
'upload_date': '20131218',
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,17 +27,26 @@ class FranceInterIE(InfoExtractor):
|
||||||
video_id = mobj.group('id')
|
video_id = mobj.group('id')
|
||||||
|
|
||||||
webpage = self._download_webpage(url, video_id)
|
webpage = self._download_webpage(url, video_id)
|
||||||
title = self._html_search_regex(
|
|
||||||
r'<span class="roll_overflow">(.*?)</span></h1>', webpage, 'title')
|
|
||||||
path = self._search_regex(
|
path = self._search_regex(
|
||||||
r'&urlAOD=(.*?)&startTime', webpage, 'video url')
|
r'<a id="player".+?href="([^"]+)"', webpage, 'video url')
|
||||||
video_url = 'http://www.franceinter.fr/' + path
|
video_url = 'http://www.franceinter.fr/' + path
|
||||||
|
|
||||||
|
title = self._html_search_regex(
|
||||||
|
r'<span class="title">(.+?)</span>', webpage, 'title')
|
||||||
|
description = self._html_search_regex(
|
||||||
|
r'<span class="description">(.*?)</span>',
|
||||||
|
webpage, 'description', fatal=False)
|
||||||
|
timestamp = int_or_none(self._search_regex(
|
||||||
|
r'data-date="(\d+)"', webpage, 'upload date', fatal=False))
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
|
'title': title,
|
||||||
|
'description': description,
|
||||||
|
'timestamp': timestamp,
|
||||||
'formats': [{
|
'formats': [{
|
||||||
'url': video_url,
|
'url': video_url,
|
||||||
'vcodec': 'none',
|
'vcodec': 'none',
|
||||||
}],
|
}],
|
||||||
'title': title,
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue