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

Sort motioneye media items in media browser (#79408)

Browse source 
* Sort media

* KEY_MEDIA_SORT_ATTR should be in const

* Changes after review
This commit is contained in:
Steven Looman 2022-10-02 00:36:03 +02:00 • committed by GitHub
parent f64a4f4a95
commit 083db97476
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -284,7 +284,13 @@ class MotionEyeMediaSource(MediaSource):
sub_dirs: set[str] = set()
parts = parsed_path.parts
for media in resp.get(KEY_MEDIA_LIST, []):
media_list = resp.get(KEY_MEDIA_LIST, [])
def get_media_sort_key(media: dict) -> str:
"""Get media sort key."""
return media.get(KEY_PATH, "")
for media in sorted(media_list, key=get_media_sort_key):
if (
KEY_PATH not in media
or KEY_MIME_TYPE not in media

28
tests/components/motioneye/test_media_source.py
View file

@ -250,6 +250,20 @@ async def test_async_browse_media_success(hass: HomeAssistant) -> None:
"children_media_class": "video",
"thumbnail": None,
"children": [
{
"title": "00-02-27.mp4",
"media_class": "video",
"media_content_type": "video/mp4",
"media_content_id": (
"media-source://motioneye"
f"/74565ad414754616000674c87bdc876c#{device.id}#movies#"
"/2021-04-25/00-02-27.mp4"
),
"can_play": True,
"can_expand": False,
"thumbnail": "http://movie",
"children_media_class": None,
},
{
"title": "00-26-22.mp4",
"media_class": "video",
@ -278,20 +292,6 @@ async def test_async_browse_media_success(hass: HomeAssistant) -> None:
"thumbnail": "http://movie",
"children_media_class": None,
},
{
"title": "00-02-27.mp4",
"media_class": "video",
"media_content_type": "video/mp4",
"media_content_id": (
"media-source://motioneye"
f"/74565ad414754616000674c87bdc876c#{device.id}#movies#"
"/2021-04-25/00-02-27.mp4"
),
"can_play": True,
"can_expand": False,
"thumbnail": "http://movie",
"children_media_class": None,
},
],
"not_shown": 0,
}