Skip to content

Remove archived 17track packages from the entity registry #23049

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
MartinHjelmare merged 7 commits into from
Apr 19, 2019
Merged

Remove archived 17track packages from the entity registry #23049

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26e47ed
Remove archived 17track packages from the entity registry
bachya Apr 12, 2019
1df41b0
Fix incorrect __init__.py
bachya Apr 13, 2019
d55f446
Member comments
bachya Apr 15, 2019
c8e6083
Member comments
bachya Apr 16, 2019
9d80f7c
Fix too many params
bachya Apr 18, 2019
b0b37c5
Member comments
bachya Apr 18, 2019
3cf2ab5
Member comments
bachya Apr 19, 2019
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
22 changes: 18 additions & 4 deletions homeassistant/components/seventeentrack/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
REQUIREMENTS = ['py17track==2.2.2']
_LOGGER = logging.getLogger(__name__)

DOMAIN = 'seventeentrack'
Comment thread
bachya marked this conversation as resolved.
Outdated

ATTR_DESTINATION_COUNTRY = 'destination_country'
ATTR_FRIENDLY_NAME = 'friendly_name'
ATTR_INFO_TEXT = 'info_text'
Expand Down Expand Up @@ -72,8 +74,8 @@ async def async_setup_platform(
scan_interval = config.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)

data = SeventeenTrackData(
client, async_add_entities, scan_interval, config[CONF_SHOW_ARCHIVED],
config[CONF_SHOW_DELIVERED])
client, hass, async_add_entities, scan_interval,
config[CONF_SHOW_ARCHIVED], config[CONF_SHOW_DELIVERED])
await data.async_update()

sensors = []
Expand Down Expand Up @@ -263,11 +265,12 @@ class SeventeenTrackData:
"""Define a data handler for 17track.net."""

def __init__(
self, client, async_add_entities, scan_interval, show_archived,
show_delivered):
self, client, hass, async_add_entities, scan_interval,
Comment thread
bachya marked this conversation as resolved.
Outdated
show_archived, show_delivered):
"""Initialize."""
self._async_add_entities = async_add_entities
self._client = client
self._hass = hass
self._scan_interval = scan_interval
self._show_archived = show_archived
self.account_id = client.profile.account_id
Expand Down Expand Up @@ -297,6 +300,17 @@ async def _async_update(self):
for package in to_add
], True)

# Remove archived packages from the entity registry:
to_remove = set(self.packages) - set(packages)
reg = self._hass.helpers.entity_registry.async_get_registry()
for package in to_remove:
entity_id = reg.async_get_entity_id(
self, DOMAIN, 'sensor', 'package_{0}_{1}'.format(
Comment thread
bachya marked this conversation as resolved.
Outdated
self.account_id, package.tracking_number))
if not entity_id:
continue
self._hass.async_create_task(reg.async_remove(entity_id))
Comment thread
MartinHjelmare marked this conversation as resolved.

self.packages = packages
except SeventeenTrackError as err:
_LOGGER.error('There was an error retrieving packages: %s', err)
Expand Down