Skip to content

fix aiohttp InvalidURL exception when fetching media player image #15572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 2 commits into from
Jul 20, 2018
Merged

fix aiohttp InvalidURL exception when fetching media player image #15572

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ffc8f5
fix aiohttp InvalidURL exception when fetching media player image
azogue Jul 20, 2018
aa7dcc7
fix import location and sort stdlib imports
azogue Jul 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion homeassistant/components/media_player/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
"""
import asyncio
import base64
import collections
from datetime import timedelta
import functools as ft
import collections
import hashlib
import logging
from random import SystemRandom
from urllib.parse import urlparse

from aiohttp import web
from aiohttp.hdrs import CONTENT_TYPE, CACHE_CONTROL
Expand Down Expand Up @@ -956,6 +957,9 @@ async def _async_fetch_image(hass, url):
cache_images = ENTITY_IMAGE_CACHE[CACHE_IMAGES]
cache_maxsize = ENTITY_IMAGE_CACHE[CACHE_MAXSIZE]

if urlparse(url).hostname is None:
url = hass.config.api.base_url + url

if url not in cache_images:
cache_images[url] = {CACHE_LOCK: asyncio.Lock(loop=hass.loop)}

Expand Down