Fix media_extractor for some sites (home-assistant#8887)

shift · Aug 8, 2017 · 588b36d · 588b36d
1 parent cc5893e
commit 588b36d
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/homeassistant/components/media_extractor.py b/homeassistant/components/media_extractor.py
@@ -125,24 +125,13 @@ def get_stream_selector(self):
         else:
             selected_media = all_media
 
-        try:
-            media_info = ydl.process_ie_result(selected_media,
-                                               download=False)
-        except (ExtractorError, DownloadError):
-            # This exception will be logged by youtube-dl itself
-            raise MEDownloadException()
-
         def stream_selector(query):
             """Find stream url that matches query."""
             try:
-                format_selector = ydl.build_format_selector(query)
-            except (SyntaxError, ValueError, AttributeError) as ex:
-                _LOGGER.error(ex)
-                raise MEQueryException()
-
-            try:
-                requested_stream = next(format_selector(media_info))
-            except (KeyError, StopIteration):
+                ydl.params['format'] = query
+                requested_stream = ydl.process_ie_result(selected_media,
+                                                         download=False)
+            except (ExtractorError, DownloadError):
                 _LOGGER.error("Could not extract stream for the query: %s",
                               query)
                 raise MEQueryException()