Skip to content

Add device_tracker.bluetooth_update service #15252

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
Danielhiversen merged 7 commits into from
Aug 27, 2018
Merged

Add device_tracker.bluetooth_update service #15252

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
97a6d98
Add device_tracker.bluetooth_update service
kariudo Jul 1, 2018
a4299d4
remove excess whitespace per bot comments
kariudo Jul 1, 2018
5b4bfa4
Refactored update_bluetooth to call new function update_bluetooth_once
kariudo Jul 11, 2018
a6d6f76
Change service name to bluetooth_tracker_update to reflect platform name
kariudo Jul 11, 2018
867c913
Reformat for line length
kariudo Jul 11, 2018
4d1c0e3
Linting fix, pydoc, first line should end with a period
kariudo Jul 11, 2018
b7144e4
Fixed a method call, and removed some more unsused parameters
kariudo Jul 11, 2018
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
17 changes: 13 additions & 4 deletions homeassistant/components/device_tracker/bluetooth_tracker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
from homeassistant.helpers.event import track_point_in_utc_time
from homeassistant.components.device_tracker import (
YAML_DEVICES, CONF_TRACK_NEW, CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL,
load_config, PLATFORM_SCHEMA, DEFAULT_TRACK_NEW, SOURCE_TYPE_BLUETOOTH)
load_config, PLATFORM_SCHEMA, DEFAULT_TRACK_NEW, SOURCE_TYPE_BLUETOOTH,
DOMAIN)
import homeassistant.util.dt as dt_util

_LOGGER = logging.getLogger(__name__)
Expand Down Expand Up @@ -79,7 +80,7 @@ def discover_devices():

request_rssi = config.get(CONF_REQUEST_RSSI, False)

def update_bluetooth(now):
def update_bluetooth(now, once=False):
"""Lookup Bluetooth device and update status."""
try:
if track_new:
Expand All @@ -99,9 +100,17 @@ def update_bluetooth(now):
see_device(mac, result, rssi)
except bluetooth.BluetoothError:
_LOGGER.exception("Error looking up Bluetooth device")
track_point_in_utc_time(
hass, update_bluetooth, dt_util.utcnow() + interval)
if not once:

@Danielhiversen Danielhiversen Jul 10, 2018

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.

I would suggest extract line 85-102 to a new function. And call that function from update_bluetooth and handle_update_bluetooth. The you can avoid the once parameter

@kariudo kariudo Jul 11, 2018

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.

Sounds good, addressed with 5b4bfa4

track_point_in_utc_time(
hass, update_bluetooth, dt_util.utcnow() + interval)

def handle_update_bluetooth(call):

@Danielhiversen Danielhiversen Jul 15, 2018

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.

Why do you need this function?
Why not call update_bluetooth_once directly?

@kariudo kariudo Jul 18, 2018

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.

Certianly could, I just left it using the handle function per a previous comment you said:

I would suggest extract line 85-102 to a new function. And call that function from update_bluetooth and handle_update_bluetooth. The you can avoid the once parameter

I assumed you wanted it left using the handle_update_bluetooth function, to absorb the unused call parameter.

"""Update bluetooth devices on demand."""
now = dt_util.utcnow()
update_bluetooth(now, True)

update_bluetooth(dt_util.utcnow())

hass.services.register(DOMAIN, "bluetooth_update", handle_update_bluetooth)

@MartinHjelmare MartinHjelmare Jul 10, 2018

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.

Prefix the service name with the name of the platform, eg like this: 'bluetooth_tracker_update'. I intentionally stripped the name of the second bluetooth.

@kariudo kariudo Jul 11, 2018

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.

Makes sense to me, I updated it to 'bluetooth_tracker_update' in a6d6f76


return True