[arte] Always look for the JSON URL (Fixes #1002)

This commit is contained in:
Philipp Hagemeister 2013-07-08 01:28:19 +02:00
parent d93e4dcbb7
commit b227060388

View File

@ -77,12 +77,8 @@ def _real_extract(self, url):
def _extract_emission(self, url, video_id, lang): def _extract_emission(self, url, video_id, lang):
"""Extract from www.arte.tv/guide""" """Extract from www.arte.tv/guide"""
if video_id.replace('-','').isdigit(): webpage = self._download_webpage(url, video_id)
json_url = 'http://org-www.arte.tv/papi/tvguide/videos/stream/player/F/%s_PLUS7-F/ALL/ALL.json' % video_id json_url = self._html_search_regex(r'arte_vp_url="(.*?)"', webpage, 'json url')
else:
# We don't know the real id of the video, we have to search in the webpage
webpage = self._download_webpage(url, video_id)
json_url = self._html_search_regex(r'arte_vp_url="(.*?)"', webpage, 'json url')
json_info = self._download_webpage(json_url, video_id, 'Downloading info json') json_info = self._download_webpage(json_url, video_id, 'Downloading info json')
self.report_extraction(video_id) self.report_extraction(video_id)