Skip to content

Change the method of getting the mac address in the braviatv integration #33567

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 3 commits into from
Apr 4, 2020
Merged

Change the method of getting the mac address in the braviatv integration #33567

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
690f4f0
Remove getmac library
bieniu Apr 3, 2020
0932d5b
Fix error handling
bieniu Apr 3, 2020
5dd9ae3
Change error handling method
bieniu Apr 3, 2020
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
2 changes: 1 addition & 1 deletion homeassistant/components/braviatv/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"domain": "braviatv",
"name": "Sony Bravia TV",
"documentation": "https://www.home-assistant.io/integrations/braviatv",
"requirements": ["bravia-tv==1.0.1", "getmac==0.8.1"],
"requirements": ["bravia-tv==1.0.1"],
"dependencies": ["configurator"],
"codeowners": ["@robbiet480"]
}
33 changes: 17 additions & 16 deletions homeassistant/components/braviatv/media_player.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
"""Support for interface with a Sony Bravia TV."""
import ipaddress
import logging

from bravia_tv import BraviaRC
from getmac import get_mac_address
import voluptuous as vol

from homeassistant.components.media_player import PLATFORM_SCHEMA, MediaPlayerDevice
Expand All @@ -21,7 +19,9 @@
SUPPORT_VOLUME_STEP,
)
from homeassistant.const import CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON
from homeassistant.exceptions import PlatformNotReady
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.device_registry import format_mac
from homeassistant.util.json import load_json, save_json

BRAVIA_CONFIG_FILE = "bravia.conf"
Expand Down Expand Up @@ -76,8 +76,11 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
mac = host_config["mac"]
name = config.get(CONF_NAME)
braviarc = BraviaRC(host, mac)
braviarc.connect(pin, CLIENTID_PREFIX, NICKNAME)
unique_id = braviarc.get_system_info()["cid"].lower()
try:
braviarc.connect(pin, CLIENTID_PREFIX, NICKNAME)
unique_id = braviarc.get_system_info()["cid"].lower()
except Exception: # pylint: disable=broad-except
Comment thread
springstan marked this conversation as resolved.
Outdated
raise PlatformNotReady

add_entities([BraviaTVDevice(braviarc, name, pin, unique_id)])
return
Expand All @@ -94,30 +97,28 @@ def setup_bravia(config, pin, hass, add_entities):
request_configuration(config, hass, add_entities)
return

try:
if ipaddress.ip_address(host).version == 6:
mode = "ip6"
else:
mode = "ip"
except ValueError:
mode = "hostname"
mac = get_mac_address(**{mode: host})

# If we came here and configuring this host, mark as done
if host in _CONFIGURING:
request_id = _CONFIGURING.pop(host)
configurator = hass.components.configurator
configurator.request_done(request_id)
_LOGGER.info("Discovery configuration done")

braviarc = BraviaRC(host)
try:
braviarc.connect(pin, CLIENTID_PREFIX, NICKNAME)
system_info = braviarc.get_system_info()
except Exception as exception_instance: # pylint: disable=broad-except
Comment thread
springstan marked this conversation as resolved.
Outdated
_LOGGER.error(exception_instance)
Comment thread
springstan marked this conversation as resolved.
Outdated
return
mac = format_mac(system_info["macAddr"])
unique_id = system_info["cid"].lower()

# Save config
save_json(
hass.config.path(BRAVIA_CONFIG_FILE),
{host: {"pin": pin, "host": host, "mac": mac}},
)
braviarc = BraviaRC(host, mac)
braviarc.connect(pin, CLIENTID_PREFIX, NICKNAME)
unique_id = braviarc.get_system_info()["cid"].lower()

add_entities([BraviaTVDevice(braviarc, name, pin, unique_id)])

Expand Down
1 change: 0 additions & 1 deletion requirements_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,6 @@ georss_ign_sismologia_client==0.2
# homeassistant.components.qld_bushfire
georss_qld_bushfire_alert_client==0.3

# homeassistant.components.braviatv
# homeassistant.components.huawei_lte
# homeassistant.components.kef
# homeassistant.components.minecraft_server
Expand Down
1 change: 0 additions & 1 deletion requirements_test_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ georss_ign_sismologia_client==0.2
# homeassistant.components.qld_bushfire
georss_qld_bushfire_alert_client==0.3

# homeassistant.components.braviatv
# homeassistant.components.huawei_lte
# homeassistant.components.kef
# homeassistant.components.minecraft_server
Expand Down