evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Local Media in Media Browser (#45987)

Browse source 
Co-authored-by: Paulus Schoutsen <balloob@gmail.com>
This commit is contained in:
DeadEnd 2021-02-04 11:02:56 -05:00 • committed by GitHub
parent 56b8e82a69
commit 7b280bdbe7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
homeassistant/components/media_source/local_source.py
View file

@ -10,7 +10,7 @@ from homeassistant.components.media_player.const import MEDIA_CLASS_DIRECTORY
from homeassistant.components.media_player.errors import BrowseError from homeassistant.components.media_player.errors import BrowseError
from homeassistant.components.media_source.error import Unresolvable from homeassistant.components.media_source.error import Unresolvable
from homeassistant.core import HomeAssistant, callback from homeassistant.core import HomeAssistant, callback
from homeassistant.util import raise_if_invalid_filename from homeassistant.util import raise_if_invalid_path
from .const import DOMAIN, MEDIA_CLASS_MAP, MEDIA_MIME_TYPES from .const import DOMAIN, MEDIA_CLASS_MAP, MEDIA_MIME_TYPES
from .models import BrowseMediaSource, MediaSource, MediaSourceItem, PlayMedia from .models import BrowseMediaSource, MediaSource, MediaSourceItem, PlayMedia
@ -51,7 +51,7 @@ class LocalSource(MediaSource):
raise Unresolvable("Unknown source directory.") raise Unresolvable("Unknown source directory.")
try: try:
raise_if_invalid_filename(location) raise_if_invalid_path(location)
except ValueError as err: except ValueError as err:
raise Unresolvable("Invalid path.") from err raise Unresolvable("Invalid path.") from err
@ -192,7 +192,7 @@ class LocalMediaView(HomeAssistantView):
) -> web.FileResponse: ) -> web.FileResponse:
"""Start a GET request.""" """Start a GET request."""
try: try:
raise_if_invalid_filename(location) raise_if_invalid_path(location)
except ValueError as err: except ValueError as err:
raise web.HTTPBadRequest() from err raise web.HTTPBadRequest() from err

2
tests/components/media_source/test_local_source.py
View file

@ -23,7 +23,7 @@ async def test_async_browse_media(hass):
await media_source.async_browse_media( await media_source.async_browse_media(
hass, f"{const.URI_SCHEME}{const.DOMAIN}/local/test/not/exist" hass, f"{const.URI_SCHEME}{const.DOMAIN}/local/test/not/exist"
) )
assert str(excinfo.value) == "Invalid path." assert str(excinfo.value) == "Path does not exist."
# Test browse file # Test browse file
with pytest.raises(media_source.BrowseError) as excinfo: with pytest.raises(media_source.BrowseError) as excinfo: