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

Fix local media browser source conflicting with local www folder (#40151)

Browse source
This commit is contained in:
Franck Nijhof 2020-09-16 21:38:40 +02:00 • committed by GitHub
parent 5ea04d64f6
commit f83f3c927a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,7 @@ class LocalSource(MediaSource):
mime_type, _ = mimetypes.guess_type(
str(self.async_full_path(source_dir_id, location))
)
return PlayMedia(f"/local_source/{item.identifier}", mime_type)
return PlayMedia(f"/media/{item.identifier}", mime_type)
async def async_browse_media(
self, item: MediaSourceItem, media_types: Tuple[str] = MEDIA_MIME_TYPES
@ -177,7 +177,7 @@ class LocalMediaView(HomeAssistantView):
Returns media files in config/media.
"""
url = "/local_source/{source_dir_id}/{location:.*}"
url = "/media/{source_dir_id}/{location:.*}"
name = "media"
def __init__(self, hass: HomeAssistant, source: LocalSource):
@ -190,10 +190,10 @@ class LocalMediaView(HomeAssistantView):
) -> web.FileResponse:
"""Start a GET request."""
if location != sanitize_path(location):
return web.HTTPNotFound()
raise web.HTTPNotFound()
if source_dir_id not in self.hass.config.media_dirs:
return web.HTTPNotFound()
raise web.HTTPNotFound()
media_path = self.source.async_full_path(source_dir_id, location)