debian/control: Prefer mplayer to mplayer2 in Recommends.

[youtubedl] / youtube_dl / extractor / arte.py

diff --git a/youtube_dl/extractor/arte.py b/youtube_dl/extractor/arte.py
index 929dd3cc5550beb1b2da8874763084b5146d2f33..76de244774369dd53c510961ecf6b6a7641c7027 100644 (file)
--- a/youtube_dl/extractor/arte.py
+++ b/youtube_dl/extractor/arte.py
@@ -7,7 +7,6 @@ from .common import InfoExtractor
 from ..utils import (
     find_xpath_attr,
     unified_strdate,
 from ..utils import (
     find_xpath_attr,
     unified_strdate,

-    get_element_by_id,

     get_element_by_attribute,
     int_or_none,
     qualities,
     get_element_by_attribute,
     int_or_none,
     qualities,


@@ -146,6 +145,7 @@ class ArteTVPlus7IE(InfoExtractor):
 
             formats.append(format)
 
 
             formats.append(format)
 

+        self._check_formats(formats, video_id)

         self._sort_formats(formats)
 
         info_dict['formats'] = formats
         self._sort_formats(formats)
 
         info_dict['formats'] = formats


@@ -194,7 +194,9 @@ class ArteTVFutureIE(ArteTVPlus7IE):
     def _real_extract(self, url):
         anchor_id, lang = self._extract_url_info(url)
         webpage = self._download_webpage(url, anchor_id)
     def _real_extract(self, url):
         anchor_id, lang = self._extract_url_info(url)
         webpage = self._download_webpage(url, anchor_id)

-        row = get_element_by_id(anchor_id, webpage)
+        row = self._search_regex(
+            r'(?s)id="%s"[^>]*>.+?(<div[^>]*arte_vp_url[^>]*>)' % anchor_id,
+            webpage, 'row')

         return self._extract_from_webpage(row, anchor_id, lang)
 
 
         return self._extract_from_webpage(row, anchor_id, lang)