summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPhilipp Hagemeister <[email protected]>2013-07-08 01:28:19 +0200
committerPhilipp Hagemeister <[email protected]>2013-07-08 01:28:19 +0200
commitb227060388b43f0a7f6efb3cc2b785e64e0643ba (patch)
tree04a88ac63f5c17bac327d5d7e1298f927162138f
parentd93e4dcbb7fb68666528e251623b90d832d9cffc (diff)
downloadyoutube-dl-b227060388b43f0a7f6efb3cc2b785e64e0643ba.tar.gz
youtube-dl-b227060388b43f0a7f6efb3cc2b785e64e0643ba.zip
[arte] Always look for the JSON URL (Fixes #1002)
-rw-r--r--youtube_dl/extractor/arte.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/youtube_dl/extractor/arte.py b/youtube_dl/extractor/arte.py
index f52672490..b7a2a8d48 100644
--- a/youtube_dl/extractor/arte.py
+++ b/youtube_dl/extractor/arte.py
@@ -77,12 +77,8 @@ class ArteTvIE(InfoExtractor):
def _extract_emission(self, url, video_id, lang):
"""Extract from www.arte.tv/guide"""
- if video_id.replace('-','').isdigit():
- json_url = 'http://org-www.arte.tv/papi/tvguide/videos/stream/player/F/%s_PLUS7-F/ALL/ALL.json' % video_id
- 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')
+ 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')
self.report_extraction(video_id)