From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 7 Jul 2013 23:28:19 +0000 (+0200)
Subject: [arte] Always look for the JSON URL (Fixes #1002)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=b227060388b43f0a7f6efb3cc2b785e64e0643ba;p=youtube-dl

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

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)