Skip to content

Sort entities in default groups by name #7681

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
May 22, 2017
Merged

Sort entities in default groups by name #7681

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f40565f
Sort entities in default groups by name
amelchio May 20, 2017
65c3180
Cleanups from review
amelchio May 21, 2017
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
12 changes: 7 additions & 5 deletions homeassistant/helpers/entity_component.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,15 +229,17 @@ def async_update_group(self):

This method must be run in the event loop.
"""
def sorted_ids():

@balloob balloob May 21, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't instantiate a method on each call to this method. Instead just copy paste the method in both places.

You should also be able to do just this: sorted(self.entities, key=lambda x: self.entities.name)

@amelchio amelchio May 21, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, that key extraction ended up a bit redundant. I inlined the short version now.

"""Return our entity ids sorted by entity name."""
return sorted((ent_id for ent_id in self.entities.keys()),
key=lambda x: self.entities[x].name)

if self.group is None and self.group_name is not None:
group = get_component('group')
self.group = yield from group.Group.async_create_group(
self.hass, self.group_name, self.entities.keys(),
user_defined=False
)
self.hass, self.group_name, sorted_ids(), user_defined=False)
elif self.group is not None:
yield from self.group.async_update_tracked_entity_ids(
self.entities.keys())
yield from self.group.async_update_tracked_entity_ids(sorted_ids())

def reset(self):
"""Remove entities and reset the entity component to initial values."""
Expand Down
7 changes: 4 additions & 3 deletions tests/helpers/test_entity_component.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,14 @@ def test_setting_up_group(self):
assert group.attributes.get('entity_id') == ('test_domain.hello',)

# group extended
component.add_entities([EntityTest(name='hello2')])
component.add_entities([EntityTest(name='goodbye')])

assert len(self.hass.states.entity_ids()) == 3
group = self.hass.states.get('group.everyone')

assert sorted(group.attributes.get('entity_id')) == \
['test_domain.hello', 'test_domain.hello2']
# Sorted order
assert group.attributes.get('entity_id') == \
('test_domain.goodbye', 'test_domain.hello')

def test_polling_only_updates_entities_it_should_poll(self):
"""Test the polling of only updated entities."""
Expand Down